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

Timestamp:

Jun 24, 2005, 12:10:46 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: put together a little scene in the collision detection subproject. obbs not yet calculated

File:

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

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

@@ -28 +28 @@
 #include "model.h"
 #include "test_entity.h"
+#include "environment.h"
 
 #include "graphics_engine.h"
@@ -39 +40 @@
 tList<WorldEntity>* entityList;
 
+int lastFrame, currentFrame, dt;
+
 void Framework::moduleInit(int argc, char** argv)
 {
@@ -44 +47 @@
 
   CDEngine::getInstance();
+
+  /* Simple Test */
   //CDEngine::getInstance()->debug();
 
+  /* MD2 Model Test */
 //   model = new MD2Model("models/tris.md2", "models/tris.pcx");
 //   model->tick(0.1f);
 //   CDEngine::getInstance()->debugSpawnTree(9, model->data->pVertices, model->data->numVertices);
 
+  /* OBJ - Model Test */
+//   mod = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+//   CDEngine::getInstance()->debugSpawnTree(9, (sVec3D*)mod->getVertexArray(), mod->getVertexArrayCount());
+
+
+
   entityList = new tList<WorldEntity>();
 
   TestEntity* a = new TestEntity();
+  Environment* b = new Environment();
+  b->setRelCoor(0.0, 0.0, -10.0);
 
   entityList->add(a);
-
-
-  mod = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
-  CDEngine::getInstance()->debugSpawnTree(9, (sVec3D*)mod->getVertexArray(), mod->getVertexCount());
-
-  /* ligths */
+  entityList->add(b);
+
+
   LightManager* lightMan = LightManager::getInstance();
   lightMan->setAmbientColor(.1,.1,.1);
@@ -71 +82 @@
   drawMode = DRAW_MODEL;
   depth = 0;
+  dt = lastFrame = currentFrame = 0;
+
 
   moduleHelp();
@@ -184 +197 @@
 void Framework::moduleTick(float dt)
 {
+
+  currentFrame = SDL_GetTicks();
+  dt = currentFrame - lastFrame;
+
+  if( dt > 55)
+  {
+    float fps = 1000/dt;
+
+          // temporary, only for showing how fast the text-engine is
+    char tmpChar[20];
+    sprintf(tmpChar, "fps: %4.0f", fps);
+  }
+  else
+  {
+          /* the frame-rate is limited to 100 frames per second, all other things are for nothing.
+          */
+    SDL_Delay((unsigned int)(50-dt));
+    dt = 55;
+  }
+
+
   tIterator<WorldEntity>* iterator = entityList->getIterator(); /* get the iterator - JAVA style */
   WorldEntity* entity = iterator->nextElement();   /* this returns the FIRST element */
   while( entity != NULL)                        /* nextElement() will return NULL at the end */
   {
-    entity->tick(0.2);
+    entity->tick(0.1);
     entity = iterator->nextElement();       /* give back the next element or NULL if last */
   }
   delete iterator;
 
+  lastFrame = currentFrame;
 }
 
@@ -198 +233 @@
 void Framework::moduleDraw() const
 {
-  CDEngine::getInstance()->drawBV(depth, drawMode);
-
+  //CDEngine::getInstance()->drawBV(depth, drawMode);
   LightManager::getInstance()->draw();
 
-//   tIterator<WorldEntity>* iterator = entityList->getIterator(); /* get the iterator - JAVA style */
-//   WorldEntity* entity = iterator->nextElement();   /* this returns the FIRST element */
-//   while( entity != NULL)                        /* nextElement() will return NULL at the end */
-//   {
-//     entity->draw();
-//     entity = iterator->nextElement();       /* give back the next element or NULL if last */
-//   }
-//   delete iterator;
+  tIterator<WorldEntity>* iterator = entityList->getIterator(); /* get the iterator - JAVA style */
+  WorldEntity* entity = iterator->nextElement();   /* this returns the FIRST element */
+  while( entity != NULL)                        /* nextElement() will return NULL at the end */
+  {
+    entity->draw();
+    entity = iterator->nextElement();       /* give back the next element or NULL if last */
+  }
+  delete iterator;
   //model->draw();
 }