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

Timestamp:

Jun 23, 2005, 11:08:06 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now used the player model to do an obb on it - works greatly and it realy makes sense! im so excited…

File:

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

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

@@ -26 +26 @@
 
 #include "md2Model.h"
+#include "model.h"
+#include "test_entity.h"
 
 #include "graphics_engine.h"
-
-
-
+#include "list.h"
+
+
+Model* mod;
 MD2Model* model;
 int drawMode;
 int depth;
+tList<WorldEntity>* entityList;
 
 void Framework::moduleInit(int argc, char** argv)
@@ -42 +46 @@
   //CDEngine::getInstance()->debug();
 
-  model = new MD2Model("models/tris.md2", "models/tris.pcx");
-  model->tick(0.1f);
-
-
-  CDEngine::getInstance()->debugSpawnTree(9, model->data->pVertices, model->data->numVertices);
-
-
+//   model = new MD2Model("models/tris.md2", "models/tris.pcx");
+//   model->tick(0.1f);
+//   CDEngine::getInstance()->debugSpawnTree(9, model->data->pVertices, model->data->numVertices);
+
+  entityList = new tList<WorldEntity>();
+
+  TestEntity* a = new TestEntity();
+
+  entityList->add(a);
+
+
+  mod = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+  CDEngine::getInstance()->debugSpawnTree(9, (sVec3D*)mod->getVertexArray(), mod->getVertexArrayCount());
+
+  /* ligths */
   LightManager* lightMan = LightManager::getInstance();
   lightMan->setAmbientColor(.1,.1,.1);
@@ -56 +68 @@
   lightMan->setPosition(-30, -30, -30);
 
+  /* properties */
   drawMode = DRAW_MODEL;
   depth = 0;
@@ -171 +184 @@
 void Framework::moduleTick(float dt)
 {
+  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 = iterator->nextElement();       /* give back the next element or NULL if last */
+  }
+  delete iterator;
+
 }
 
@@ -180 +202 @@
   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;
   //model->draw();
 }