renamed GLEEDTest to GleedTest, prettified TiledMap tests

diff --git a/tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java b/tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
index c81c47d..1927beb 100644 (file)
--- a/tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
+++ b/tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
@@ -19,6 +19,7 @@ package com.badlogic.gdx.tests.lwjgl;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;\r
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;\r
 import com.badlogic.gdx.tests.AssetManagerTest;\r
+import com.badlogic.gdx.tests.GleedTest;\r
 import com.badlogic.gdx.tests.GamepadTest;\r
 import com.badlogic.gdx.tests.InverseKinematicsTest;\r
 import com.badlogic.gdx.tests.TiledMapDirectLoaderTest;\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/GLEEDTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/GLEEDTest.java
index 678e115..36eec89 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/GLEEDTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/GLEEDTest.java
@@ -33,7 +33,7 @@ import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.tests.utils.GdxTest;
 import com.badlogic.gdx.utils.Logger;
 
-public class GLEEDTest extends GdxTest {
+public class GleedTest extends GdxTest {
        
        enum State {
                Loading,

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAssetManagerTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAssetManagerTest.java
index eddd482..0c2edc9 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAssetManagerTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAssetManagerTest.java
@@ -1,23 +1,18 @@
 package com.badlogic.gdx.tests;
 
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.InputAdapter;
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.resolvers.InternalFileHandleResolver;
 import com.badlogic.gdx.graphics.GL10;
 import com.badlogic.gdx.graphics.OrthographicCamera;
-import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.maps.MapLayer;
 import com.badlogic.gdx.maps.tiled.TiledMap;
-import com.badlogic.gdx.maps.tiled.TiledMapRenderer;
 import com.badlogic.gdx.maps.tiled.TiledMapRenderer2;
-import com.badlogic.gdx.maps.tiled.TmxMapLoader;
 import com.badlogic.gdx.maps.tiled.TiledMapRenderer2.IsometricTiledMapRenderer;
-import com.badlogic.gdx.maps.tiled.TiledMapTileLayer;
-import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.maps.tiled.TmxMapLoader;
 import com.badlogic.gdx.tests.utils.GdxTest;
+import com.badlogic.gdx.tests.utils.OrthoCamController;
 
 public class TiledMapAssetManagerTest extends GdxTest {
        
@@ -27,11 +22,6 @@ public class TiledMapAssetManagerTest extends GdxTest {
        private OrthoCamController cameraController;
        
        AssetManager assetManager;
-       
-       Texture tiles;
-       
-       Texture texture;
-       
        BitmapFont font;
        SpriteBatch batch;
        
@@ -55,7 +45,6 @@ public class TiledMapAssetManagerTest extends GdxTest {
                assetManager.load("data/maps/isometric_grass_and_water.tmx", TiledMap.class);
                assetManager.finishLoading();
                map = assetManager.get("data/maps/isometric_grass_and_water.tmx");
-               //renderer = new OrthogonalTiledMapRenderer(map, 1f / 32f);
                renderer = new IsometricTiledMapRenderer(map, 1f / 64f);
        }
 
@@ -64,10 +53,7 @@ public class TiledMapAssetManagerTest extends GdxTest {
                Gdx.gl.glClearColor(100f / 255f, 100f / 255f, 250f / 255f, 1f);
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);
                camera.update();
-               if (cameraController.dirty) {
-                       renderer.setProjectionMatrix(camera.combined);
-                       cameraController.dirty = false;
-               }
+               renderer.setProjectionMatrix(camera.combined);
                renderer.setViewBounds(camera.position.x - camera.viewportWidth * 0.5f, camera.position.y - camera.viewportHeight * 0.5f, camera.viewportWidth, camera.viewportHeight);
                renderer.begin();
                renderer.render();
@@ -81,37 +67,4 @@ public class TiledMapAssetManagerTest extends GdxTest {
        public boolean needsGL20 () {
                return true;
        }
-
-       public class OrthoCamController extends InputAdapter {
-               final OrthographicCamera camera;
-               final Vector3 curr = new Vector3();
-               final Vector3 last = new Vector3(-1, -1, -1);
-               final Vector3 delta = new Vector3();
-
-               boolean dirty = true;
-               
-               public OrthoCamController (OrthographicCamera camera) {
-                       this.camera = camera;
-               }
-
-               @Override
-               public boolean touchDragged (int x, int y, int pointer) {
-                       camera.unproject(curr.set(x, y, 0));
-                       if (!(last.x == -1 && last.y == -1 && last.z == -1)) {
-                               camera.unproject(delta.set(last.x, last.y, 0));
-                               delta.sub(curr);
-                               camera.position.add(delta.x, delta.y, 0);
-                               dirty = true;
-                       }
-                       last.set(x, y, 0);
-                       return false;
-               }
-
-               @Override
-               public boolean touchUp (int x, int y, int pointer, int button) {
-                       last.set(-1, -1, -1);
-                       return false;
-               }
-       }
-       
 }

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapDirectLoaderTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapDirectLoaderTest.java
index ad345a3..02c9c97 100755 (executable)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapDirectLoaderTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapDirectLoaderTest.java
@@ -19,6 +19,7 @@ import com.badlogic.gdx.maps.tiled.TiledMapRenderer2.OrthogonalTiledMapRenderer2
 import com.badlogic.gdx.maps.tiled.TiledMapTileLayer;\r
 import com.badlogic.gdx.math.Vector3;\r
 import com.badlogic.gdx.tests.utils.GdxTest;\r
+import com.badlogic.gdx.tests.utils.OrthoCamController;\r
 \r
 public class TiledMapDirectLoaderTest extends GdxTest {\r
        \r
@@ -47,18 +48,14 @@ public class TiledMapDirectLoaderTest extends GdxTest {
                \r
                map = new TmxMapLoader().load("data/maps/tiles.tmx");\r
                renderer = new OrthogonalTiledMapRenderer2(map, 1f / 32f);\r
-//             renderer = new IsometricTiledMapRenderer(map, 1f / 64f);\r
        }\r
 \r
        @Override\r
        public void render() {\r
-               Gdx.gl.glClearColor(100f / 255f, 100f / 255f, 250f / 255f, 1f);\r
+               Gdx.gl.glClearColor(0.55f, 0.55f, 0.55f, 1f);\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                camera.update();\r
-               if (cameraController.dirty) {\r
-                       renderer.setProjectionMatrix(camera.combined);\r
-                       cameraController.dirty = false;\r
-               }\r
+               renderer.setProjectionMatrix(camera.combined);\r
                renderer.setViewBounds(camera.position.x - camera.viewportWidth * 0.5f, camera.position.y - camera.viewportHeight * 0.5f, camera.viewportWidth, camera.viewportHeight);\r
                renderer.begin();\r
                renderer.render();\r
@@ -77,37 +74,4 @@ public class TiledMapDirectLoaderTest extends GdxTest {
        public void dispose () {\r
                map.dispose();\r
        }\r
-\r
-       public class OrthoCamController extends InputAdapter {\r
-               final OrthographicCamera camera;\r
-               final Vector3 curr = new Vector3();\r
-               final Vector3 last = new Vector3(-1, -1, -1);\r
-               final Vector3 delta = new Vector3();\r
-\r
-               boolean dirty = true;\r
-               \r
-               public OrthoCamController (OrthographicCamera camera) {\r
-                       this.camera = camera;\r
-               }\r
-\r
-               @Override\r
-               public boolean touchDragged (int x, int y, int pointer) {\r
-                       camera.unproject(curr.set(x, y, 0));\r
-                       if (!(last.x == -1 && last.y == -1 && last.z == -1)) {\r
-                               camera.unproject(delta.set(last.x, last.y, 0));\r
-                               delta.sub(curr);\r
-                               camera.position.add(delta.x, delta.y, 0);\r
-                               dirty = true;\r
-                       }\r
-                       last.set(x, y, 0);\r
-                       return false;\r
-               }\r
-\r
-               @Override\r
-               public boolean touchUp (int x, int y, int pointer, int button) {\r
-                       last.set(-1, -1, -1);\r
-                       return false;\r
-               }\r
-       }\r
-       \r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
index eedfd3b..da77aba 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
@@ -75,7 +75,7 @@ public class GdxTests {
                // InternationalFontsTest.class, VorbisTest.class\r
                TextButtonTest.class, TextButtonTestGL2.class, TextureBindTest.class, SortedSpriteTest.class,\r
                ExternalMusicTest.class, SoftKeyboardTest.class, DirtyRenderingTest.class, YDownTest.class,\r
-               ScreenCaptureTest.class, BitmapFontTest.class, LabelScaleTest.class, GLEEDTest.class, GamepadTest.class, NetAPITest.class, TiledMapAssetManagerTest.class, TiledMapBench.class,\r
+               ScreenCaptureTest.class, BitmapFontTest.class, LabelScaleTest.class, GleedTest.class, GamepadTest.class, NetAPITest.class, TiledMapAssetManagerTest.class, TiledMapBench.class,\r
                RunnablePostTest.class, Vector2dTest.class));\r
        \r
        public static List<String> getNames () {\r