Selaa lähdekoodia

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

Fadorico 9 vuotta sitten
vanhempi
commit
f61b1439cc
1 muutettua tiedostoa jossa 5 lisäystä ja 5 poistoa
  1. 5 5
      jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java

+ 5 - 5
jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java

@@ -237,12 +237,12 @@ public class PhysicsSpace {
                             || (collisionObject1.getCollideWithGroups() & collisionObject.getCollisionGroup()) > 0) {
                         PhysicsCollisionGroupListener listener = collisionGroupListeners.get(collisionObject.getCollisionGroup());
                         PhysicsCollisionGroupListener listener1 = collisionGroupListeners.get(collisionObject1.getCollisionGroup());
-                        if (listener != null) {
-                            return listener.collide(collisionObject, collisionObject1);
-                        } else if (listener1 != null) {
-                            return listener1.collide(collisionObject, collisionObject1);
+                        if(listener != null){
+                            collides = listener.collide(collisionObject, collisionObject1);
+                        }
+                        if(listener1 != null && collisionObject.getCollisionGroup() != collisionObject1.getCollisionGroup()){
+                            collides = listener1.collide(collisionObject, collisionObject1) && collides;
                         }
-                        return true;
                     } else {
                         return false;
                     }