From f7f583214538e7bcc5c7042ff8d648f759b04fc4 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 4 Sep 2020 18:07:06 -0400 Subject: [PATCH] v0.9.0: corrected capitalization on 'libGDX' --- .../java/com/watabou/gltextures/TextureCache.java | 2 +- .../src/main/java/com/watabou/glwrap/Matrix.java | 2 +- .../main/java/com/watabou/noosa/RenderedText.java | 2 +- .../main/java/com/watabou/utils/BitmapCache.java | 2 +- .../java/com/watabou/utils/PlatformSupport.java | 2 +- .../main/java/com/watabou/utils/Reflection.java | 2 +- android/.gitignore | 2 +- android/proguard-rules.pro | 2 +- .../shatteredpixeldungeon/scenes/AboutScene.java | 4 ++-- .../ui/changelist/v0_7_X_Changes.java | 14 +++++++------- .../ui/changelist/v0_8_X_Changes.java | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/SPD-classes/src/main/java/com/watabou/gltextures/TextureCache.java b/SPD-classes/src/main/java/com/watabou/gltextures/TextureCache.java index 634e3690c..8faefd10f 100644 --- a/SPD-classes/src/main/java/com/watabou/gltextures/TextureCache.java +++ b/SPD-classes/src/main/java/com/watabou/gltextures/TextureCache.java @@ -130,7 +130,7 @@ public class TextureCache { try { if (src instanceof Integer){ - //LibGDX does not support android resource integer handles, and they were + //libGDX does not support android resource integer handles, and they were //never used by the game anyway, should probably remove this entirely return null; diff --git a/SPD-classes/src/main/java/com/watabou/glwrap/Matrix.java b/SPD-classes/src/main/java/com/watabou/glwrap/Matrix.java index e45e61514..b25f6775b 100644 --- a/SPD-classes/src/main/java/com/watabou/glwrap/Matrix.java +++ b/SPD-classes/src/main/java/com/watabou/glwrap/Matrix.java @@ -21,7 +21,7 @@ package com.watabou.glwrap; -//TODO LibGDX offer matrix classes as well, which might give better performance. +//TODO libGDX offer matrix classes as well, which might give better performance. //should investigate using them public class Matrix { diff --git a/SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java b/SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java index 728a63c95..0730ae144 100644 --- a/SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java +++ b/SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java @@ -137,7 +137,7 @@ public class RenderedText extends Image { } } - //implements regular PD rendering within a LibGDX batch so that our rendering logic + //implements regular PD rendering within a libGDX batch so that our rendering logic //can interface with the freetype font generator private static class TextRenderBatch implements Batch { diff --git a/SPD-classes/src/main/java/com/watabou/utils/BitmapCache.java b/SPD-classes/src/main/java/com/watabou/utils/BitmapCache.java index e52eacdc1..606d78e9a 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/BitmapCache.java +++ b/SPD-classes/src/main/java/com/watabou/utils/BitmapCache.java @@ -63,7 +63,7 @@ public class BitmapCache { } } - //Unused, LibGDX does not support resource Ids + //Unused, libGDX does not support resource Ids /* public static Pixmap get( int resID ) { return get( DEFAULT, resID ); diff --git a/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java b/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java index 4d45215fe..ea7e460e1 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java +++ b/SPD-classes/src/main/java/com/watabou/utils/PlatformSupport.java @@ -32,7 +32,7 @@ public abstract class PlatformSupport { public abstract boolean connectedToUnmeteredNetwork(); //FIXME this is currently used because no platform-agnostic text input has been implemented. - //should look into doing that using either plain openGL or Libgdx's libraries + //should look into doing that using either plain openGL or libgdx's libraries public abstract void promptTextInput( String title, String hintText, int maxLen, boolean multiLine, String posTxt, String negTxt, TextCallback callback); diff --git a/SPD-classes/src/main/java/com/watabou/utils/Reflection.java b/SPD-classes/src/main/java/com/watabou/utils/Reflection.java index 2900a07af..fba5bb3de 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/Reflection.java +++ b/SPD-classes/src/main/java/com/watabou/utils/Reflection.java @@ -24,7 +24,7 @@ package com.watabou.utils; import com.badlogic.gdx.utils.reflect.ClassReflection; import com.watabou.noosa.Game; -//wrapper for LibGDX reflection +//wrapper for libGDX reflection public class Reflection { public static boolean isMemberClass( Class cls ){ diff --git a/android/.gitignore b/android/.gitignore index 736683675..29a46b2a9 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,3 +1,3 @@ -#LibGDX native dependancies +#libGDX native dependancies libgdx.so libgdx-freetype.so \ No newline at end of file diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro index eaaaeb646..ee95a4f0a 100644 --- a/android/proguard-rules.pro +++ b/android/proguard-rules.pro @@ -7,7 +7,7 @@ # mapping file can be found in core/build/outputs/mapping after running a release build -keepattributes SourceFile,LineNumberTable -# LibGDX stuff +# libGDX stuff -dontwarn android.support.** -dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication -dontwarn com.badlogic.gdx.utils.GdxBuild diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java index e6457defd..d994de099 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java @@ -127,14 +127,14 @@ public class AboutScene extends PixelScene { } content.add(cube); - //*** LibGDX Credits *** + //*** libGDX Credits *** final int GDX_COLOR = 0xE44D3C; CreditsBlock gdx = new CreditsBlock(true, GDX_COLOR, null, Icons.LIBGDX.get(), - "ShatteredPD is powered by _LibGDX_!", + "ShatteredPD is powered by _libGDX_!", "libgdx.badlogicgames.com", "http://libgdx.badlogicgames.com"); if (landscape()){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_7_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_7_X_Changes.java index afb630108..75b652066 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_7_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_7_X_Changes.java @@ -97,8 +97,8 @@ public class v0_7_X_Changes { "_-_ Damage reduced by 30%\n" + "_-_ Accuracy reduced by 10%")); - changes.addButton( new ChangeButton(Icons.get(Icons.LIBGDX), "LibGDX Text Rendering!", - "The game's text renderer is now using LibGDX freetype. This looks almost identical to the existing text but is slightly crisper, platform-independent, and much more efficient!\n\n" + + changes.addButton( new ChangeButton(Icons.get(Icons.LIBGDX), "libGDX Text Rendering!", + "The game's text renderer is now using libGDX freetype. This looks almost identical to the existing text but is slightly crisper, platform-independent, and much more efficient!\n\n" + "Text rendering was the last bit of android-dependant code, so the game's core code modules (~98% of its code) are now being compiled as general code and not android-specific code!")); changes = new ChangeInfo(Messages.get(ChangesScene.class, "changes"), false, null); @@ -123,7 +123,7 @@ public class v0_7_X_Changes { changes.addButton( new ChangeButton(new Image(Assets.Sprites.SPINNER, 144, 0, 16, 16), Messages.get(ChangesScene.class, "bugfixes"), "Fixed:\n" + - "_-_ Various stability issues caused by the LibGDX conversion\n" + + "_-_ Various stability issues caused by the libGDX conversion\n" + "_-_ Bolts from wand of lightning not spreading in many cases where they should\n" + "_-_ Thrown weapons sticking to corrupted characters when they shouldn't\n" + "_-_ Area-based effects behaving oddly in rare cases\n" + @@ -203,10 +203,10 @@ public class v0_7_X_Changes { "This new wand has a lower damage output, but grants significant defensive power. The rocks the wand shoots at enemies reform around the hero and absorb damage. If enough rock is built, it will form up into a rock guardian which fights with the player.\n\n" + "The Wand of Living Earth is lacking in offensive output, but does a great job of pulling focus and damage away from the player.")); - changes.addButton( new ChangeButton(Icons.get(Icons.LIBGDX), "LibGDX", - "Large sections of Shattered's codebase is now using the multiplatform game library _LibGDX._ Making the game's codebase less heavily tied to Android is a big step towards making the game available on other platforms!\n\n" + - "Keyboard input handling and text rendering are still coupled to Android however. I will convert these game systems to use LibGDX in a later update.\n\n" + - "Note that Shattered will not immediately release on other platforms once LibGDX conversion is complete, but it is a big step towards that.")); + changes.addButton( new ChangeButton(Icons.get(Icons.LIBGDX), "libGDX", + "Large sections of Shattered's codebase is now using the multiplatform game library _libGDX._ Making the game's codebase less heavily tied to Android is a big step towards making the game available on other platforms!\n\n" + + "Keyboard input handling and text rendering are still coupled to Android however. I will convert these game systems to use libGDX in a later update.\n\n" + + "Note that Shattered will not immediately release on other platforms once libGDX conversion is complete, but it is a big step towards that.")); changes = new ChangeInfo(Messages.get(ChangesScene.class, "changes"), false, null); changes.hardlight( CharSprite.WARNING ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_8_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_8_X_Changes.java index ff2fe86b9..cbbb0a7f4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_8_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v0_8_X_Changes.java @@ -610,7 +610,7 @@ public class v0_8_X_Changes { "_-_ The hero is now interrupted if their path becomes obstructed by an ally.")); if (DeviceCompat.isDesktop()) { - changes.addButton( new ChangeButton( Icons.get( Icons.LIBGDX ), "LibGDX Desktop Functionality", + changes.addButton( new ChangeButton( Icons.get( Icons.LIBGDX ), "libGDX Desktop Functionality", "The desktop version of the game is now running through the same codebase as the Android version!\n\n" + "Moving forward the desktop version of the game will be at feature parity with the Android version, which includes translations, access to betas, and release timings!\n\n" + "Currently all features from the old desktop codebase have been re-implemented in this version:\n" +