Changeset 10011 in orxonox.OLD

Timestamp:

Dec 4, 2006, 5:16:13 PM (17 years ago)

Author:

patrick

Message:

collision detection is working again, completely

Location:

branches/coll_rect.merge/src/lib

Files:

• collision_detection/obb_tree_node.cc (modified) (2 diffs)
• collision_reaction/collision.h (modified) (1 diff)
• collision_reaction/cr_engine.cc (modified) (1 diff)
• collision_reaction/cr_object_damage.cc (modified) (3 diffs)

branches/coll_rect.merge/src/lib/collision_detection/obb_tree_node.cc

@@ -479 +479 @@
     return;
 
-  if( !CoRe::CollisionTube::getInstance()->isReactive( *nodeA, *nodeB) )
-    return;
+#warning this should be done
+//   if( !CoRe::CollisionTube::getInstance()->isReactive( *nodeA, *nodeB) )
+//     return;
 
 //   float distanceMax = this->bvElement->radius + ((OBBTreeNode*)treeNode)->bvElement->radius;
@@ -571 +572 @@
         (treeNode->nodeRight == NULL && treeNode->nodeLeft == NULL)) )
     {
-      PRINTF(0)("----------------------------------------------\n\n\n\n\n\n--------------------------------\n\n\n");
+      //PRINTF(0)("----------------------------------------------\n\n\n\n\n\n--------------------------------\n\n\n");
       CoRe::CollisionTube::getInstance()->registerCollisionEvent( nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
     }

branches/coll_rect.merge/src/lib/collision_reaction/collision.h

@@ -81 +81 @@
     inline bool isEntityBCollide() const { return this->_entityBCollide; }
     /** sets the flag if it reacts @param flag true if it should react on entityB*/
-    inline void setEntityBCollide(bool flag) { this->_entityACollide = flag; }
+    inline void setEntityBCollide(bool flag) { this->_entityBCollide = flag; }
 
 

branches/coll_rect.merge/src/lib/collision_reaction/cr_engine.cc

@@ -164 +164 @@
           continue;
 
-        assert((*ci)->getEntityA() != NULL && (*ci)->getEntityB() != NULL);
-
 //         PRINTF(0)("CR CHECK: collision between: %s, %s\n", (*ci)->getEntityA()->getClassName().c_str(), (*ci)->getEntityB()->getClassName().c_str());
 
         // check if entity A or B is subscibed for this event
-        if( (*ci)->getEntityA()->isReactive(*(*ci)->getEntityB(), (CREngine::ReactionType)i) ||
-            (*ci)->getEntityB()->isReactive(*(*ci)->getEntityA(), (CREngine::ReactionType)i))
+        bool aReact = (*ci)->getEntityA()->isReactive(*(*ci)->getEntityB(), (CREngine::ReactionType)i);
+        bool bReact = (*ci)->getEntityB()->isReactive(*(*ci)->getEntityA(), (CREngine::ReactionType)i);
+
+        // store this information
+        (*ci)->setEntityACollide(aReact);
+        (*ci)->setEntityBCollide(bReact);
+
+        // and execute the reaction
+        if(  aReact || bReact)
         {
           this->_reactionList[i]->reactToCollision(*ci);
-          PRINTF(0)("executing reaction: %s, between %s - %s\n", this->_reactionList[i]->getClassName().c_str(), (*ci)->getEntityA()->getClassName().c_str(), (*ci)->getEntityB()->getClassName().c_str());
+          //PRINTF(0)("executing reaction: %s, between %s - %s\n", this->_reactionList[i]->getClassName().c_str(), (*ci)->getEntityA()->getClassName().c_str(), (*ci)->getEntityB()->getClassName().c_str());
         }
       }

branches/coll_rect.merge/src/lib/collision_reaction/cr_object_damage.cc

@@ -55 +55 @@
     float damage = 0.0f;
 
-    PRINTF(4)("Dealing damage - Handling collision: %s vs %s\n",
+    PRINTF(0)("Dealing damage - Handling collision: %s vs %s\n",
               collision->getEntityA()->getClassCName(),
               collision->getEntityB()->getClassCName());
@@ -64 +64 @@
       damage = collision->getEntityB()->getDamage();
       collision->getEntityA()->hit(damage, collision->getEntityB());
-      PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityA()->getClassCName());
+      PRINTF(0)("Dealing damage - %f damage to %s \n", damage, collision->getEntityA()->getClassCName());
     }
 
@@ -71 +71 @@
       damage = collision->getEntityA()->getDamage();
       collision->getEntityB()->hit(damage, collision->getEntityA());
-      PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityB()->getClassCName());
+      PRINTF(0)("Dealing damage - %f damage to %s \n", damage, collision->getEntityB()->getClassCName());
     }