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

Combine result of both listeners to determine if the collision should occur

Browse Source
This commit is contained in:
Fadorico 2016-03-31 01:39:54 -04:00
parent ef626b0959
commit 83b26be45a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,15 +339,16 @@ public class PhysicsSpace {
private boolean notifyCollisionGroupListeners_native(PhysicsCollisionObject node, PhysicsCollisionObject node1){ private boolean notifyCollisionGroupListeners_native(PhysicsCollisionObject node, PhysicsCollisionObject node1){
PhysicsCollisionGroupListener listener = collisionGroupListeners.get(node.getCollisionGroup()); PhysicsCollisionGroupListener listener = collisionGroupListeners.get(node.getCollisionGroup());
PhysicsCollisionGroupListener listener1 = collisionGroupListeners.get(node1.getCollisionGroup()); PhysicsCollisionGroupListener listener1 = collisionGroupListeners.get(node1.getCollisionGroup());
boolean result = true;
if(listener != null){ if(listener != null){
if(!listener.collide(node, node1)){ result = listener.collide(node, node1);
return false;
}
} }
if(listener1 != null && node.getCollisionGroup() != node1.getCollisionGroup()){ if(listener1 != null && node.getCollisionGroup() != node1.getCollisionGroup()){
return listener1.collide(node, node1); result = listener1.collide(node, node1) && result;
} }
return true;
return result;
} }
/** /**