Changeset 4686 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 24, 2005, 1:13:32 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: added the model draw functionality to the framework

File:

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

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

@@ -41 +41 @@
 
 int lastFrame, currentFrame, dt;
+bool drawModel;
 
 void Framework::moduleInit(int argc, char** argv)
@@ -201 +202 @@
   dt = currentFrame - lastFrame;
 
-  if( dt > 55)
+  if( dt > 10)
   {
     float fps = 1000/dt;
@@ -213 +214 @@
           /* the frame-rate is limited to 100 frames per second, all other things are for nothing.
           */
-    SDL_Delay((unsigned int)(50-dt));
-    dt = 55;
+    SDL_Delay((unsigned int)(10-dt));
+    dt = 10;
   }
 
@@ -240 +241 @@
   while( entity != NULL)                        /* nextElement() will return NULL at the end */
   {
+    if( drawModel)
     entity->draw();
     entity->drawBVTree(depth, drawMode);
@@ -314 +316 @@
 
 
+int drawModels(GtkWidget* nonInterest, void* widget)
+{
+  drawModel = !drawModel;
+}
+
+
 int treeDepth(GtkWidget* nonInterest, void* widget)
 {
@@ -350 +358 @@
 
 
+      CheckButton* DrawModels = new CheckButton("Draw Models");
+      DrawModels->connectSignal("clicked", (void*)DrawModels, drawModels);
+      windowBox->fill(DrawModels);
+
+
       CheckButton* SeperatingPlanes = new CheckButton("SeperatingPlanes");
       SeperatingPlanes->connectSignal("clicked", (void*)SeperatingPlanes, seperatingPlanes);