Changeset 6124 in orxonox.OLD for branches/objectmanager/src/story_entities/world.cc

Timestamp:

Dec 15, 2005, 2:28:27 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new Collision-detection algorithm, checking for framerate-increase now

File:

• branches/objectmanager/src/story_entities/world.cc (modified) (2 diffs)

branches/objectmanager/src/story_entities/world.cc

@@ -235 +235 @@
 
   GraphicsEngine::getInstance()->displayFPS(true);
-
-  CDEngine::getInstance()->setEntityList( this->entities);
 }
 
@@ -776 +774 @@
 void World::collide()
 {
-  CDEngine::getInstance()->checkCollisions();
+  CDEngine::getInstance()->checkCollisions(this->objectManager.getObjectList(OM_GROUP_00), this->objectManager.getObjectList(OM_GROUP_01_PROJ));
 }