Changeset 5055 in orxonox.OLD for orxonox/trunk/src

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: testBullet now loads it model as it should

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/weapons/test_bullet.cc (modified) (1 diff)

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/weapons/test_bullet.cc

@@ -38 +38 @@
 
   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->loadModel("models/projectiles/orx-rocket.obj");
 
   this->energyMin = 1;