Changeset 7947 in orxonox.OLD for branches/cr

Timestamp:

May 29, 2006, 1:12:19 AM (19 years ago)

Author:

patrick

Message:

cr: integraged the collision reaction into the main loop

Location:

branches/cr/src

Files:

• lib/collision_reaction/collision_handle.cc (modified) (1 diff)
• lib/collision_reaction/collision_handle.h (modified) (2 diffs)
• lib/collision_reaction/cr_engine.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (3 diffs)
• story_entities/game_world.h (modified) (1 diff)

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

@@ -102 +102 @@
   // now set state to dispatched
   this->bDispatched = true;
+  this->bCollided = false;
   this->flushCollisions();
 }

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

@@ -31 +31 @@
     void addTarget(long classID);
     void registerCollision(Collision* collision);
+    /** @returns true if regiestered some new collision events in this tick frame */
+    inline bool isCollided() const { return this->bCollided; }
 
     void handleCollisions();
@@ -45 +47 @@
     bool                          bDispatched;             //!< true if this handle has already been dispatched
     bool                          bStopOnFirstCollision;   //!< true if the cd of this object should be terminated after one match
+    bool                          bCollided;               //!< true if the CollsionHandle has registered some new collisions
 
     std::vector<Collision*>       collisionList;           //!< a list full of collisions

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

@@ -115 +115 @@
 
 void CREngine::handleCollisions()
-{}
+{
+  std::vector<CollisionHandle*>::iterator it;
+  for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
+  {
+    if( (*it)->isCollided())
+    {
+      (*it)->handleCollisions();
+    }
+  }
+}
 
 

branches/cr/src/story_entities/game_world.cc

@@ -278 +278 @@
     /* process time */
     this->tick ();
-    /* process collision */
-    this->collide ();
+    /* collision detection */
+    this->collisionDetection ();
+    /* collision reaction */
+    this->collisionReaction ();
     /* update the state */
     this->update ();
@@ -408 +410 @@
  * kicks the CDEngine to detect the collisions between the object groups in the world
  */
-void GameWorld::collide()
+void GameWorld::collisionDetection()
 {
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
@@ -422 +424 @@
       this->dataTank->objectManager->getObjectList(OM_COMMON));
 
+}
+
+
+void GameWorld::collisionReaction()
+{
+  CREngine::getInstance()->handleCollisions();
 }
 

branches/cr/src/story_entities/game_world.h

@@ -68 +68 @@
     virtual void update();
     virtual void checkGameRules();
-    virtual void collide();
+    virtual void collisionDetection();
+    virtual void collisionReaction();
 
     void drawEntityList(const ObjectManager::EntityList& drawList ) const;