Changeset 4695 in orxonox.OLD for orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

Timestamp:

Jun 24, 2005, 11:15:12 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: no only the overlap test is missing

File:

• orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc (modified) (4 diffs)

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -69 +69 @@
   b->setRelCoor(0.0, 0.0, -10.0);
 
-  TestEntity* c = new TestEntity(); c->setName("Colwn2");
-  c->setRelCoor(0.0, 0.0, -20.0);
+//   TestEntity* c = new TestEntity(); c->setName("Colwn2");
+//   c->setRelCoor(0.0, 0.0, -20.0);
 
   entityList->add(a);
   entityList->add(b);
-  entityList->add(c);
+//   entityList->add(c);
 
   CDEngine::getInstance()->setEntityList(entityList);
@@ -204 +204 @@
 {
 
-  CDEngine::getInstance()->checkCollisions();
+  //CDEngine::getInstance()->checkCollisions();
 
   currentFrame = SDL_GetTicks();
@@ -220 +220 @@
           /* the frame-rate is limited to 100 frames per second, all other things are for nothing.
           */
-    SDL_Delay((unsigned int)(10-dt));
+    SDL_Delay(1);
     dt = 10;
   }
@@ -240 +240 @@
 void Framework::moduleDraw() const
 {
-  //CDEngine::getInstance()->drawBV(depth, drawMode);
+  CDEngine::getInstance()->drawBV(depth, drawMode);
   LightManager::getInstance()->draw();