Changeset 8190 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jun 7, 2006, 3:00:01 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the cr branche to trunk

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (5 diffs)
• game_world.h (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -136 +136 @@
   AnimationPlayer::getInstance();
   PhysicsEngine::getInstance();
-
+  CREngine::getInstance();
 }
 
@@ -199 +199 @@
   delete AnimationPlayer::getInstance();
   delete PhysicsEngine::getInstance();
+  delete CREngine::getInstance();
 
   State::setCurrentStoryEntity(NULL);
@@ -278 +279 @@
     /* process time */
     this->tick ();
-    /* process collision */
-    this->collide ();
+    /* collision detection */
+    this->collisionDetection ();
+    /* collision reaction */
+    this->collisionReaction ();
     /* update the state */
     this->update ();
@@ -408 +411 @@
  * 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 +425 @@
       this->dataTank->objectManager->getObjectList(OM_COMMON));
 
+}
+
+
+void GameWorld::collisionReaction()
+{
+  CREngine::getInstance()->handleCollisions();
 }
 

trunk/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;