Changeset 9985 in orxonox.OLD

Timestamp:

Dec 2, 2006, 4:28:11 PM (17 years ago)

Author:

patrick

Message:

giving the crengine the ability to check for collisions itself, collision tube only used as container

Location:

branches/coll_rect/src/lib/collision_reaction

Files:

• collision.cc (modified) (2 diffs)
• collision.h (modified) (1 diff)
• collision_tube.cc (modified) (2 diffs)
• collision_tube.h (modified) (1 diff)
• cr_engine.cc (modified) (6 diffs)
• cr_engine.h (modified) (4 diffs)

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

@@ -27 +27 @@
   Collision::Collision ()
   {
-    this->flushCollisionEvents();
+    this->reset();
   }
 
@@ -39 +39 @@
 
   /**
-   * flushes the CollisionEvent list
+   * resets all variable states to initial values
    */
-  void Collision::flushCollisionEvents()
+  void Collision::reset()
   {
     this->_entityA = NULL;

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

@@ -49 +49 @@
     inline void registerCollisionEvent(CollisionEvent* event) { this->_collisionEvents.push_back(event); this->bDispatched = false;}
 
-    void flushCollisionEvents();
+    void reset();
 
 

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;
   }
 
@@ -131 +114 @@
 
 
-  /**
-   * handles all collisions in registered in this tube
-   */
-  void CollisionTube::handleCollisions()
-  {
-    // for all collisions:
-    CollisionIterator ci = this->_collisionList.begin();
-    for(; ci < this->_collisionList.end(); ++ci)
-    {
-      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);
-
-        (*ci)->flushCollisionEvents();
-      }
-    }
-  }
-
-
-
-
-
-
-
 }// namespace end
 

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

@@ -68 +68 @@
                                 const Vector& normal, const Vector& position, bool bInWall = false);
 
-    void handleCollisions();
+    /** @returns an iterator pointing to the beginning of the list */
+    CollisionIterator& begin() const { return this->_collisionList.begin(); }
+    /** @returns an iterator pointing to the end of the list */
+    CollisionIterator& end()   const { return this->_collisionList.end(); }
 
 
   private:
     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
 
 

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

@@ -63 +63 @@
 
     this->reset();
+    this->flushCollisions();
 
-    std::vector<Collision*>::iterator it1 = this->collisionsUnused.begin();
+    CollisionList it1 = this->collisionsUnused.begin();
     for(; it1 < this->collisionsUnused.end(); it1++)
       delete *it1;
-    std::vector<CollisionEvent*>::iterator it2 = this->collisionEventsUnused.begin();
+    CollisionEventList it2 = this->collisionEventsUnused.begin();
     for(; it2 < this->collisionEventsUnused.end(); it2++)
       delete *it2;
@@ -75 +76 @@
   }
 
+
   /**
    * inits the CREngine to a working state
@@ -80 +82 @@
   void CREngine::init()
   {
-    // create a list of Collision events (precaching)
+    // precaching:
+    // create a list of Collisions and CollisionEvents for fast object recycling purposes
     for( int i = 0; i < CR_MAX_COLLISIONS; i++)
       this->collisionsUnused.push_back(new Collision());
     for( int i = 0; i < CR_MAX_COLLISION_EVENTS; i++)
       this->collisionEventsUnused.push_back(new CollisionEvent());
+
+
+    // push the collision reaction object on the list in the right order
+
+    // 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;
   }
 
@@ -102 +121 @@
   }
 
+
   /**
    * @return an instanco of a CollisionEvent object. instead of creating a new object this ones can be used and resycled
@@ -118 +138 @@
 
   /**
-   * flushes the CollisionHandles and restores the CREngine to the initial state
-   */
-  void CREngine::reset()
-  {
-//     // first clear all CollisionHandles
-//     std::vector<CollisionHandle*>::iterator it = this->collisionHandles.begin();
-//     for(; it < this->collisionHandles.end(); it++)
-//     {
-//       (*it)->reset();
-//       delete *it;
-//     }
-//
-//     this->collisionHandles.clear();
-  }
-
-
-
-
-
-  /**
-   * processes the collisions by calling the EventHandlers
+   * handles all collisions in registered in this tube
    */
   void CREngine::handleCollisions()
   {
-//     std::vector<CollisionHandle*>::iterator it;
-//     for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
-//     {
-//       if( !(*it)->isDispatched() || (*it)->isContinuousPoll())  //does it have any collisions to report at all
-//       {
-//         (*it)->handleCollisions();
-//       }
-//     }
-//     this->flushCollisions();
+    // for all collisions:
+    CollisionIterator ci = CollisionTube::getInstance()->begin();
+    for(; ci < CollisionTube::getInstance()->end(); ++ci)
+    {
+      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);
+
+        (*ci)->reset();
+      }
+    }
   }
 
@@ -159 +163 @@
   void CREngine::flushCollisions()
   {
-    std::vector<Collision*>::iterator it1 = this->collisionsUsed.begin();
+    CollisionIterator it1 = this->collisionsUsed.begin();
     for(; it1 < this->collisionsUsed.end(); it1++)
       this->collisionsUnused.push_back(*it1);
 
-    std::vector<CollisionEvent*>::iterator it2 = this->collisionEventsUsed.begin();
+    CollisionEventIterator it2 = this->collisionEventsUsed.begin();
     for(; it2 < this->collisionEventsUsed.end(); it2++)
       this->collisionEventsUnused.push_back(*it2);

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

@@ -29 +29 @@
     ObjectListDeclaration(CREngine);
 
+    typedef std::vector<Collision*>::iterator        CollisionIterator;
+    typedef std::vector<CollisionEvent*>::iterator   CollisionEventIterator;
 
 
@@ -70 +72 @@
     Collision* popCollisionObject();
     CollisionEvent* popCollisionEventObject();
-    void reset();
 
     void handleCollisions();
@@ -85 +86 @@
 
   private:
-    //std::vector<CollisionHandle*>       collisionHandles;         //!< list with the collision handles
+    static CREngine*                    singletonRef;             //!< the reference to the CREngine object (singleton)
 
     std::vector<Collision*>             collisionsUsed;           //!< a list of used, cached collisions
@@ -93 +94 @@
     std::vector<CollisionEvent*>        collisionEventsUnused;    //!< a list of unused, cached collision events
 
-    static CREngine*                    singletonRef;             //!< the reference to the CREngine object (singleton)
+    CollisionReaction*                  _reactionList[CREngine::CR_NUMBER];  //!< the collision reaction list containing all reactions types
+
+
   };