fixed cached tiled renderer

diff --git a/gdx/src/com/badlogic/gdx/maps/tiled/renderers/OrthogonalTiledMapRenderer2.java b/gdx/src/com/badlogic/gdx/maps/tiled/renderers/OrthogonalTiledMapRenderer2.java
index 311117c..d0a4672 100755 (executable)
--- a/gdx/src/com/badlogic/gdx/maps/tiled/renderers/OrthogonalTiledMapRenderer2.java
+++ b/gdx/src/com/badlogic/gdx/maps/tiled/renderers/OrthogonalTiledMapRenderer2.java
@@ -102,9 +102,12 @@ public class OrthogonalTiledMapRenderer2 implements TiledMapRenderer {
                if (!cached) {\r
                        spriteCache.endCache();\r
                        cached = true;\r
-                       begin();\r
-                       render();\r
-                       end();\r
+                       Gdx.gl.glEnable(GL10.GL_BLEND);\r
+                       Gdx.gl.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);\r
+                       spriteCache.begin();\r
+                       spriteCache.draw(0);\r
+                       spriteCache.end();\r
+                       Gdx.gl.glDisable(GL10.GL_BLEND);\r
                } else {\r
                        spriteCache.end();\r
                        Gdx.gl.glDisable(GL10.GL_BLEND);\r

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 d0a835c..74fda89 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
@@ -39,7 +39,7 @@ public class LwjglDebugStarter {
                new SharedLibraryLoader("../../extensions/gdx-controllers/gdx-controllers-desktop/libs/gdx-controllers-desktop-natives.jar").load("gdx-controllers-desktop");\r
                new SharedLibraryLoader("../../gdx/libs/gdx-natives.jar").load("gdx");\r
 \r
-               GdxTest test = new GleedTest();\r
+               GdxTest test = new TiledMapBench();\r
                LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();\r
                config.useGL20 = test.needsGL20();\r
                new LwjglApplication(test, config);\r

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 e17dba4..5ecab6a 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAssetManagerTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/TiledMapAssetManagerTest.java
@@ -31,6 +31,7 @@ public class TiledMapAssetManagerTest extends GdxTest {
                
                camera = new OrthographicCamera();
                camera.setToOrtho(false, (w / h) * 10, 10);
+               camera.zoom = 2;
                camera.update();
                
                cameraController = new OrthoCamController(camera);

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/bench/TiledMapBench.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/bench/TiledMapBench.java
index f1cefb3..c593d46 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/bench/TiledMapBench.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/bench/TiledMapBench.java
@@ -14,6 +14,7 @@ import com.badlogic.gdx.maps.tiled.TiledMap;
 import com.badlogic.gdx.maps.tiled.TiledMapRenderer;
 import com.badlogic.gdx.maps.tiled.TiledMapTileLayer;
 import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
+import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer2;
 import com.badlogic.gdx.maps.tiled.tiles.StaticTiledMapTile;
 import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.tests.utils.GdxTest;
@@ -64,7 +65,7 @@ public class TiledMapBench extends GdxTest {
                        }
                }
                
-               renderer = new OrthogonalTiledMapRenderer(map);
+               renderer = new OrthogonalTiledMapRenderer2(map);
 
        }