Changeset 8125 in orxonox.OLD

Timestamp:

Jun 3, 2006, 2:53:37 PM (18 years ago)

Author:

patrick

Message:

cr: more bugs removed, more safty added

Location:

branches/cr/src/lib/collision_reaction

Files:

• collision_handle.cc (modified) (4 diffs)
• collision_handle.h (modified) (1 diff)

branches/cr/src/lib/collision_reaction/collision_handle.cc

@@ -108 +108 @@
 /**
  * register a Collision to the Collision handle.
- *  @param collision
+ *  @param collision the collision object to register
+ *
  * This is used for internal collision registration: sharing the collision objects between Collision Reactions
  * Therefore dispatching it only once
@@ -114 +115 @@
 void CollisionHandle::registerSharedCollision(Collision* collision)
 {
+  // fist check if we are listening for this Collision
+  if( !this->filterCollision(collision))
+    return;
+
   // set the state to not dispatched
   this->bDispatched = false;
@@ -178 +183 @@
   vector<long>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
-    if( collisionEvent->getEntityA()->isA((ClassID)(*it)))
-      return true;
+  {
+    if( collisionEvent->getEntityA() == this->owner) {
+      if( collisionEvent->getEntityA()->isA((ClassID)(*it)))
+        return true; }
+    else {
+      if( collisionEvent->getEntityB()->isA((ClassID)(*it)))
+        return true; }
+  }
 
   return false;
@@ -185 +196 @@
 
 
-
-
-
-
-
-
+/**
+ * filter Collisions that are not wanted to be reacted to
+ *  @param collision the collision object to filter
+ */
+bool CollisionHandle::filterCollision(Collision* collision)
+{
+  vector<long>::iterator it = this->targetList.begin();
+  for(; it < this->targetList.end(); it++)
+  {
+    if( collision->getEntityA() == this->owner) {
+      if( collision->getEntityA()->isA((ClassID)(*it)))
+        return true; }
+      else {
+        if( collision->getEntityB()->isA((ClassID)(*it)))
+          return true; }
+  }
+
+  return false;
+}
+
+
+
+
+
+
+

branches/cr/src/lib/collision_reaction/collision_handle.h

@@ -47 +47 @@
     void flushCollisions();
     bool filterCollisionEvent(CollisionEvent* collisionEvent);
+    bool filterCollision(Collision* collision);
+