[fixed] proper disposing of resources in tests runnable in GWT backend.

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/AccelerometerTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/AccelerometerTest.java
index fa2c4a2..dc040cb 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/AccelerometerTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/AccelerometerTest.java
@@ -45,4 +45,10 @@ public class AccelerometerTest extends GdxTest {
                        + Gdx.input.getRotation() + "\n" + "wh: " + Gdx.graphics.getDesktopDisplayMode() + "\n", 0, 100);\r
                batch.end();\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               font.dispose();\r
+               batch.dispose();\r
+       }\r
 }
\ No newline at end of file

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ActionSequenceTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ActionSequenceTest.java
index 686539a..9d952b0 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ActionSequenceTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ActionSequenceTest.java
@@ -41,11 +41,12 @@ public class ActionSequenceTest extends GdxTest implements OnActionCompleted {
        Image img2;\r
        Image img3;\r
        Stage stage;\r
+       Texture texture;\r
 \r
        @Override\r
        public void create () {\r
                stage = new Stage(480, 320, true);\r
-               Texture texture = new Texture(Gdx.files.internal("data/badlogic.jpg"), false);\r
+               texture = new Texture(Gdx.files.internal("data/badlogic.jpg"), false);\r
                texture.setFilter(TextureFilter.Linear, TextureFilter.Linear);\r
                img = new Image(new TextureRegion(texture));\r
                img.width = img.height = 100;\r
@@ -68,16 +69,16 @@ public class ActionSequenceTest extends GdxTest implements OnActionCompleted {
                stage.addActor(img);\r
                stage.addActor(img2);\r
                stage.addActor(img3);\r
+               \r
+               img.action(Sequence.$());\r
+               img2.action(Parallel.$(Sequence.$(), MoveBy.$(100, 0, 1)));\r
+               img3.action(Sequence.$(Parallel.$(MoveBy.$(100, 200, 2))));\r
        }\r
 \r
        @Override\r
        public void render () {\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
 \r
-               img.action(Sequence.$());\r
-               img2.action(Parallel.$(Sequence.$(), MoveBy.$(0, 0, 1)));\r
-               img3.action(Sequence.$(Parallel.$(MoveBy.$(0, 0, 2))));\r
-\r
                stage.act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f));\r
                stage.draw();\r
        }\r
@@ -86,4 +87,10 @@ public class ActionSequenceTest extends GdxTest implements OnActionCompleted {
        public void completed (Action action) {\r
                System.out.println("completed");\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               stage.dispose();\r
+               texture.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ActionTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ActionTest.java
index f3d024d..b8b4d9c 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ActionTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ActionTest.java
@@ -35,11 +35,12 @@ public class ActionTest extends GdxTest implements OnActionCompleted {
        }\r
 \r
        Stage stage;\r
+       Texture texture;\r
 \r
        @Override\r
        public void create () {\r
                stage = new Stage(480, 320, true);\r
-               Texture texture = new Texture(Gdx.files.internal("data/badlogic.jpg"), false);\r
+               texture = new Texture(Gdx.files.internal("data/badlogic.jpg"), false);\r
                texture.setFilter(TextureFilter.Linear, TextureFilter.Linear);\r
                final Image img = new Image(new TextureRegion(texture));\r
                img.width = img.height = 100;\r
@@ -134,4 +135,10 @@ public class ActionTest extends GdxTest implements OnActionCompleted {
        public void completed (Action action) {\r
                System.out.println("completed Action: " + action);\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               stage.dispose();\r
+               texture.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/AlphaTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/AlphaTest.java
index 338ad68..dc5fb32 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/AlphaTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/AlphaTest.java
@@ -54,4 +54,10 @@ public class AlphaTest extends GdxTest {
        public boolean needsGL20 () {\r
                return false;\r
        }\r
-}\r
+\r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               texture.dispose();\r
+       }\r
+}
\ No newline at end of file

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/AnimationTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/AnimationTest.java
index 1b26dd0..ba31091 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/AnimationTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/AnimationTest.java
@@ -56,12 +56,13 @@ public class AnimationTest extends GdxTest {
        Animation leftWalk;\r
        Animation rightWalk;\r
        Caveman[] cavemen;\r
+       Texture texture;\r
        SpriteBatch batch;\r
        FPSLogger fpsLog;\r
 \r
        @Override\r
        public void create () {\r
-               Texture texture = new Texture(Gdx.files.internal("data/walkanim.png"));\r
+               texture = new Texture(Gdx.files.internal("data/walkanim.png"));\r
                TextureRegion[] leftWalkFrames = TextureRegion.split(texture, 64, 64)[0];\r
                TextureRegion[] rightWalkFrames = new TextureRegion[leftWalkFrames.length];\r
                for (int i = 0; i < rightWalkFrames.length; i++) {\r
@@ -99,4 +100,10 @@ public class AnimationTest extends GdxTest {
 \r
                fpsLog.log();\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               texture.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/AssetManagerTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/AssetManagerTest.java
index 50637da..8da2137 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/AssetManagerTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/AssetManagerTest.java
@@ -151,4 +151,11 @@ public class AssetManagerTest extends GdxTest implements AssetErrorListener {
        public void error (String fileName, Class type, Throwable t) {\r
                Gdx.app.error("AssetManagerTest", "couldn't load asset '" + fileName + "'", (Exception)t);\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               manager.dispose();\r
+               batch.dispose();\r
+               font.dispose();\r
+       }\r
 }
\ No newline at end of file

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/AtlasIssueTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/AtlasIssueTest.java
index 43c808f..cf8fa75 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/AtlasIssueTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/AtlasIssueTest.java
@@ -51,4 +51,11 @@ public class AtlasIssueTest extends GdxTest {
        public boolean needsGL20 () {\r
                return false;\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               atlas.dispose();\r
+               font.dispose();\r
+       }\r
 }\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 730c78c..ea23915 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontAlignmentTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontAlignmentTest.java
@@ -31,6 +31,7 @@ import com.badlogic.gdx.tests.utils.GdxTest;
 /** Shows how to align single line, wrapped, and multi line text within a rectangle. */\r
 public class BitmapFontAlignmentTest extends GdxTest {\r
        private SpriteBatch spriteBatch;\r
+       private Texture texture;\r
        private BitmapFont font;\r
        private BitmapFontCache cache;\r
        private Sprite logoSprite;\r
@@ -46,8 +47,8 @@ public class BitmapFontAlignmentTest extends GdxTest {
                });\r
 \r
                spriteBatch = new SpriteBatch();\r
-\r
-               logoSprite = new Sprite(new Texture(Gdx.files.internal("data/badlogic.jpg"), false));\r
+               texture = new Texture(Gdx.files.internal("data/badlogic.jpg"));\r
+               logoSprite = new Sprite(texture);\r
                logoSprite.setColor(1, 1, 1, 0.6f);\r
                logoSprite.setBounds(50, 100, 400, 100);\r
 \r
@@ -193,4 +194,12 @@ public class BitmapFontAlignmentTest extends GdxTest {
        public boolean needsGL20 () {\r
                return false;\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               spriteBatch.dispose();\r
+               font.dispose();\r
+               cache.dispose();\r
+               texture.dispose();\r
+       }\r
 }\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 9ac95ff..a0bb292 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontFlipTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontFlipTest.java
@@ -31,6 +31,7 @@ import com.badlogic.gdx.tests.utils.GdxTest;
 \r
 public class BitmapFontFlipTest extends GdxTest {\r
        private SpriteBatch spriteBatch;\r
+       private Texture texture;\r
        private BitmapFont font;\r
        private Sprite logoSprite;\r
        private Color red = new Color(1, 0, 0, 0);\r
@@ -50,7 +51,8 @@ public class BitmapFontFlipTest extends GdxTest {
                spriteBatch = new SpriteBatch();\r
                spriteBatch.setProjectionMatrix(new Matrix4().setToOrtho(0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight(), 0, 0, 1));\r
 \r
-               logoSprite = new Sprite(new Texture(Gdx.files.internal("data/badlogic.jpg")));\r
+               texture = new Texture(Gdx.files.internal("data/badlogic.jpg"));\r
+               logoSprite = new Sprite(texture);\r
                logoSprite.flip(false, true);\r
                logoSprite.setPosition(0, 320 - 256);\r
                logoSprite.setColor(1, 1, 1, 0.5f);\r
@@ -173,4 +175,21 @@ public class BitmapFontFlipTest extends GdxTest {
        public boolean needsGL20 () {\r
                return false;\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               spriteBatch.dispose();\r
+               font.dispose();\r
+               texture.dispose();\r
+               cache1.dispose();\r
+               cache2.dispose();\r
+               cache3.dispose();\r
+               cache4.dispose();\r
+               cache5.dispose();\r
+               cacheScaled1.dispose();\r
+               cacheScaled2.dispose();\r
+               cacheScaled3.dispose();\r
+               cacheScaled4.dispose();\r
+               cacheScaled5.dispose();\r
+       }\r
 }\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 19bd7c2..bf78328 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/BitmapFontTest.java
@@ -31,14 +31,15 @@ import com.badlogic.gdx.tests.utils.GdxTest;
 \r
 public class BitmapFontTest extends GdxTest {\r
        private SpriteBatch spriteBatch;\r
+       private TextureAtlas atlas;\r
        private BitmapFont font;\r
        private ShapeRenderer renderer;\r
        \r
        @Override\r
        public void create () {\r
                spriteBatch = new SpriteBatch();\r
-               TextureAtlas textureAtlas = new TextureAtlas("data/pack");\r
-               font = new BitmapFont(Gdx.files.internal("data/verdana39.fnt"), textureAtlas.findRegion("verdana39"), false);\r
+               atlas = new TextureAtlas("data/pack");\r
+               font = new BitmapFont(Gdx.files.internal("data/verdana39.fnt"), atlas.findRegion("verdana39"), false);\r
                renderer = new ShapeRenderer();\r
                renderer.setProjectionMatrix(spriteBatch.getProjectionMatrix());\r
        }\r
@@ -86,4 +87,12 @@ public class BitmapFontTest extends GdxTest {
        public boolean needsGL20 () {\r
                return false;\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               spriteBatch.dispose();\r
+               renderer.dispose();\r
+               font.dispose();\r
+               atlas.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/BlitTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/BlitTest.java
index 063b37a..71834f0 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/BlitTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/BlitTest.java
@@ -52,4 +52,13 @@ public class BlitTest extends GdxTest {
                batch.draw(psRgba8888, psRgb888.getWidth() + 20, 60);\r
                batch.end();\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               rgb888.dispose();\r
+               rgba8888.dispose();\r
+               psRgb888.dispose();\r
+               psRgba8888.dispose();\r
+       }\r
 }
\ No newline at end of file

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/BobTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/BobTest.java
index cb1204f..8c3032e 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/BobTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/BobTest.java
@@ -80,12 +80,17 @@ public class BobTest extends GdxTest {
                for (int i = 0; i < NUM_BOBS; i++) {\r
                        gl.glLoadIdentity();\r
                        gl.glTranslatef(Math.round(bobs[i].x), Math.round(bobs[i].y), 0);\r
-                       System.out.println(Math.round(bobs[i].x) + ", " + (int)bobs[i].x);\r
                        bobModel.render(GL10.GL_TRIANGLES, 0, 6);\r
                }\r
                bobModel.unbind();\r
        }\r
 \r
+       @Override\r
+       public void dispose () {\r
+               bobModel.dispose();\r
+               bobTexture.dispose();\r
+       }\r
+\r
        static class Bob {\r
                static final Random rand = new Random();\r
                public float x, y;\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DCharacterControllerTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DCharacterControllerTest.java
index 94c4fd8..33b5bb2 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DCharacterControllerTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DCharacterControllerTest.java
@@ -56,7 +56,15 @@ public class Box2DCharacterControllerTest extends GdxTest implements Application
                batch = new SpriteBatch();\r
                font = new BitmapFont(Gdx.files.internal("data/arial-15.fnt"), false);\r
        }\r
- \r
+       \r
+       @Override\r
+       public void dispose() {\r
+               world.dispose();\r
+               renderer.dispose();\r
+               batch.dispose();\r
+               font.dispose();\r
+       }\r
+       \r
        private void createWorld() {\r
                float y1 = 1; //(float)Math.random() * 0.1f + 1;\r
                float y2 = y1;\r
@@ -292,21 +300,7 @@ public class Box2DCharacterControllerTest extends GdxTest implements Application
                }\r
                return false;\r
        }\r
- \r
-       @Override\r
-       public void resize(int width, int height) {\r
- \r
-       }\r
- \r
-       @Override\r
-       public void pause() {\r
- \r
-       }\r
- \r
-       @Override\r
-       public void dispose() {\r
- \r
-       }\r
+\r
  \r
        @Override\r
        public boolean keyDown(int keycode) {\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java
index 7397d3e..afa6219 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTest.java
@@ -397,40 +397,14 @@ public class Box2DTest extends GdxTest implements InputProcessor {
        @Override\r
        public void dispose () {\r
                world.dispose();\r
+               renderer.dispose();\r
+               debugRenderer.dispose();\r
+               font.dispose();\r
+               textureRegion.getTexture().dispose();\r
        }\r
 \r
        @Override\r
        public boolean needsGL20 () {\r
                return false;\r
        }\r
-\r
-       // ---------------------------------------------------------------\r
-       // STUBS FOR UNIMPLEMENTED INTERFACE METHODS, NOTHING TO SEE HERE\r
-       // MOVE ALONG\r
-       // ---------------------------------------------------------------\r
-\r
-       @Override\r
-       public boolean keyDown (int keycode) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean keyTyped (char character) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean keyUp (int keycode) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean touchMoved (int x, int y) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean scrolled (int amount) {\r
-               return false;\r
-       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java
index c29e101..49fcc96 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java
@@ -72,6 +72,11 @@ public class Box2DTestCollection extends GdxTest implements InputProcessor, Gest
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               tests[testIndex].dispose();\r
+       }\r
+\r
+       @Override\r
        public boolean keyDown (int keycode) {\r
                tests[testIndex].keyDown(keycode);\r
 \r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/CompassTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/CompassTest.java
index fd18136..520bd66 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/CompassTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/CompassTest.java
@@ -70,6 +70,13 @@ public class CompassTest extends GdxTest {
                batch.getProjectionMatrix().setToOrtho2D(0, 0, width, height);\r
        }\r
 \r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               renderer.dispose();\r
+               font.dispose();\r
+       }\r
+\r
        private String getOrientationString () {\r
                StringBuilder builder = new StringBuilder();\r
                builder.append("\nazimuth: ");\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ComplexActionTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ComplexActionTest.java
index d1316c3..32e960a 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ComplexActionTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ComplexActionTest.java
@@ -40,6 +40,7 @@ public class ComplexActionTest extends GdxTest {
        }\r
 \r
        Stage stage;\r
+       Texture texture;\r
 \r
        @Override\r
        public void create () {\r
@@ -48,7 +49,7 @@ public class ComplexActionTest extends GdxTest {
                Action complexAction = Forever.$(Sequence.$(Parallel.$(RotateBy.$(180, 2), ScaleTo.$(1.4f, 1.4f, 2), FadeTo.$(0.7f, 2)),\r
                        Parallel.$(RotateBy.$(180, 2), ScaleTo.$(1.0f, 1.0f, 2), FadeTo.$(1.0f, 2))));\r
 \r
-               Texture texture = new Texture(Gdx.files.internal("data/badlogic.jpg"), false);\r
+               texture = new Texture(Gdx.files.internal("data/badlogic.jpg"), false);\r
                texture.setFilter(TextureFilter.Linear, TextureFilter.Linear);\r
 \r
                final Image img1 = new Image(new TextureRegion(texture));\r
@@ -78,4 +79,10 @@ public class ComplexActionTest extends GdxTest {
                stage.act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f));\r
                stage.draw();\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               stage.dispose();\r
+               texture.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/CullTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/CullTest.java
index 0900b55..04452ab 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/CullTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/CullTest.java
@@ -100,25 +100,8 @@ public class CullTest extends GdxTest implements ApplicationListener {
 \r
    @Override\r
    public void dispose() {\r
-      // TODO Auto-generated method stub\r
-      \r
-   }\r
-\r
-   @Override\r
-   public void pause() {\r
-      // TODO Auto-generated method stub\r
-      \r
-   }\r
-\r
-   @Override\r
-   public void resize(int width, int height) {\r
-      // TODO Auto-generated method stub\r
-      \r
-   }\r
-\r
-   @Override\r
-   public void resume() {\r
-      // TODO Auto-generated method stub\r
-      \r
+       batch.dispose();\r
+       font.dispose();\r
+       sphere.dispose();\r
    }\r
 }
\ No newline at end of file

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/CustomShaderSpriteBatchTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/CustomShaderSpriteBatchTest.java
index 3eed024..f8cbc18 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/CustomShaderSpriteBatchTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/CustomShaderSpriteBatchTest.java
@@ -29,6 +29,13 @@ public class CustomShaderSpriteBatchTest extends GdxTest {
                batch.draw(texture, 0, 0);\r
                batch.end();\r
        }\r
+       \r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               shader.dispose();\r
+               texture.dispose();\r
+       }\r
 \r
        @Override\r
        public boolean needsGL20 () {\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/DecalTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/DecalTest.java
index 9b426dc..269a500 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/DecalTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/DecalTest.java
@@ -76,6 +76,13 @@ public class DecalTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               egg.dispose();\r
+               wheel.dispose();\r
+               batch.dispose();\r
+       }\r
+\r
+       @Override\r
        public void render () {\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT | GL10.GL_DEPTH_BUFFER_BIT);\r
 \r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ETC1Test.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ETC1Test.java
index a12dc79..44f578e 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ETC1Test.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ETC1Test.java
@@ -83,4 +83,12 @@ public class ETC1Test extends GdxTest {
                font.draw(batch, "fps: " + Gdx.graphics.getFramesPerSecond(), 0, 30);\r
                batch.end();\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               font.dispose();\r
+               img1.dispose();\r
+               img2.dispose();\r
+       }\r
 }
\ No newline at end of file

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/EdgeDetectionTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/EdgeDetectionTest.java
index f3c0cfb..8360218 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/EdgeDetectionTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/EdgeDetectionTest.java
@@ -80,6 +80,15 @@ public class EdgeDetectionTest extends GdxTest {
                logger = new FPSLogger();\r
                calculateOffsets();\r
        }\r
+       \r
+       @Override\r
+       public void dispose () {\r
+               shader.dispose();\r
+               batchShader.dispose();\r
+               mesh.dispose();\r
+               fbo.dispose();\r
+               batch.dispose();\r
+       }\r
 \r
        private void calculateOffsets () {\r
                int idx = 0;\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/FilesTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/FilesTest.java
index 0e93241..8f215f9 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/FilesTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/FilesTest.java
@@ -477,6 +477,12 @@ public class FilesTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               font.dispose();\r
+       }\r
+\r
+       @Override\r
        public boolean needsGL20 () {\r
                return false;\r
        }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/FillrateTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/FillrateTest.java
index 2b23fd2..0650323 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/FillrateTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/FillrateTest.java
@@ -120,26 +120,6 @@ public class FillrateTest extends GdxTest implements InputProcessor {
        }\r
 \r
        @Override\r
-       public boolean keyDown (int keycode) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean keyUp (int keycode) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean keyTyped (char character) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean touchDown (int x, int y, int pointer, int newParam) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
        public boolean touchUp (int x, int y, int pointer, int button) {\r
                mode++;\r
                if (mode > 3) mode = 0;\r
@@ -148,22 +128,8 @@ public class FillrateTest extends GdxTest implements InputProcessor {
        }\r
 \r
        @Override\r
-       public boolean touchDragged (int x, int y, int pointer) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean needsGL20 () {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean touchMoved (int x, int y) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean scrolled (int amount) {\r
-               return false;\r
+       public void dispose () {\r
+               mesh.dispose();\r
+               texture.dispose();\r
        }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/FilterPerformanceTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/FilterPerformanceTest.java
index 51aaff8..5defb28 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/FilterPerformanceTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/FilterPerformanceTest.java
@@ -80,6 +80,14 @@ public class FilterPerformanceTest extends GdxTest {
                });\r
        }\r
 \r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               atlas.dispose();\r
+               texture.dispose();\r
+               font.dispose();\r
+       }\r
+\r
        public void render () {\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
 \r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/FlickScrollPaneTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/FlickScrollPaneTest.java
index 5db13bc..7835db3 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/FlickScrollPaneTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/FlickScrollPaneTest.java
@@ -74,13 +74,9 @@ public class FlickScrollPaneTest extends GdxTest {
                container.height = height;\r
        }\r
 \r
-       public void pause () {\r
-       }\r
-\r
-       public void resume () {\r
-       }\r
-\r
        public void dispose () {\r
+               stage.dispose();\r
+               font.dispose();\r
        }\r
 \r
        public boolean needsGL20 () {\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/FrameBufferTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/FrameBufferTest.java
index 491ffdf..6de4018 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/FrameBufferTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/FrameBufferTest.java
@@ -52,10 +52,10 @@ public class FrameBufferTest extends GdxTest {
        @Override\r
        public void render () {\r
                frameBuffer.begin();\r
-               Gdx.graphics.getGL20().glViewport(0, 0, frameBuffer.getWidth(), frameBuffer.getHeight());\r
-               Gdx.graphics.getGL20().glClearColor(0f, 1f, 0f, 1);\r
-               Gdx.graphics.getGL20().glClear(GL20.GL_COLOR_BUFFER_BIT);\r
-               Gdx.graphics.getGL20().glEnable(GL20.GL_TEXTURE_2D);\r
+               Gdx.gl20.glViewport(0, 0, frameBuffer.getWidth(), frameBuffer.getHeight());\r
+               Gdx.gl20.glClearColor(0f, 1f, 0f, 1);\r
+               Gdx.gl20.glClear(GL20.GL_COLOR_BUFFER_BIT);\r
+               Gdx.gl20.glEnable(GL20.GL_TEXTURE_2D);\r
                texture.bind();\r
                meshShader.begin();\r
                meshShader.setUniformi("u_texture", 0);\r
@@ -112,6 +112,15 @@ public class FrameBufferTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               mesh.dispose();\r
+               texture.dispose();\r
+               frameBuffer.dispose();\r
+               spriteBatch.dispose();\r
+               meshShader.dispose();\r
+       }\r
+\r
+       @Override\r
        public boolean needsGL20 () {\r
                return true;\r
        }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/GestureDetectorTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/GestureDetectorTest.java
index 817d820..a9652a8 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/GestureDetectorTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/GestureDetectorTest.java
@@ -115,6 +115,12 @@ public class GestureDetectorTest extends GdxTest implements ApplicationListener
                batch.end();\r
        }\r
 \r
+       @Override\r
+       public void dispose () {\r
+               texture.dispose();\r
+               batch.dispose();\r
+       }\r
+\r
        public boolean needsGL20 () {\r
                return false;\r
        }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/GroupCullingTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/GroupCullingTest.java
index 6837f50..71dcca6 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/GroupCullingTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/GroupCullingTest.java
@@ -15,6 +15,7 @@ public class GroupCullingTest extends GdxTest {
        static private final int count = 100;\r
 \r
        private Stage stage;\r
+       private Skin skin;\r
        private Table root;\r
        private Label drawnLabel;\r
        int drawn;\r
@@ -26,7 +27,7 @@ public class GroupCullingTest extends GdxTest {
                root = new Table();\r
                stage.addActor(root);\r
 \r
-               Skin skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
+               skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
 \r
                Table labels = new Table();\r
                root.add(new ScrollPane(labels, skin)).expand().fill();\r
@@ -44,6 +45,12 @@ public class GroupCullingTest extends GdxTest {
                }\r
        }\r
 \r
+       @Override\r
+       public void dispose () {\r
+               stage.dispose();\r
+               skin.dispose();\r
+       }\r
+\r
        public void resize (int width, int height) {\r
                stage.setViewport(width, height, true);\r
                root.width = width;\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/GroupFadeTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/GroupFadeTest.java
index 37ccc99..bb862e4 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/GroupFadeTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/GroupFadeTest.java
@@ -35,11 +35,12 @@ public class GroupFadeTest extends GdxTest {
                return false;\r
        }\r
 \r
+       Texture texture;\r
        Stage stage;\r
 \r
        @Override\r
        public void create () {\r
-               Texture texture = new Texture(Gdx.files.internal("data/badlogicsmall.jpg"));\r
+               texture = new Texture(Gdx.files.internal("data/badlogicsmall.jpg"));\r
                stage = new Stage(480, 320, true);\r
 \r
                for (int i = 0; i < 100; i++) {\r
@@ -59,4 +60,10 @@ public class GroupFadeTest extends GdxTest {
                stage.act(Gdx.graphics.getDeltaTime());\r
                stage.draw();\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               texture.dispose();\r
+               stage.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ImageScaleTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ImageScaleTest.java
index 1d745b0..c9e1dd3 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ImageScaleTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ImageScaleTest.java
@@ -27,18 +27,20 @@ import com.badlogic.gdx.utils.Scaling;
 \r
 public class ImageScaleTest extends GdxTest {\r
        Stage stage;\r
+       Texture texture;\r
 \r
        public void create () {\r
                stage = new Stage(0, 0, false);\r
                Gdx.input.setInputProcessor(stage);\r
 \r
-               Image image = new Image(new Texture("data/group-debug.png"), Scaling.fit);\r
+               texture = new Texture("data/group-debug.png");\r
+               Image image = new Image(texture, Scaling.fit);\r
                image.x = image.y = 100;\r
                image.width = 400;\r
                image.height = 200;\r
                stage.addActor(image);\r
 \r
-               Image image2 = new Image(new Texture("data/group-debug.png"), Scaling.fit);\r
+               Image image2 = new Image(texture, Scaling.fit);\r
                image2.x = image2.y = 100;\r
                image2.width = 400;\r
                image2.height = 200;\r
@@ -54,6 +56,12 @@ public class ImageScaleTest extends GdxTest {
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                stage.draw();\r
        }\r
+       \r
+       @Override\r
+       public void dispose () {\r
+               stage.dispose();\r
+               texture.dispose();\r
+       }\r
 \r
        public void resize (int width, int height) {\r
                stage.setViewport(width, height, false);\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ImageTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ImageTest.java
index 593e52a..f885e8f 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ImageTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ImageTest.java
@@ -16,11 +16,12 @@ public class ImageTest extends GdxTest {
        Skin skin;\r
        Stage ui;\r
        Table root;\r
+       TextureRegion image2;\r
 \r
        @Override\r
        public void create () {\r
                skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
-               TextureRegion image2 = new TextureRegion(new Texture(Gdx.files.internal("data/badlogic.jpg")));\r
+               image2 = new TextureRegion(new Texture(Gdx.files.internal("data/badlogic.jpg")));\r
                ui = new Stage(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(), false);\r
                Gdx.input.setInputProcessor(ui);\r
 \r
@@ -33,6 +34,13 @@ public class ImageTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               ui.dispose();\r
+               skin.dispose();\r
+               image2.getTexture().dispose();\r
+       }\r
+\r
+       @Override\r
        public void render () {\r
                Gdx.gl.glClearColor(0.2f, 0.2f, 0.2f, 1);\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectShaderTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectShaderTest.java
index aa648f1..b05f2e1 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectShaderTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/IndexBufferObjectShaderTest.java
@@ -42,6 +42,7 @@ public class IndexBufferObjectShaderTest extends GdxTest {
        public void dispose () {\r
                texture.dispose();\r
                shader.dispose();\r
+               vbo.dispose();\r
                ibo.dispose();\r
        }\r
 \r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/IntegerBitmapFontTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/IntegerBitmapFontTest.java
index 3b4d963..80417d8 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/IntegerBitmapFontTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/IntegerBitmapFontTest.java
@@ -49,6 +49,16 @@ public class IntegerBitmapFontTest extends GdxTest {
                fillCaches();\r
        }\r
 \r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               font.dispose();\r
+               singleLineCache.dispose();\r
+               singleLineCacheNonInteger.dispose();\r
+               multiLineCache.dispose();\r
+               multiLineCacheNonInteger.dispose();\r
+       }\r
+\r
        public void render () {\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                batch.begin();\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/InverseKinematicsTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/InverseKinematicsTest.java
index 09669cd..52ca02f 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/InverseKinematicsTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/InverseKinematicsTest.java
@@ -72,6 +72,11 @@ public class InverseKinematicsTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               renderer.dispose();\r
+       }\r
+\r
+       @Override\r
        public void render () {\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
 \r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/IsoCamTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/IsoCamTest.java
index 5a4451c..0d63013 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/IsoCamTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/IsoCamTest.java
@@ -66,6 +66,12 @@ public class IsoCamTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               texture.dispose();\r
+               batch.dispose();\r
+       }\r
+\r
+       @Override\r
        public void render () {\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r
                cam.update();\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/IsometricTileTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/IsometricTileTest.java
index 8a25d0a..3c6eb23 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/IsometricTileTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/IsometricTileTest.java
@@ -81,6 +81,13 @@ public class IsometricTileTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               renderer.dispose();\r
+               texture.dispose();\r
+               for(SpriteCache cache: caches) cache.dispose();\r
+       }\r
+\r
+       @Override\r
        public void render () {\r
                Gdx.gl.glClearColor(0.7f, 0.7f, 0.7f, 1);\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/KinematicBodyTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/KinematicBodyTest.java
index dbf73f8..5ae650f 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/KinematicBodyTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/KinematicBodyTest.java
@@ -66,4 +66,10 @@ public class KinematicBodyTest extends GdxTest {
                cam.update();\r
                renderer.render(world, cam.combined);\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               world.dispose();\r
+               renderer.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/LabelTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/LabelTest.java
index 3b9e353..8df3ecc 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/LabelTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/LabelTest.java
@@ -77,6 +77,12 @@ public class LabelTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               stage.dispose();\r
+               skin.dispose();\r
+       }\r
+\r
+       @Override\r
        public void render () {\r
                Gdx.gl.glClearColor(0.2f, 0.2f, 0.2f, 1);\r
                Gdx.gl.glClear(GL10.GL_COLOR_BUFFER_BIT);\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/MeshShaderTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/MeshShaderTest.java
index 777324f..42f43c1 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/MeshShaderTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/MeshShaderTest.java
@@ -96,6 +96,13 @@ public class MeshShaderTest extends GdxTest {
                mesh.render(shader, GL10.GL_TRIANGLES);\r
                shader.end();\r
        }\r
+       \r
+       @Override\r
+       public void dispose () {\r
+               mesh.dispose();\r
+               texture.dispose();\r
+               shader.dispose();\r
+       }\r
 \r
        @Override\r
        public boolean needsGL20 () {\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/MipMapTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/MipMapTest.java
index e5bd8f1..c8404b0 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/MipMapTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/MipMapTest.java
@@ -55,6 +55,7 @@ public class MipMapTest extends GdxTest {
        Texture currTexture;\r
        ShaderProgram shader;\r
        Stage ui;\r
+       Skin skin;\r
        InputMultiplexer multiplexer;\r
        SelectBox minFilter;\r
        SelectBox magFilter;\r
@@ -91,7 +92,7 @@ public class MipMapTest extends GdxTest {
        }\r
 \r
        private void createUI () {\r
-               Skin skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
+               skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
                ui = new Stage(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(), false);\r
 \r
                String[] filters = new String[TextureFilter.values().length];\r
@@ -135,4 +136,14 @@ public class MipMapTest extends GdxTest {
 \r
                ui.draw();\r
        }\r
+       \r
+       @Override\r
+       public void dispose () {\r
+               shader.dispose();\r
+               textureHW.dispose();\r
+               textureSW.dispose();\r
+               mesh.dispose();\r
+               ui.dispose();\r
+               skin.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/MultitouchTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/MultitouchTest.java
index 4c5698f..a552924 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/MultitouchTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/MultitouchTest.java
@@ -61,4 +61,9 @@ public class MultitouchTest extends GdxTest {
                camera.position.set(Gdx.graphics.getWidth() / 2.0f, Gdx.graphics.getHeight() / 2.0f, 0);\r
                Gdx.input.setInputProcessor(this);\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               renderer.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/MusicTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/MusicTest.java
index 0bc64b1..f50ee52 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/MusicTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/MusicTest.java
@@ -79,4 +79,11 @@ public class MusicTest extends GdxTest {
                        }\r
                }\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               buttons.getTexture().dispose();\r
+               for(Music m: music) m.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ParallaxTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ParallaxTest.java
index 97ed0f7..c319c2a 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ParallaxTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ParallaxTest.java
@@ -76,6 +76,13 @@ public class ParallaxTest extends GdxTest {
                batch = new SpriteBatch();\r
                font = new BitmapFont(Gdx.files.internal("data/arial-15.fnt"), false);\r
        }\r
+       \r
+       @Override\r
+       public void dispose () {\r
+               layers[0].getTexture().dispose();\r
+               batch.dispose();\r
+               font.dispose();\r
+       }\r
 \r
        @Override\r
        public void render () {\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterTest.java
index fe4304a..6974686 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterTest.java
@@ -111,6 +111,13 @@ public class ParticleEmitterTest extends GdxTest {
 \r
                Gdx.input.setInputProcessor(inputProcessor);\r
        }\r
+       \r
+       @Override\r
+       public void dispose () {\r
+               spriteBatch.dispose();\r
+               effect.dispose();\r
+       }\r
+\r
 \r
        public void render () {\r
                spriteBatch.getProjectionMatrix().setToOrtho2D(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/PixelsPerInchTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/PixelsPerInchTest.java
index 5dc5bdb..dc9c991 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/PixelsPerInchTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/PixelsPerInchTest.java
@@ -50,6 +50,13 @@ public class PixelsPerInchTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               font.dispose();\r
+               batch.dispose();\r
+               texture.dispose();\r
+       }\r
+\r
+       @Override\r
        public boolean needsGL20 () {\r
                return true;\r
        }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ProjectiveTextureTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ProjectiveTextureTest.java
index 6c7ba19..66654c4 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ProjectiveTextureTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ProjectiveTextureTest.java
@@ -65,6 +65,7 @@ public class ProjectiveTextureTest extends GdxTest {
        Matrix4 modelNormal = new Matrix4();\r
        ShaderProgram projTexShader;\r
        Stage ui;\r
+       Skin skin;\r
        InputMultiplexer multiplexer = new InputMultiplexer();\r
        PerspectiveCamController controller;\r
        ImmediateModeRenderer20 renderer;\r
@@ -108,7 +109,7 @@ public class ProjectiveTextureTest extends GdxTest {
 \r
        public void setupUI () {\r
                ui = new Stage(480, 320, true);\r
-               Skin skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
+               skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
                TextButton reload = new TextButton("Reload Shaders", skin.getStyle(TextButtonStyle.class), "reload");\r
                SelectBox camera = new SelectBox(new String[] {"Camera", "Light"}, skin.getStyle(SelectBoxStyle.class), "camera");\r
                Label fps = new Label("fps: ", skin.getStyle(LabelStyle.class), "fps");\r
@@ -189,4 +190,15 @@ public class ProjectiveTextureTest extends GdxTest {
                shader.setUniformi("u_texture", 0);\r
                mesh.render(shader, GL20.GL_TRIANGLES);\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               texture.dispose();\r
+               plane.dispose();\r
+               cube.dispose();\r
+               projTexShader.dispose();\r
+               ui.dispose();\r
+               skin.dispose();\r
+               renderer.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/RotationTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/RotationTest.java
index a23f9f4..2e74895 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/RotationTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/RotationTest.java
@@ -52,4 +52,10 @@ public class RotationTest extends GdxTest {
                batch.draw(region, 0, 128, 64, 64, 128, 128, 1, 1, 270);\r
                batch.end();\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               texture.dispose();\r
+               batch.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ScrollPaneTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ScrollPaneTest.java
index d735f11..a7b6b68 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ScrollPaneTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ScrollPaneTest.java
@@ -28,12 +28,13 @@ import com.badlogic.gdx.tests.utils.GdxTest;
 \r
 public class ScrollPaneTest extends GdxTest {\r
        Stage stage;\r
+       Skin skin;\r
 \r
        public void create () {\r
                stage = new Stage(0, 0, false);\r
                Gdx.input.setInputProcessor(stage);\r
 \r
-               Skin skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
+               skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
                \r
                Table mytable = new Table();\r
                mytable.debug();\r
@@ -73,6 +74,12 @@ public class ScrollPaneTest extends GdxTest {
                stage.setViewport(width, height, false);\r
        }\r
 \r
+       @Override\r
+       public void dispose () {\r
+               stage.dispose();\r
+               skin.dispose();\r
+       }\r
+\r
        public boolean needsGL20 () {\r
                return false;\r
        }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ShaderMultitextureTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ShaderMultitextureTest.java
index 8106914..fcd6321 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ShaderMultitextureTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ShaderMultitextureTest.java
@@ -106,6 +106,14 @@ public class ShaderMultitextureTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               texture.dispose();\r
+               texture2.dispose();\r
+               shader.dispose();\r
+               mesh.dispose();\r
+       }\r
+\r
+       @Override\r
        public boolean needsGL20 () {\r
                return true;\r
        }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ShadowMappingTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ShadowMappingTest.java
index 7f76d5e..99cb2c0 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ShadowMappingTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ShadowMappingTest.java
@@ -48,6 +48,7 @@ public class ShadowMappingTest extends GdxTest {
        }\r
 \r
        Stage ui;\r
+       Skin skin;\r
 \r
        PerspectiveCamera cam;\r
        PerspectiveCamera lightCam;\r
@@ -116,7 +117,7 @@ public class ShadowMappingTest extends GdxTest {
 \r
        private void setupUI () {\r
                ui = new Stage(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(), false);\r
-               Skin skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
+               skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
 \r
                Label label = new Label("Camera:", skin.getStyle(LabelStyle.class));\r
                SelectBox cameraCombo = new SelectBox(new String[] {"Scene", "Light"}, skin.getStyle(SelectBoxStyle.class));\r
@@ -223,4 +224,17 @@ public class ShadowMappingTest extends GdxTest {
                ui.draw();\r
                Table.drawDebug(ui);\r
        }\r
+       \r
+       @Override\r
+       public void dispose () {\r
+               ui.dispose();\r
+               skin.dispose();\r
+               plane.dispose();\r
+               cube.dispose();\r
+               flatShader.dispose();\r
+               shadowGenShader.dispose();\r
+               shadowMapShader.dispose();\r
+               currShader.dispose();\r
+               shadowMap.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererTest.java
index 346de81..74c5174 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererTest.java
@@ -196,4 +196,11 @@ public class ShapeRendererTest extends GdxTest {
                font.draw(batch, "fps: " + Gdx.graphics.getFramesPerSecond(), 0, 20);\r
                batch.end();\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               font.dispose();\r
+               renderer.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleAnimationTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleAnimationTest.java
index a1840ce..54528d1 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleAnimationTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleAnimationTest.java
@@ -37,7 +37,7 @@ public class SimpleAnimationTest extends GdxTest {
        private float currentFrameTime;\r
        private Vector2 position;\r
 \r
-       private Texture tex;\r
+       private Texture texture;\r
 \r
        private Animation downWalk;\r
        private Animation leftWalk;\r
@@ -51,8 +51,8 @@ public class SimpleAnimationTest extends GdxTest {
        @Override\r
        public void create () {\r
                Gdx.input.setInputProcessor(this);\r
-               tex = new Texture(Gdx.files.internal("data/animation.png"));\r
-               TextureRegion[][] regions = TextureRegion.split(tex, 32, 48);\r
+               texture = new Texture(Gdx.files.internal("data/animation.png"));\r
+               TextureRegion[][] regions = TextureRegion.split(texture, 32, 48);\r
                TextureRegion[] downWalkReg = regions[0];\r
                TextureRegion[] leftWalkReg = regions[1];\r
                TextureRegion[] rightWalkReg = regions[2];\r
@@ -86,4 +86,10 @@ public class SimpleAnimationTest extends GdxTest {
                position.y = Gdx.graphics.getHeight() - y;\r
                return true;\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               spriteBatch.dispose();\r
+               texture.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleDecalTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleDecalTest.java
index f70843b..3abc84a 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleDecalTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleDecalTest.java
@@ -100,6 +100,11 @@ public class SimpleDecalTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+       }\r
+\r
+       @Override\r
        public boolean needsGL20 () {\r
                return true;\r
        }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleStageCullingTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleStageCullingTest.java
index 0e29aa0..a5a00b6 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleStageCullingTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SimpleStageCullingTest.java
@@ -101,6 +101,7 @@ public class SimpleStageCullingTest extends GdxTest {
 \r
        OrthoCamController camController;\r
        Stage stage;\r
+       Texture texture;\r
        SpriteBatch batch;\r
        BitmapFont font;\r
 \r
@@ -112,7 +113,7 @@ public class SimpleStageCullingTest extends GdxTest {
                Gdx.input.setInputProcessor(camController);\r
 \r
                // load a dummy texture\r
-               Texture texture = new Texture(Gdx.files.internal("data/badlogicsmall.jpg"));\r
+               texture = new Texture(Gdx.files.internal("data/badlogicsmall.jpg"));\r
 \r
                // populate the stage with some actors and groups.\r
                for (int i = 0; i < 5000; i++) {\r
@@ -144,6 +145,14 @@ public class SimpleStageCullingTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               stage.dispose();\r
+               texture.dispose();\r
+               batch.dispose();\r
+               font.dispose();\r
+       }\r
+\r
+       @Override\r
        public boolean needsGL20 () {\r
                return false;\r
        }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SortedSpriteTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SortedSpriteTest.java
index a19a134..076ec12 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SortedSpriteTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SortedSpriteTest.java
@@ -73,6 +73,8 @@ public class SortedSpriteTest extends GdxTest {
        \r
        /** spritebatch used for rendering **/\r
        SpriteBatch batch;\r
+       /** the texture used by the sprites **/\r
+       Texture texture;\r
        /** array of sprites **/\r
        Array<MySprite> sprites = new Array<MySprite>();\r
        /** a comparator, we keep it around so the GC shuts up **/\r
@@ -85,7 +87,7 @@ public class SortedSpriteTest extends GdxTest {
                \r
                // load a texture, usually you dispose of this \r
                // eventually.\r
-               Texture texture = new Texture("data/badlogicsmall.jpg");\r
+               texture = new Texture("data/badlogicsmall.jpg");\r
                \r
                // create 100 sprites, tinted red, from dark to light. \r
                // red color component is also used as z-value so we\r
@@ -122,4 +124,9 @@ public class SortedSpriteTest extends GdxTest {
                }\r
                batch.end();\r
        }\r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               texture.dispose();\r
+       }\r
 }      \r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SoundTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SoundTest.java
index 5eda545..114bc0e 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SoundTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SoundTest.java
@@ -39,6 +39,7 @@ public class SoundTest extends GdxTest {
        float volume = 0.5f;\r
        long soundId = 0;\r
        Stage ui;\r
+       Skin skin;\r
 \r
        BitmapFont font;\r
        SpriteBatch batch;\r
@@ -47,7 +48,7 @@ public class SoundTest extends GdxTest {
        public void create () {\r
                sound = Gdx.audio.newSound(Gdx.files.getFileHandle("data/shotgun.wav", FileType.Internal));\r
 \r
-               Skin skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
+               skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
                ui = new Stage(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(), true);\r
                TextButton play = new TextButton("Play", skin);\r
                TextButton stop = new TextButton("Stop", skin);\r
@@ -126,6 +127,15 @@ public class SoundTest extends GdxTest {
                ui.act(Gdx.graphics.getDeltaTime());\r
                ui.draw();\r
        }\r
+       \r
+       @Override\r
+       public void dispose () {\r
+               ui.dispose();\r
+               skin.dispose();\r
+               sound.dispose();\r
+               font.dispose();\r
+               batch.dispose();\r
+       }\r
 \r
        @Override\r
        public boolean needsGL20 () {\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchShaderTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchShaderTest.java
index 623d051..504aee5 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchShaderTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchShaderTest.java
@@ -112,6 +112,13 @@ public class SpriteBatchShaderTest extends GdxTest {
        }\r
 \r
        @Override\r
+       public void dispose () {\r
+               spriteBatch.dispose();\r
+               texture.dispose();\r
+               texture2.dispose();\r
+       }\r
+\r
+       @Override\r
        public boolean needsGL20 () {\r
                return true;\r
        }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheOffsetTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheOffsetTest.java
index 08173c6..c8ef9fb 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheOffsetTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheOffsetTest.java
@@ -29,9 +29,11 @@ public class SpriteCacheOffsetTest extends GdxTest implements InputProcessor {
        private int tileMapHeight = 5;\r
        private int tileSize = 32;\r
        private SpriteCache cache;\r
+       private Texture texture;\r
 \r
        public void create () {\r
-               Sprite sprite = new Sprite(new Texture(Gdx.files.internal("data/badlogicsmall.jpg")));\r
+               texture = new Texture(Gdx.files.internal("data/badlogicsmall.jpg"));\r
+               Sprite sprite = new Sprite(texture);\r
                sprite.setSize(tileSize, tileSize);\r
 \r
                cache = new SpriteCache(1000, false);\r
@@ -54,41 +56,9 @@ public class SpriteCacheOffsetTest extends GdxTest implements InputProcessor {
                cache.end();\r
        }\r
 \r
-       public boolean keyDown (int keycode) {\r
-               return false;\r
-       }\r
-\r
-       public boolean keyUp (int keycode) {\r
-               return false;\r
-       }\r
-\r
-       public boolean keyTyped (char character) {\r
-               return false;\r
-       }\r
-\r
-       public boolean touchDown (int x, int y, int pointer, int newParam) {\r
-               return false;\r
-       }\r
-\r
-       public boolean touchUp (int x, int y, int pointer, int button) {\r
-               return false;\r
-       }\r
-\r
-       public boolean touchDragged (int x, int y, int pointer) {\r
-               return false;\r
-       }\r
-\r
-       public boolean needsGL20 () {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean touchMoved (int x, int y) {\r
-               return false;\r
-       }\r
-\r
        @Override\r
-       public boolean scrolled (int amount) {\r
-               return false;\r
+       public void dispose () {\r
+               cache.dispose();\r
+               texture.dispose();\r
        }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheTest.java
index 3e07b4a..14e6f64 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteCacheTest.java
@@ -43,7 +43,6 @@ public class SpriteCacheTest extends GdxTest implements InputProcessor {
        int renderMethod = 0;\r
 \r
        private float[] sprites;\r
-\r
        private float[] sprites2;\r
 \r
        @Override\r
@@ -118,7 +117,7 @@ public class SpriteCacheTest extends GdxTest implements InputProcessor {
        public void create () {\r
                spriteCache = new SpriteCache(1000, true);\r
 \r
-               Texture texture = new Texture(Gdx.files.internal("data/badlogicsmall.jpg"));\r
+               texture = new Texture(Gdx.files.internal("data/badlogicsmall.jpg"));\r
                texture.setFilter(TextureFilter.Linear, TextureFilter.Linear);\r
 \r
                Pixmap pixmap = new Pixmap(32, 32, Format.RGBA8888);\r
@@ -201,44 +200,15 @@ public class SpriteCacheTest extends GdxTest implements InputProcessor {
        }\r
 \r
        @Override\r
-       public boolean keyTyped (char character) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean keyUp (int keycode) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean touchDown (int x, int y, int pointer, int newParam) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean touchDragged (int x, int y, int pointer) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
        public boolean touchUp (int x, int y, int pointer, int button) {\r
                renderMethod = (renderMethod + 1) % 2;\r
                return false;\r
        }\r
 \r
        @Override\r
-       public boolean needsGL20 () {\r
-               return false;\r
+       public void dispose () {\r
+               texture.dispose();\r
+               texture2.dispose();\r
+               spriteCache.dispose();\r
        }\r
-\r
-       @Override\r
-       public boolean touchMoved (int x, int y) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean scrolled (int amount) {\r
-               return false;\r
-       }\r
-\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/StagePerformanceTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/StagePerformanceTest.java
index ce0025e..44d7b5f 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/StagePerformanceTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/StagePerformanceTest.java
@@ -39,6 +39,7 @@ public class StagePerformanceTest extends GdxTest {
                return true;\r
        }\r
 \r
+       Texture texture;\r
        TextureRegion[] regions;\r
        Stage stage;\r
        SpriteBatch batch;\r
@@ -54,10 +55,10 @@ public class StagePerformanceTest extends GdxTest {
                regions = new TextureRegion[8 * 8];\r
                sprites = new Sprite[24 * 12];\r
 \r
-               Texture tex = new Texture(Gdx.files.internal("data/badlogic.jpg"));\r
+               texture = new Texture(Gdx.files.internal("data/badlogic.jpg"));\r
                for (int y = 0; y < 8; y++) {\r
                        for (int x = 0; x < 8; x++) {\r
-                               regions[x + y * 8] = new TextureRegion(tex, x * 32, y * 32, 32, 32);\r
+                               regions[x + y * 8] = new TextureRegion(texture, x * 32, y * 32, 32, 32);\r
                        }\r
                }\r
 \r
@@ -115,4 +116,12 @@ public class StagePerformanceTest extends GdxTest {
                        useStage = !useStage;\r
                }\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               stage.dispose();\r
+               batch.dispose();\r
+               font.dispose();\r
+               texture.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/StageTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/StageTest.java
index dc4a63b..487c33a 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/StageTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/StageTest.java
@@ -221,42 +221,11 @@ public class StageTest extends GdxTest implements InputProcessor {
        }\r
 \r
        @Override\r
-       public boolean touchUp (int x, int y, int pointer, int button) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean touchDragged (int x, int y, int pointer) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean keyDown (int keycode) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean keyUp (int keycode) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean keyTyped (char character) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean needsGL20 () {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean touchMoved (int x, int y) {\r
-               return false;\r
-       }\r
-\r
-       @Override\r
-       public boolean scrolled (int amount) {\r
-               return false;\r
+       public void dispose () {\r
+               ui.dispose();\r
+               renderer.dispose();\r
+               texture.dispose();\r
+               uiTexture.dispose();\r
+               font.dispose();\r
        }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/TableTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/TableTest.java
index 9cc1555..61ec168 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/TableTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/TableTest.java
@@ -35,6 +35,7 @@ import com.badlogic.gdx.tests.utils.GdxTest;
 public class TableTest extends GdxTest {\r
        Skin skin;\r
        Stage stage;\r
+       Texture texture;\r
        Table root;\r
 \r
        @Override\r
@@ -44,7 +45,8 @@ public class TableTest extends GdxTest {
 \r
                skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
 \r
-               TextureRegion region = new TextureRegion(new Texture(Gdx.files.internal("data/badlogic.jpg")));\r
+               texture = new Texture(Gdx.files.internal("data/badlogic.jpg"));\r
+               TextureRegion region = new TextureRegion(texture);\r
 \r
                NinePatch patch = skin.getPatch("default-round");\r
 \r
@@ -101,7 +103,9 @@ public class TableTest extends GdxTest {
        }\r
 \r
        @Override\r
-       public boolean needsGL20 () {\r
-               return false;\r
+       public void dispose () {\r
+               stage.dispose();\r
+               texture.dispose();\r
+               skin.dispose();\r
        }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/TextButtonTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/TextButtonTest.java
index 942ccdf..f4d7cda 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/TextButtonTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/TextButtonTest.java
@@ -28,13 +28,13 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.tests.utils.GdxTest;\r
 \r
 public class TextButtonTest extends GdxTest {\r
-       \r
        private Stage stage;\r
+       private Skin skin;\r
        \r
        @Override\r
        public void create () {\r
                stage = new Stage(0, 0, false, new SpriteBatch());\r
-               Skin skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
+               skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
                for (int i = 0; i < 500; i++) {\r
                        TextButton t = new TextButton("Button"+i, skin);\r
                        t.x = MathUtils.random(0, Gdx.graphics.getWidth());\r
@@ -62,7 +62,8 @@ public class TextButtonTest extends GdxTest {
        }\r
 \r
        @Override\r
-       public boolean needsGL20 () {\r
-               return false;\r
+       public void dispose () {\r
+               stage.dispose();\r
+               skin.dispose();\r
        }\r
 }
\ No newline at end of file

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/TextureAtlasTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/TextureAtlasTest.java
index 6cf52b4..4a9d873 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/TextureAtlasTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/TextureAtlasTest.java
@@ -73,20 +73,10 @@ public class TextureAtlasTest extends GdxTest {
                batch.end();\r
        }\r
 \r
-       public void resize (int width, int height) {\r
-       }\r
-\r
-       public void pause () {\r
-       }\r
-\r
-       public void resume () {\r
-       }\r
-\r
        public void dispose () {\r
                atlas.dispose();\r
-       }\r
-\r
-       public boolean needsGL20 () {\r
-               return false;\r
+               jumpAtlas.dispose();\r
+               batch.dispose();\r
+               font.dispose();\r
        }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/UITest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/UITest.java
index ed6a4e0..b561154 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/UITest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/UITest.java
@@ -63,14 +63,18 @@ public class UITest extends GdxTest {
        Skin skin;\r
        Stage stage;\r
        SpriteBatch batch;\r
+       Texture texture1;\r
+       Texture texture2;\r
        Actor root;\r
 \r
        @Override\r
        public void create () {\r
                batch = new SpriteBatch();\r
                skin = new Skin(Gdx.files.internal("data/uiskin.json"), Gdx.files.internal("data/uiskin.png"));\r
-               TextureRegion image = new TextureRegion(new Texture(Gdx.files.internal("data/badlogicsmall.jpg")));\r
-               TextureRegion image2 = new TextureRegion(new Texture(Gdx.files.internal("data/badlogic.jpg")));\r
+               texture1 = new Texture(Gdx.files.internal("data/badlogicsmall.jpg"));\r
+               texture2 = new Texture(Gdx.files.internal("data/badlogic.jpg"));\r
+               TextureRegion image = new TextureRegion(texture1);\r
+               TextureRegion image2 = new TextureRegion(texture2);\r
                stage = new Stage(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(), false);\r
                Gdx.input.setInputProcessor(stage);\r
 \r
@@ -158,7 +162,10 @@ public class UITest extends GdxTest {
        }\r
 \r
        @Override\r
-       public boolean needsGL20 () {\r
-               return false;\r
+       public void dispose () {\r
+               stage.dispose();\r
+               skin.dispose();\r
+               texture1.dispose();\r
+               texture2.dispose();\r
        }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectShaderTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectShaderTest.java
index 9b30cee..5b72c14 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectShaderTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/VertexBufferObjectShaderTest.java
@@ -45,6 +45,7 @@ public class VertexBufferObjectShaderTest extends GdxTest {
        public void dispose () {\r
                texture.dispose();\r
                vbo.dispose();\r
+               indices.dispose();\r
                shader.dispose();\r
        }\r
 \r
@@ -90,7 +91,7 @@ public class VertexBufferObjectShaderTest extends GdxTest {
 \r
                texture = new Texture(Gdx.files.internal("data/badlogic.jpg"));\r
        }\r
-\r
+       \r
        @Override\r
        public void resume () {\r
                vbo.invalidate();\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/YDownTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/YDownTest.java
index f9c99e9..73a61d8 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/YDownTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/YDownTest.java
@@ -162,4 +162,13 @@ public class YDownTest extends GdxTest {
                        return result;\r
                }\r
        }\r
+\r
+       @Override\r
+       public void dispose () {\r
+               batch.dispose();\r
+               font.dispose();\r
+               atlas.dispose();\r
+               region.getTexture().dispose();\r
+               stage.dispose();\r
+       }\r
 }\r