Changeset 5256 in orxonox.OLD

Timestamp:

Sep 25, 2005, 6:27:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: real strange, i thought i fixed this before
this seems to be a copy-past error

Location:

trunk/src

Files:

• lib/shell/shell.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

trunk/src/lib/shell/shell.cc

@@ -141 +141 @@
   for (int i = 0; i < this->bufferDisplaySize; i++)
   {
-    this->bufferText[i]->setText(bufferIT->getCurrent(), true);
+    this->bufferText[i]->setText(bufferIT->getCurrent(), false);
     bufferIT->prevStep();
   }

trunk/src/story_entities/world.cc

@@ -464 +464 @@
     char npcChar[10];
     sprintf (npcChar, "NPC_%d", i);
-    tmp->setName(npcChar);
+        tmp->setName(npcChar);
     tmp->setAbsCoor(((float)rand()/RAND_MAX) * 5000, 50/*+ (float)rand()/RAND_MAX*20*/, ((float)rand()/RAND_MAX -.5) *100);
     this->spawn(tmp);

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;
+  }
 }