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

- add/remove multiple physics controls via PhysicsSpace.add / .remove

Browse Source
This commit is contained in:
Normen Hansen 2015-02-24 11:10:00 +01:00
parent 6fdf0dffd3
commit 3aa8aed142
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,8 +405,11 @@ public class PhysicsSpace {
((PhysicsControl) obj).setPhysicsSpace(this); ((PhysicsControl) obj).setPhysicsSpace(this);
} else if (obj instanceof Spatial) { } else if (obj instanceof Spatial) {
Spatial node = (Spatial) obj; Spatial node = (Spatial) obj;
PhysicsControl control = node.getControl(PhysicsControl.class); for (int i = 0; i < node.getNumControls(); i++) {
control.setPhysicsSpace(this); if (node.getControl(i) instanceof PhysicsControl) {
add(((PhysicsControl) node.getControl(i)));
}
}
} else if (obj instanceof PhysicsCollisionObject) { } else if (obj instanceof PhysicsCollisionObject) {
addCollisionObject((PhysicsCollisionObject) obj); addCollisionObject((PhysicsCollisionObject) obj);
} else if (obj instanceof PhysicsJoint) { } else if (obj instanceof PhysicsJoint) {
@ -438,7 +441,12 @@ public class PhysicsSpace {
if (obj instanceof PhysicsControl) { if (obj instanceof PhysicsControl) {
((PhysicsControl) obj).setPhysicsSpace(null); ((PhysicsControl) obj).setPhysicsSpace(null);
} else if (obj instanceof Spatial) { } else if (obj instanceof Spatial) {
remove(((Spatial) obj).getControl(PhysicsControl.class)); Spatial node = (Spatial) obj;
for (int i = 0; i < node.getNumControls(); i++) {
if (node.getControl(i) instanceof PhysicsControl) {
remove(((PhysicsControl) node.getControl(i)));
}
}
} else if (obj instanceof PhysicsCollisionObject) { } else if (obj instanceof PhysicsCollisionObject) {
removeCollisionObject((PhysicsCollisionObject) obj); removeCollisionObject((PhysicsCollisionObject) obj);
} else if (obj instanceof PhysicsJoint) { } else if (obj instanceof PhysicsJoint) {

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

@ -391,7 +391,12 @@ public class PhysicsSpace {
if (obj instanceof PhysicsControl) { if (obj instanceof PhysicsControl) {
((PhysicsControl) obj).setPhysicsSpace(this); ((PhysicsControl) obj).setPhysicsSpace(this);
} else if (obj instanceof Spatial) { } else if (obj instanceof Spatial) {
add(((Spatial) obj).getControl(PhysicsControl.class)); Spatial node = (Spatial) obj;
for (int i = 0; i < node.getNumControls(); i++) {
if (node.getControl(i) instanceof PhysicsControl) {
add(((PhysicsControl) node.getControl(i)));
}
}
} else if (obj instanceof PhysicsCollisionObject) { } else if (obj instanceof PhysicsCollisionObject) {
addCollisionObject((PhysicsCollisionObject) obj); addCollisionObject((PhysicsCollisionObject) obj);
} else if (obj instanceof PhysicsJoint) { } else if (obj instanceof PhysicsJoint) {
@ -423,7 +428,12 @@ public class PhysicsSpace {
if (obj instanceof PhysicsControl) { if (obj instanceof PhysicsControl) {
((PhysicsControl) obj).setPhysicsSpace(null); ((PhysicsControl) obj).setPhysicsSpace(null);
} else if (obj instanceof Spatial) { } else if (obj instanceof Spatial) {
remove(((Spatial) obj).getControl(PhysicsControl.class)); Spatial node = (Spatial) obj;
for (int i = 0; i < node.getNumControls(); i++) {
if (node.getControl(i) instanceof PhysicsControl) {
remove(((PhysicsControl) node.getControl(i)));
}
}
} else if (obj instanceof PhysicsCollisionObject) { } else if (obj instanceof PhysicsCollisionObject) {
removeCollisionObject((PhysicsCollisionObject) obj); removeCollisionObject((PhysicsCollisionObject) obj);
} else if (obj instanceof PhysicsJoint) { } else if (obj instanceof PhysicsJoint) {