Changeset 9981 in orxonox.OLD for branches/coll_rect/src/lib

Timestamp:

Dec 2, 2006, 3:34:37 PM (18 years ago)

Author:

patrick

Message:

closed the collision reaction loop

Location:

branches/coll_rect/src/lib/collision_reaction

Files:

• collision_tube.cc (modified) (2 diffs)
• collision_tube.h (modified) (1 diff)

branches/coll_rect/src/lib/collision_reaction/collision_tube.cc

@@ -44 +44 @@
   {
     this->registerObject(this, CollisionTube::_objectList);
+
+
+    // push the collision reaction object on the list in the right order
+    // WARNING: do not mess with the order, it should be the same as in
+
+    // physical reactions
+    this->_reactionList[CREngine::CR_PHYSICS_MOMENTUM]      = NULL;
+    this->_reactionList[CREngine::CR_PHYSICS_STEP_BACK]     = NULL;
+    this->_reactionList[CREngine::CR_PHYSICS_GROUND_WALK]   = new CRPhysicsGroundWalk();
+    this->_reactionList[CREngine::CR_PHYSICS_FULL_WALK]     = new CRPhysicsFullWalk();
+    this->_reactionList[CREngine::CR_PHYSICS_DAMAGE]        = NULL;
+    // object based reactions
+    this->_reactionList[CREngine::CR_OBJECT_DAMAGE]         = new CRObjectDamage();
+    this->_reactionList[CREngine::CR_OBJECT_PICKUP]         = NULL;
+    // misc reactions
+    this->_reactionList[CREngine::CR_VERTEX_TRAFO]          = NULL;
+    this->_reactionList[CREngine::CR_SPECIAL_CALLBACK]      = NULL;
   }
 
@@ -123 +140 @@
     for(; ci < this->_collisionList.end(); ++ci)
     {
-      // check if entity A is subscibed for this event
-      (*ci)->getEntityA()->
-
-      // check if entity B is subscribed for this event
-
+      for( int i = CREngine::CR_PHYSICS_MOMENTUM; i < CREngine::CR_NUBER; i++)
+      {
+        // check if entity A or B is subscibed for this event
+        if( (*ci)->getEntityA()->bReactibe((*it)->getEnityB(), i) || (*ci)->getEntityB()->bReactibe((*it)->getEnityA(), i))
+          (*ci)->reactToCollision(*ci);
+      }
     }
   }

branches/coll_rect/src/lib/collision_reaction/collision_tube.h

@@ -71 +71 @@
 
   private:
-    std::vector<Collision*>        _collisionList;      //!< the list of collisions since the last processing
+    std::vector<Collision*>         _collisionList;                      //!< the list of collisions since the last processing
+    CollisionReaction*              _reactionList[CREngine::CR_NUMBER];  //!< the collision reaction list containing all reactions types