[fixed] TWL libs.

diff --git a/extensions/twl/gdx-twl-tests-android/.classpath b/extensions/twl/gdx-twl-tests-android/.classpath
index 55392e5..46eeaad 100644 (file)
--- a/extensions/twl/gdx-twl-tests-android/.classpath
+++ b/extensions/twl/gdx-twl-tests-android/.classpath
@@ -7,7 +7,7 @@
        <classpathentry combineaccessrules="false" kind="src" path="/gdx-backend-android"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/gdx-twl"/>\r
        <classpathentry combineaccessrules="false" kind="src" path="/gdx-twl-tests"/>\r
-       <classpathentry kind="lib" path="/gdx-twl/libs/twl.jar"/>\r
        <classpathentry kind="lib" path="/gdx-twl/libs/xpp3-1.1.4c.jar"/>\r
+       <classpathentry kind="lib" path="/gdx-twl/libs/twl-android.jar"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/extensions/twl/gdx-twl-tests-android/libs/twl-android.jar b/extensions/twl/gdx-twl-tests-android/libs/twl-android.jar
deleted file mode 100644 (file)
index d929b1d..0000000
Binary files a/extensions/twl/gdx-twl-tests-android/libs/twl-android.jar and /dev/null differ

diff --git a/extensions/twl/gdx-twl/.classpath b/extensions/twl/gdx-twl/.classpath
index 79d0eb2..d362205 100644 (file)
--- a/extensions/twl/gdx-twl/.classpath
+++ b/extensions/twl/gdx-twl/.classpath
@@ -4,6 +4,6 @@
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
        <classpathentry combineaccessrules="false" exported="true" kind="src" path="/gdx"/>\r
        <classpathentry kind="lib" path="libs/xpp3-1.1.4c.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="libs/twl.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="libs/twl-android.jar"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/extensions/twl/gdx-twl/libs/twl-android.jar b/extensions/twl/gdx-twl/libs/twl-android.jar
new file mode 100644 (file)
index 0000000..f064ea8
Binary files /dev/null and b/extensions/twl/gdx-twl/libs/twl-android.jar differ

diff --git a/extensions/twl/gdx-twl/libs/twl.jar b/extensions/twl/gdx-twl/libs/twl.jar
deleted file mode 100644 (file)
index 4958c7a..0000000
Binary files a/extensions/twl/gdx-twl/libs/twl.jar and /dev/null differ

diff --git a/gdx/src/com/badlogic/gdx/graphics/BitmapFont.java b/gdx/src/com/badlogic/gdx/graphics/BitmapFont.java
index 296bd18..04c36cd 100644 (file)
--- a/gdx/src/com/badlogic/gdx/graphics/BitmapFont.java
+++ b/gdx/src/com/badlogic/gdx/graphics/BitmapFont.java
@@ -34,8 +34,8 @@ import com.badlogic.gdx.graphics.Texture.TextureWrap;
 import com.badlogic.gdx.utils.GdxRuntimeException;\r
 \r
 /**\r
- * Renders bitmap fonts. The bitmap font consists of 2 files: an image file (or {@link Sprite}) containing the glyphs and a file\r
- * in the AngleCode BMFont text format that describes where each glyph is on the image. Currently only a single image of glyphs is\r
+ * Renders bitmap fonts. The font consists of 2 files: an image file (or {@link Sprite}) containing the glyphs and a file in the\r
+ * AngleCode BMFont text format that describes where each glyph is on the image. Currently only a single image of glyphs is\r
  * supported.<br>\r
  * <br>\r
  * Text is drawn using a {@link SpriteBatch}. Text can be cached in a {@link BitmapFontCache} for faster rendering of static text,\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontAlignmentTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontAlignmentTest.java
index 1b5573a..464fe8b 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontAlignmentTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontAlignmentTest.java
@@ -38,6 +38,13 @@ public class BitmapFontAlignmentTest extends GdxTest {
        int renderMode;\r
 \r
        @Override public void create () {\r
+               Gdx.input.setInputProcessor(new InputAdapter() {\r
+                       public boolean touchDown (int x, int y, int pointer) {\r
+                               renderMode = (renderMode + 1) % 6;\r
+                               return false;\r
+                       }\r
+               });\r
+\r
                spriteBatch = new SpriteBatch();\r
 \r
                logoSprite = new Sprite(Gdx.graphics.newTexture(Gdx.files.getFileHandle("data/badlogic.jpg", FileType.Internal),\r
@@ -48,13 +55,6 @@ public class BitmapFontAlignmentTest extends GdxTest {
                font = new BitmapFont(Gdx.files.getFileHandle("data/verdana39.fnt", FileType.Internal), Gdx.files.getFileHandle(\r
                        "data/verdana39.png", FileType.Internal), false);\r
                cache = new BitmapFontCache(font);\r
-\r
-               Gdx.input.setInputProcessor(new InputAdapter() {\r
-                       public boolean touchDown (int x, int y, int pointer) {\r
-                               renderMode = (renderMode + 1) % 6;\r
-                               return false;\r
-                       }\r
-               });\r
        }\r
 \r
        @Override public void render () {\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontFlipTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontFlipTest.java
index 0019038..e5d8a4b 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontFlipTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontFlipTest.java
@@ -36,9 +36,15 @@ public class BitmapFontFlipTest extends GdxTest {
        private Color red = new Color(1, 0, 0, 0.5f);\r
        private BitmapFontCache cache1, cache2, cache3, cache4, cache5;\r
        int renderMode;\r
-       private InputProcessor inputProcessor;\r
 \r
        @Override public void create () {\r
+               Gdx.input.setInputProcessor(new InputAdapter() {\r
+                       public boolean touchDown (int x, int y, int pointer) {\r
+                               renderMode = (renderMode + 1) % 2;\r
+                               return false;\r
+                       }\r
+               });\r
+\r
                spriteBatch = new SpriteBatch();\r
                spriteBatch.setProjectionMatrix(new Matrix4().setToOrtho(0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight(), 0, 0, 1));\r
 \r
@@ -51,14 +57,6 @@ public class BitmapFontFlipTest extends GdxTest {
                font = new BitmapFont(Gdx.files.getFileHandle("data/verdana39.fnt", FileType.Internal), Gdx.files.getFileHandle(\r
                        "data/verdana39.png", FileType.Internal), true);\r
 \r
-               inputProcessor = new InputAdapter() {\r
-                       public boolean touchDown (int x, int y, int pointer) {\r
-                               renderMode = (renderMode + 1) % 2;\r
-                               return false;\r
-                       }\r
-               };\r
-               Gdx.input.setInputProcessor(inputProcessor);\r
-\r
                cache1 = new BitmapFontCache(font);\r
                cache2 = new BitmapFontCache(font);\r
                cache3 = new BitmapFontCache(font);\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontTest.java
index 3337199..ffd1184 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontTest.java
@@ -36,7 +36,6 @@ public class BitmapFontTest extends GdxTest {
        private Color red = new Color(1, 0, 0, 1);\r
        private BitmapFontCache cache1, cache2, cache3, cache4, cache5;\r
        int renderMode;\r
-       InputProcessor inputProcessor;\r
 \r
        @Override public void create () {\r
                Gdx.input.setInputProcessor(new InputAdapter() {\r
@@ -55,15 +54,6 @@ public class BitmapFontTest extends GdxTest {
                font = new BitmapFont(Gdx.files.getFileHandle("data/verdana39.fnt", FileType.Internal), Gdx.files.getFileHandle(\r
                        "data/verdana39.png", FileType.Internal), false);\r
 \r
-               inputProcessor = new InputAdapter() {\r
-                       public boolean touchDown (int x, int y, int pointer) {\r
-                               renderMode = (renderMode + 1) % 2;\r
-                               return false;\r
-                       }\r
-               };\r
-\r
-               Gdx.input.setInputProcessor(inputProcessor);\r
-\r
                cache1 = new BitmapFontCache(font);\r
                cache2 = new BitmapFontCache(font);\r
                cache3 = new BitmapFontCache(font);\r