+ Fog

+ libGDX: cleaning my resources
MichaelOliveiraBx · May 28, 2013 · 30cfe6e · 30cfe6e
1 parent 5e0bb51
commit 30cfe6e
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 23 deletions.
diff --git a/demos/cuboc/cuboc-android/project.properties b/demos/cuboc/cuboc-android/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-17
diff --git a/demos/invaders/gdx-invaders-android/project.properties b/demos/invaders/gdx-invaders-android/project.properties
@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-16
+target=android-17
diff --git a/demos/pax-britannica/pax-britannica-android/project.properties b/demos/pax-britannica/pax-britannica-android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-17
diff --git a/demos/vector-pinball/gdx-vectorpinball-android/project.properties b/demos/vector-pinball/gdx-vectorpinball-android/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-17
diff --git a/extensions/gdx-remote/project.properties b/extensions/gdx-remote/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-17
diff --git a/tests/gdx-tests-android/assets/data/g3d/fighter.g3db b/tests/gdx-tests-android/assets/data/g3d/fighter.g3db
diff --git a/tests/gdx-tests-android/assets/data/g3d/ship.png b/tests/gdx-tests-android/assets/data/g3d/ship.png
diff --git a/tests/gdx-tests-android/project.properties b/tests/gdx-tests-android/project.properties
@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-16
+target=android-17
diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/BaseG3dHudTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/BaseG3dHudTest.java
@@ -24,7 +24,7 @@ public abstract class BaseG3dHudTest extends BaseG3dTest {
 
 	protected  String models[] = new String[] {
 		"car.obj", "cube.obj", "scene.obj", "scene2.obj", "sphere.obj", "wheel.obj", 
-		"g3d/head.g3db", "g3d/knight.g3dj", "g3d/knight.g3db", "g3d/teapot.g3db", "g3d/fighter.g3db"
+		"g3d/head.g3db", "g3d/knight.g3dj", "g3d/knight.g3db", "g3d/teapot.g3db"
 	};
 
 	@Override

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/ModelTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/g3d/ModelTest.java
@@ -123,16 +123,6 @@ protected void switchAnimation() {
 		}
 	}
 
-    Vector3 tmpTrans =  new Vector3();
-    protected void moveUpDown(int dir) {
-        for (final ModelInstance instance : instances) {
-            instance.transform.getTranslation(tmpTrans);
-
-            instance.transform.setToTranslation(tmpTrans.x, tmpTrans.y + Gdx.graphics.getDeltaTime()*dir, tmpTrans.z );
-            //instance.transform.val[13] += Gdx.graphics.getDeltaTime()*dir;
-        }
-    }
-
 	@Override
 	public boolean needsGL20 () {
 		return true;
@@ -142,12 +132,6 @@ public boolean needsGL20 () {
 	public boolean keyUp (int keycode) {
 		if (keycode == Keys.SPACE || keycode == Keys.MENU)
 			switchAnimation();
-
-        if (keycode == Keys.S) {
-            moveUpDown(-2);
-        } else if (keycode == Keys.W) {
-            moveUpDown(2);
-        }
 		return super.keyUp(keycode);
 	}
 }