Changeset 4694 in orxonox.OLD for orxonox/trunk/src/subprojects/collision_detection

Timestamp:

Jun 24, 2005, 6:10:13 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now ready to implement the collision detection algorithm

File:

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

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

@@ -65 +65 @@
   entityList = new tList<WorldEntity>();
 
-  TestEntity* a = new TestEntity();
-  Environment* b = new Environment();
+  TestEntity* a = new TestEntity(); a->setName("Clown1");
+  Environment* b = new Environment(); b->setName("Jaeger");
   b->setRelCoor(0.0, 0.0, -10.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);
 
   CDEngine::getInstance()->setEntityList(entityList);
@@ -205 +209 @@
   dt = currentFrame - lastFrame;
 
-  if( dt > 10)
+  if( dt > 0)
   {
     float fps = 1000/dt;
 
           // temporary, only for showing how fast the text-engine is
-    char tmpChar[20];
-    sprintf(tmpChar, "fps: %4.0f", fps);
+    printf("we got %f fps\n", fps);
   }
   else