Changeset 5042 in orxonox.OLD

Timestamp:

Aug 16, 2005, 8:28:04 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: cd debuging tour, the trip forced me to think about the cd feedback triggering - still working

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/npc.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

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

@@ -29 +29 @@
 #include "quadtree.h"
 #include "quadtree_node.h"
+
 
 

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

@@ -626 +626 @@
   PRINT(3)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
   if( unlikely(treeNode == NULL)) return;
+
   if( this->overlapTest(this->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
   {
-    //PRINTF(0)("collision @ lvl %i, object %s vs %s\n", this->depth, nodeA->getClassName(), nodeB->getClassName());
+    PRINTF(3)("collision @ lvl %i, object %s vs. %s\n", this->depth, nodeA->getClassName(), nodeB->getClassName());
 
     /* check if left node overlaps */
@@ -653 +654 @@
       if( unlikely(this->nodeRight == NULL && this->nodeLeft == NULL))
       {
+        PRINT(0)("COLLISOIN\n");
         nodeA->collidesWith(nodeB);
         nodeB->collidesWith(nodeA);

orxonox/trunk/src/world_entities/environment.cc

@@ -36 +36 @@
 
   if(this->obbTree == NULL)
-    this->obbTree = new OBBTree(5, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 

orxonox/trunk/src/world_entities/npc.cc

@@ -34 +34 @@
   this->loadModel("models/ships/bolido.obj");
   if(this->obbTree == NULL)
-    this->obbTree = new OBBTree(5, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 

orxonox/trunk/src/world_entities/world_entity.cc

@@ -74 +74 @@
     this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
     PRINTF(4)("creating obb tree\n");
-    this->obbTree = new OBBTree(5, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
   }
   else