瀏覽代碼

removed physics error from TerrainGrid tests

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9977 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
bre..om 13 年之前
父節點
當前提交
c7d42dede5

+ 4 - 2
engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java

@@ -202,8 +202,10 @@ public class TerrainGridAlphaMapTest extends SimpleApplication {
 
             public void tileDetached(Vector3f cell, TerrainQuad quad) {
                 if (usePhysics) {
-                    bulletAppState.getPhysicsSpace().remove(quad);
-                    quad.removeControl(RigidBodyControl.class);
+                    if (quad.getControl(RigidBodyControl.class) != null) {
+                        bulletAppState.getPhysicsSpace().remove(quad);
+                        quad.removeControl(RigidBodyControl.class);
+                    }
                 }
                 updateMarkerElevations();
             }

+ 4 - 2
engine/src/test/jme3test/terrain/TerrainGridSerializationTest.java

@@ -88,8 +88,10 @@ public class TerrainGridSerializationTest extends SimpleApplication {
                 }
 
                 public void tileDetached(Vector3f cell, TerrainQuad quad) {
-                    bulletAppState.getPhysicsSpace().remove(quad);
-                    quad.removeControl(RigidBodyControl.class);
+                    if (quad.getControl(RigidBodyControl.class) != null) {
+                        bulletAppState.getPhysicsSpace().remove(quad);
+                        quad.removeControl(RigidBodyControl.class);
+                    }
                 }
 
             });

+ 4 - 2
engine/src/test/jme3test/terrain/TerrainGridTest.java

@@ -149,8 +149,10 @@ public class TerrainGridTest extends SimpleApplication {
                 }
 
                 public void tileDetached(Vector3f cell, TerrainQuad quad) {
-                    bulletAppState.getPhysicsSpace().remove(quad);
-                    quad.removeControl(RigidBodyControl.class);
+                    if (quad.getControl(RigidBodyControl.class) != null) {
+                        bulletAppState.getPhysicsSpace().remove(quad);
+                        quad.removeControl(RigidBodyControl.class);
+                    }
                 }
 
             });

+ 4 - 2
engine/src/test/jme3test/terrain/TerrainGridTileLoaderTest.java

@@ -145,8 +145,10 @@ public class TerrainGridTileLoaderTest extends SimpleApplication {
                 }
 
                 public void tileDetached(Vector3f cell, TerrainQuad quad) {
-                    bulletAppState.getPhysicsSpace().remove(quad);
-                    quad.removeControl(RigidBodyControl.class);
+                    if (quad.getControl(RigidBodyControl.class) != null) {
+                        bulletAppState.getPhysicsSpace().remove(quad);
+                        quad.removeControl(RigidBodyControl.class);
+                    }
                 }
 
             });