Changeset 4718 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 27, 2005, 2:02:37 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the collision detection engine works again and is ready for the presentation

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• subprojects/collision_detection/collision_detection.cc (modified) (4 diffs)
• world_entities/environment.cc (modified) (1 diff)

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

@@ -609 +609 @@
   /* if the obb overlap, make subtests: check which node is realy overlaping  */
   PRINT(3)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
-  //if( unlikely())
+  if( unlikely(treeNode == NULL)) return;
   if( this->overlapTest(this->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
   {

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

@@ -83 +83 @@
   //c = new Terrain();
 
-  b->setRelCoor(0.0, 0.0, -10.0);
-  //b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
+  b->setRelCoor(0.0, 0.0, -15.0);
+  b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
 
   entityList->add(a);
@@ -231 +231 @@
 
 
-  //b->shiftCoor(Vector(0.0, 0.0, iterata));
+  b->shiftCoor(Vector(0.0, 0.0, iterata));
 
 
@@ -238 +238 @@
   while( entity != NULL)
   {
-    entity->tick(dt);
+    //entity->tick(dt);
     entity = iterator->nextElement();
   }
@@ -247 +247 @@
 void Framework::moduleDraw() const
 {
-  CDEngine::getInstance()->debugDraw(depth, drawMode);
+  //CDEngine::getInstance()->debugDraw(depth, drawMode);
 
   tIterator<WorldEntity>* iterator = entityList->getIterator();

orxonox/trunk/src/world_entities/environment.cc

@@ -35 +35 @@
   this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj"/*"worlds/vulcania.obj"*/, OBJ, RP_CAMPAIGN);
 
-  this->obbTree = new OBBTree(10, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+  this->obbTree = new OBBTree(7, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }