Changeset 4707 in orxonox.OLD

Timestamp:

Jun 26, 2005, 5:55:52 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: there where some redundances in the drawing process… now the app executes much faster

File:

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

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

@@ -221 +221 @@
   CDEngine::getInstance()->checkCollisions();
 
-  currentFrame = SDL_GetTicks();
-  dt = currentFrame - lastFrame;
-
 
   b->shiftCoor(Vector(0.0, 0.0, iterata));
@@ -236 +233 @@
   }
   delete iterator;
-
-  lastFrame = currentFrame;
 }
 
@@ -243 +238 @@
 void Framework::moduleDraw() const
 {
-  CDEngine::getInstance()->drawBV(depth, drawMode);
-  LightManager::getInstance()->draw();
+  //CDEngine::getInstance()->drawBV(depth, drawMode);
 
   tIterator<WorldEntity>* iterator = entityList->getIterator(); /* get the iterator - JAVA style */
@@ -250 +244 @@
   while( entity != NULL)                        /* nextElement() will return NULL at the end */
   {
-    if( drawModel)
+    if( likely(drawModel))
     entity->draw();
-    //entity->drawBVTree(depth, drawMode);
+    entity->drawBVTree(depth, drawMode);
     entity = iterator->nextElement();       /* give back the next element or NULL if last */
   }
   delete iterator;
-  //model->draw();
+
+  LightManager::getInstance()->draw();
 }