Add/remove all PhysicsControls even when a RigidBodyControl is present

William Linna · William Linna · commit c85fd3fe2645 · 2016-05-21T23:26:56.000+03:00
diff --git a/jme3-bullet/src/main/java/com/jme3/bullet/PhysicsSpace.java b/jme3-bullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
@@ -487,9 +487,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();) {
@@ -499,8 +500,6 @@ public void addAll(Spatial spatial) {
                     add(physicsJoint);
                 }
             }
-        } else {
-            add(spatial);
         }
         //recursion
         if (spatial instanceof Node) {
@@ -529,10 +528,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
`@@ -487,9 +487,10 @@ public void removeCollisionObject(PhysicsCollisionObject obj) {`
`487`	`487`	`* @param spatial the rootnode containing the physics objects`
`488`	`488`	`*/`
`489`	`489`	`public void addAll(Spatial spatial) {`
	`490`	`+ add(spatial);`
	`491`	`+`
`490`	`492`	`if (spatial.getControl(RigidBodyControl.class) != null) {`
`491`	`493`	`RigidBodyControl physicsNode = spatial.getControl(RigidBodyControl.class);`
`492`		`- add(physicsNode);`
`493`	`494`	`//add joints with physicsNode as BodyA`
`494`	`495`	`List<PhysicsJoint> joints = physicsNode.getJoints();`
`495`	`496`	`for (Iterator<PhysicsJoint> it1 = joints.iterator(); it1.hasNext();) {`
`@@ -499,8 +500,6 @@ public void addAll(Spatial spatial) {`
`499`	`500`	`add(physicsJoint);`
`500`	`501`	`}`
`501`	`502`	`}`
`502`		`- } else {`
`503`		`- add(spatial);`
`504`	`503`	`}`
`505`	`504`	`//recursion`
`506`	`505`	`if (spatial instanceof Node) {`
`@@ -529,10 +528,9 @@ public void removeAll(Spatial spatial) {`
`529`	`528`	`//remove(physicsJoint.getBodyB());`
`530`	`529`	`}`
`531`	`530`	`}`
`532`		`- remove(physicsNode);`
`533`		`- } else if (spatial.getControl(PhysicsControl.class) != null) {`
`534`		`- remove(spatial);`
`535`	`531`	`}`
	`532`	`+`
	`533`	`+ remove(spatial);`
`536`	`534`	`//recursion`
`537`	`535`	`if (spatial instanceof Node) {`
`538`	`536`	`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();`