Changeset 5054 in orxonox.OLD

Timestamp:

Aug 16, 2005, 11:33:15 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: only obb boxes drawn, obbtree of projectiles also generated

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/npc.cc (modified) (3 diffs)
• world_entities/weapons/test_bullet.cc (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -931 +931 @@
   while( entity != NULL )
   {
-    if( entity->isVisible() ) entity->draw();
-    //entity->drawBVTree(2, 226);  // to draw the bounding boxes of the objects at level 2 for debug purp
+    //if( entity->isVisible() ) entity->draw();
+    entity->drawBVTree(2, 226);  // to draw the bounding boxes of the objects at level 2 for debug purp
     entity = iterator->nextElement();
   }

orxonox/trunk/src/world_entities/environment.cc

@@ -59 +59 @@
 void Environment::draw ()
 {
-  //this->getRelCoor().debug();
-
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();

orxonox/trunk/src/world_entities/npc.cc

@@ -17 +17 @@
 
 
-//#include "ai.h"
-
 #include "npc.h"
 #include "obb_tree.h"
@@ -33 +31 @@
 
   this->loadModel("models/ships/bolido.obj");
-  if(this->obbTree == NULL)
+  if( this->obbTree == NULL)
     this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
@@ -53 +51 @@
 
   //if (directin.len() < 100)
-  this->shiftCoor(direction *dt * 5 * exp(-direction.len()/30.0));
+  this->shiftCoor(direction *dt * 5 * exp(-direction.len() / 30.0));
 
 }

orxonox/trunk/src/world_entities/weapons/test_bullet.cc

@@ -24 +24 @@
 #include "fast_factory.h"
 
+#include "obb_tree.h"
+
 using namespace std;
 
@@ -37 +39 @@
   float modelSize = .3;
   this->model = (Model*)ResourceManager::getInstance()->load("models/projectiles/orx-rocket.obj", OBJ, RP_LEVEL, (void*) &modelSize);
+
+  if(this->obbTree == NULL)
+    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 
   this->energyMin = 1;