Merge pull request jMonkeyEngine#498 from TripleSnail/master

empirephoenix · web-flow · commit bfbb0d61eae3 · 2017-04-25T13:25:53.000+02:00
Add/remove all PhysicsControls even when a RigidBodyControl is present
diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/PhysicsSpace.java b/jme3-bullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
@@ -489,9 +489,10 @@ public void removeCollisionObject(PhysicsCollisionObject obj) {
      * @param spatial the rootnode containing the physics objects
      */
     public void addAll(Spatial spatial) {
+        add(spatial);
+
         if (spatial.getControl(RigidBodyControl.class) != null) {
             RigidBodyControl physicsNode = spatial.getControl(RigidBodyControl.class);
-            add(physicsNode);
             //add joints with physicsNode as BodyA
             List<PhysicsJoint> joints = physicsNode.getJoints();
             for (Iterator<PhysicsJoint> it1 = joints.iterator(); it1.hasNext();) {
@@ -501,8 +502,6 @@ public void addAll(Spatial spatial) {
                     add(physicsJoint);
                 }
             }
-        } else {
-            add(spatial);
         }
         //recursion
         if (spatial instanceof Node) {
@@ -531,10 +530,9 @@ public void removeAll(Spatial spatial) {
                     //remove(physicsJoint.getBodyB());
                 }
             }
-            remove(physicsNode);
-        } else if (spatial.getControl(PhysicsControl.class) != null) {
-            remove(spatial);
         }
+            
+        remove(spatial);
         //recursion
         if (spatial instanceof Node) {
             List<Spatial> children = ((Node) spatial).getChildren();
diff --git a/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java b/jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
@@ -458,9 +458,10 @@ public void removeCollisionObject(PhysicsCollisionObject obj) {
      * @param spatial the rootnode containing the physics objects
      */
     public void addAll(Spatial spatial) {
+        add(spatial);
+
         if (spatial.getControl(RigidBodyControl.class) != null) {
             RigidBodyControl physicsNode = spatial.getControl(RigidBodyControl.class);
-            add(physicsNode);
             //add joints with physicsNode as BodyA
             List<PhysicsJoint> joints = physicsNode.getJoints();
             for (Iterator<PhysicsJoint> it1 = joints.iterator(); it1.hasNext();) {
@@ -470,8 +471,6 @@ public void addAll(Spatial spatial) {
                     add(physicsJoint);
                 }
             }
-        } else {
-            add(spatial);
         }
         //recursion
         if (spatial instanceof Node) {
@@ -500,10 +499,9 @@ public void removeAll(Spatial spatial) {
                     //remove(physicsJoint.getBodyB());
                 }
             }
-            remove(physicsNode);
-        } else if (spatial.getControl(PhysicsControl.class) != null) {
-            remove(spatial);
         }
+        
+        remove(spatial);
         //recursion
         if (spatial instanceof Node) {
             List<Spatial> children = ((Node) spatial).getChildren();

Original file line number	Diff line number	Diff line change
`@@ -489,9 +489,10 @@ public void removeCollisionObject(PhysicsCollisionObject obj) {`
`489`	`489`	`* @param spatial the rootnode containing the physics objects`
`490`	`490`	`*/`
`491`	`491`	`public void addAll(Spatial spatial) {`
	`492`	`+ add(spatial);`
	`493`	`+`
`492`	`494`	`if (spatial.getControl(RigidBodyControl.class) != null) {`
`493`	`495`	`RigidBodyControl physicsNode = spatial.getControl(RigidBodyControl.class);`
`494`		`- add(physicsNode);`
`495`	`496`	`//add joints with physicsNode as BodyA`
`496`	`497`	`List<PhysicsJoint> joints = physicsNode.getJoints();`
`497`	`498`	`for (Iterator<PhysicsJoint> it1 = joints.iterator(); it1.hasNext();) {`
`@@ -501,8 +502,6 @@ public void addAll(Spatial spatial) {`
`501`	`502`	`add(physicsJoint);`
`502`	`503`	`}`
`503`	`504`	`}`
`504`		`- } else {`
`505`		`- add(spatial);`
`506`	`505`	`}`
`507`	`506`	`//recursion`
`508`	`507`	`if (spatial instanceof Node) {`
`@@ -531,10 +530,9 @@ public void removeAll(Spatial spatial) {`
`531`	`530`	`//remove(physicsJoint.getBodyB());`
`532`	`531`	`}`
`533`	`532`	`}`
`534`		`- remove(physicsNode);`
`535`		`- } else if (spatial.getControl(PhysicsControl.class) != null) {`
`536`		`- remove(spatial);`
`537`	`533`	`}`
	`534`	`+`
	`535`	`+ remove(spatial);`
`538`	`536`	`//recursion`
`539`	`537`	`if (spatial instanceof Node) {`
`540`	`538`	`List<Spatial> children = ((Node) spatial).getChildren();`
Original file line number	Diff line number	Diff line change
`@@ -458,9 +458,10 @@ public void removeCollisionObject(PhysicsCollisionObject obj) {`
`458`	`458`	`* @param spatial the rootnode containing the physics objects`
`459`	`459`	`*/`
`460`	`460`	`public void addAll(Spatial spatial) {`
	`461`	`+ add(spatial);`
	`462`	`+`
`461`	`463`	`if (spatial.getControl(RigidBodyControl.class) != null) {`
`462`	`464`	`RigidBodyControl physicsNode = spatial.getControl(RigidBodyControl.class);`
`463`		`- add(physicsNode);`
`464`	`465`	`//add joints with physicsNode as BodyA`
`465`	`466`	`List<PhysicsJoint> joints = physicsNode.getJoints();`
`466`	`467`	`for (Iterator<PhysicsJoint> it1 = joints.iterator(); it1.hasNext();) {`
`@@ -470,8 +471,6 @@ public void addAll(Spatial spatial) {`
`470`	`471`	`add(physicsJoint);`
`471`	`472`	`}`
`472`	`473`	`}`
`473`		`- } else {`
`474`		`- add(spatial);`
`475`	`474`	`}`
`476`	`475`	`//recursion`
`477`	`476`	`if (spatial instanceof Node) {`
`@@ -500,10 +499,9 @@ public void removeAll(Spatial spatial) {`
`500`	`499`	`//remove(physicsJoint.getBodyB());`
`501`	`500`	`}`
`502`	`501`	`}`
`503`		`- remove(physicsNode);`
`504`		`- } else if (spatial.getControl(PhysicsControl.class) != null) {`
`505`		`- remove(spatial);`
`506`	`502`	`}`
	`503`	`+`
	`504`	`+ remove(spatial);`
`507`	`505`	`//recursion`
`508`	`506`	`if (spatial instanceof Node) {`
`509`	`507`	`List<Spatial> children = ((Node) spatial).getChildren();`