Changeset 5213 in orxonox.OLD for trunk/src

Timestamp:

Sep 21, 2005, 8:10:11 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: removed the Collision-detection, to be faster with Valgrind.
@patrick: to revert this change do a:
svn merge -r 5213:5212 . .
in the trunk

Location:

trunk/src/world_entities

Files:

• environment.cc (modified) (1 diff)
• test_entity.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

trunk/src/world_entities/environment.cc

@@ -36 +36 @@
   this->model = (Model*)ResourceManager::getInstance()->load("models/ships/bolido.obj", OBJ, RP_CAMPAIGN);
 
-  if(this->obbTree == NULL)
-    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+/*  if(this->obbTree == NULL)
+    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());*/
 }
 

trunk/src/world_entities/test_entity.cc

@@ -36 +36 @@
 //   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
 // this->md2Model = new MD2Model("models/goblin.md2", "maps/goblin.bmp");
-  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
+//  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
 
   this->md2Model->setAnim(RUN);

trunk/src/world_entities/world_entity.cc

@@ -99 +99 @@
 bool WorldEntity::buildObbTree(unsigned int depth)
 {
-  if (this->obbTree)
-    delete this->obbTree;
-
-  if (this->model)
-  {
-    PRINTF(4)("creating obb tree\n");
-    this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
-    return true;
-  }
-  else
-  {
-    PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
-    this->obbTree = NULL;
-    return false;
-  }
+//   if (this->obbTree)
+//     delete this->obbTree;
+//
+//   if (this->model)
+//   {
+//     PRINTF(4)("creating obb tree\n");
+//     this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+//     return true;
+//   }
+//   else
+//   {
+//     PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
+//     this->obbTree = NULL;
+//     return false;
+//  }
 }