Changeset 5033 in orxonox.OLD for orxonox

Timestamp:

Aug 15, 2005, 9:59:57 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: obb trees are now created for every object in the world. this will use some extra seconds in the startup and will also take some ms in the collision detection algorithm test. took 30fps here… will try to optimize it…

Location:

orxonox/trunk/src

Files:

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

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

@@ -105 +105 @@
 void CDEngine::checkCollisionGround()
 {
-  Quadtree* q = this->terrain->ssp->getQuadtree();
+  if( likely( this->terrain != NULL))
+  {
+    Quadtree* q = this->terrain->ssp->getQuadtree();
 
-  QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
-
+    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
+  }
   //sTriangleExt* tri = q->getTriangleFromPosition(this->player->getAbsCoor());
 }

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

@@ -231 +231 @@
 
 
-  b->shiftCoor(Vector(0.0, 0.0, iterata * dt * 12.0f));
+ // b->shiftCoor(Vector(0.0, 0.0, iterata * dt * 12.0f));
 
 

orxonox/trunk/src/world_entities/environment.cc

@@ -33 +33 @@
 {
   this->setClassID(CL_ENVIRONMENT, "Environment");
-  this->model = (Model*)ResourceManager::getInstance()->load("models/bolido.obj", OBJ, RP_CAMPAIGN);
+  this->model = (Model*)ResourceManager::getInstance()->load("models/ships/bolido.obj", OBJ, RP_CAMPAIGN);
 
-  this->obbTree = new OBBTree(15, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+  if(this->obbTree == NULL)
+    this->obbTree = new OBBTree(5, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 

orxonox/trunk/src/world_entities/npc.cc

@@ -20 +20 @@
 
 #include "npc.h"
+#include "obb_tree.h"
 
 #include "state.h"
@@ -32 +33 @@
 
   this->loadModel("models/ships/bolido.obj");
+  if(this->obbTree == NULL)
+    this->obbTree = new OBBTree(5, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 
@@ -53 +56 @@
 
 
+

orxonox/trunk/src/world_entities/world_entity.cc

@@ -73 +73 @@
     PRINTF(4)("loading %s\n", fileName);
     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());
   }
   else