sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #498 from TripleSnail/master

Browse Source 
Add/remove all PhysicsControls even when a RigidBodyControl is present
This commit is contained in:
empirephoenix 2017-04-25 13:25:53 +02:00 committed by GitHub
commit bfbb0d61ea
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jme3-bullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
View File

@ -489,9 +489,10 @@ public class PhysicsSpace {
* @param spatial the rootnode containing the physics objects * @param spatial the rootnode containing the physics objects
*/ */
public void addAll(Spatial spatial) { public void addAll(Spatial spatial) {
add(spatial);
if (spatial.getControl(RigidBodyControl.class) != null) { if (spatial.getControl(RigidBodyControl.class) != null) {
RigidBodyControl physicsNode = spatial.getControl(RigidBodyControl.class); RigidBodyControl physicsNode = spatial.getControl(RigidBodyControl.class);
add(physicsNode);
//add joints with physicsNode as BodyA //add joints with physicsNode as BodyA
List<PhysicsJoint> joints = physicsNode.getJoints(); List<PhysicsJoint> joints = physicsNode.getJoints();
for (Iterator<PhysicsJoint> it1 = joints.iterator(); it1.hasNext();) { for (Iterator<PhysicsJoint> it1 = joints.iterator(); it1.hasNext();) {
@ -501,8 +502,6 @@ public class PhysicsSpace {
add(physicsJoint); add(physicsJoint);
} }
} }
} else {
add(spatial);
} }
//recursion //recursion
if (spatial instanceof Node) { if (spatial instanceof Node) {
@ -531,10 +530,9 @@ public class PhysicsSpace {
//remove(physicsJoint.getBodyB()); //remove(physicsJoint.getBodyB());
} }
} }
remove(physicsNode);
} else if (spatial.getControl(PhysicsControl.class) != null) {
remove(spatial);
} }
remove(spatial);
//recursion //recursion
if (spatial instanceof Node) { if (spatial instanceof Node) {
List<Spatial> children = ((Node) spatial).getChildren(); List<Spatial> children = ((Node) spatial).getChildren();

10
jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
View File

@ -458,9 +458,10 @@ public class PhysicsSpace {
* @param spatial the rootnode containing the physics objects * @param spatial the rootnode containing the physics objects
*/ */
public void addAll(Spatial spatial) { public void addAll(Spatial spatial) {
add(spatial);
if (spatial.getControl(RigidBodyControl.class) != null) { if (spatial.getControl(RigidBodyControl.class) != null) {
RigidBodyControl physicsNode = spatial.getControl(RigidBodyControl.class); RigidBodyControl physicsNode = spatial.getControl(RigidBodyControl.class);
add(physicsNode);
//add joints with physicsNode as BodyA //add joints with physicsNode as BodyA
List<PhysicsJoint> joints = physicsNode.getJoints(); List<PhysicsJoint> joints = physicsNode.getJoints();
for (Iterator<PhysicsJoint> it1 = joints.iterator(); it1.hasNext();) { for (Iterator<PhysicsJoint> it1 = joints.iterator(); it1.hasNext();) {
@ -470,8 +471,6 @@ public class PhysicsSpace {
add(physicsJoint); add(physicsJoint);
} }
} }
} else {
add(spatial);
} }
//recursion //recursion
if (spatial instanceof Node) { if (spatial instanceof Node) {
@ -500,10 +499,9 @@ public class PhysicsSpace {
//remove(physicsJoint.getBodyB()); //remove(physicsJoint.getBodyB());
} }
} }
remove(physicsNode);
} else if (spatial.getControl(PhysicsControl.class) != null) {
remove(spatial);
} }
remove(spatial);
//recursion //recursion
if (spatial instanceof Node) { if (spatial instanceof Node) {
List<Spatial> children = ((Node) spatial).getChildren(); List<Spatial> children = ((Node) spatial).getChildren();