Changeset 4689 in orxonox.OLD for orxonox

Timestamp:

Jun 24, 2005, 3:06:04 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: enhanced world entities to support collisions

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (6 diffs)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

orxonox/trunk/src/lib/collision_detection/cd_engine.cc

@@ -20 +20 @@
 #include "debug.h"
 #include "abstract_model.h"
+#include "world_entity.h"
+#include "list.h"
 
 using namespace std;
@@ -33 +35 @@
 
    /* testing purposes only: */
-   this->rootTree = new OBBTree();
+   //this->rootTree = new OBBTree();
 }
 
@@ -54 +56 @@
 void CDEngine::checkCollisions()
 {
+  tIterator<WorldEntity>* iterator1 = entityList->getIterator();
+  tIterator<WorldEntity>* iterator2 = entityList->getIterator();
+  WorldEntity* entity1 = iterator1->nextElement();
+  WorldEntity* entity2 = iterator2->nextElement();
+  while( entity1 != NULL)
+  {
+    while( entity2 != NULL && entity1 != entity2)
+    {
+      entity1->collideWith(entity2);
+      entity2 = iterator2->nextElement();
+    }
+    entity1 = iterator1->nextElement();
+  }
+  delete iterator1;
+  delete iterator2;
+
 
 }
@@ -70 +88 @@
 {
   /* this would operate on  worldList bases, for testing purposes, we only use one OBBTree */
-  this->rootTree->drawBV(depth, drawMode);
+  //this->rootTree->drawBV(depth, drawMode);
+
+  tIterator<WorldEntity>* iterator = entityList->getIterator();
+  WorldEntity* entity = iterator->nextElement();
+  while( entity != NULL)
+  {
+    entity->drawBVTree(depth, drawMode);
+    entity = iterator->nextElement();
+  }
+  delete iterator;
+  //model->draw();
 }
 
@@ -81 +109 @@
   PRINT(0)("\n=============================| CDEngine::debug() |===\n");
   PRINT(0)("=  CDEngine: Spawning Tree Start\n");
-  this->rootTree->debug();
+  //this->rootTree->debug();
   PRINT(0)("=  CDEngine: Spawning Tree: Finished\n");
   PRINT(0)("=======================================================\n");
@@ -89 +117 @@
 void CDEngine::debugSpawnTree(int depth, sVec3D* vertices, int numVertices)
 {
+  if ( this->rootTree == NULL)
+    this->rootTree = new OBBTree();
   this->rootTree->spawnBVTree(depth, vertices, numVertices);
 }

orxonox/trunk/src/world_entities/world_entity.cc

@@ -130 +130 @@
    Implement behaviour like damage application or other miscellaneous collision stuff in this function
 */
-void WorldEntity::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags) {}
+void WorldEntity::collideWith(WorldEntity* entity) {}
 
 

orxonox/trunk/src/world_entities/world_entity.h

@@ -47 +47 @@
 
   virtual void hit (WorldEntity* weapon, Vector* loc);
-  virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
+  virtual void collideWith (WorldEntity* entity);
   virtual void command (Command* cmd);