Changeset 7711 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

May 18, 2006, 11:44:21 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the cd branche back to trunk

File:

• trunk/src/world_entities/world_entity.cc (modified) (9 diffs)

trunk/src/world_entities/world_entity.cc

@@ -36 +36 @@
 SHELL_COMMAND(model, WorldEntity, loadModel)
 ->describe("sets the Model of the WorldEntity")
-->defaultValues("models/ships/fighter.obj", 1.0);
+->defaultValues("models/ships/fighter.obj", 1.0f);
 
 SHELL_COMMAND(debugEntity, WorldEntity, debugWE);
@@ -118 +118 @@
  * @param fileName the name of the model to load
  * @param scaling the Scaling of the model
- */
-void WorldEntity::loadModel(const std::string& fileName, float scaling, unsigned int modelNumber)
+ *
+ * FIXME
+ * @todo: separate the obb tree generation from the model
+ */
+void WorldEntity::loadModel(const std::string& fileName, float scaling, unsigned int modelNumber, unsigned int obbTreeDepth)
 {
   this->modelLODName = fileName;
@@ -154 +157 @@
 
       if( modelNumber == 0)
-        this->buildObbTree(4);
+        this->buildObbTree(obbTreeDepth);
     }
     else if(fileName.find(".md2") != std::string::npos)
@@ -164 +167 @@
 
       if( m != NULL)
-        this->buildObbTree(4);
+        this->buildObbTree(obbTreeDepth);
     }
   }
@@ -207 +210 @@
  * @param depth the depth to calculate
  */
-bool WorldEntity::buildObbTree(unsigned int depth)
+bool WorldEntity::buildObbTree(int depth)
 {
   if (this->obbTree)
@@ -214 +217 @@
   if (this->models[0] != NULL)
   {
-    PRINTF(4)("creating obb tree\n");
-
-
-    this->obbTree = new OBBTree(depth, (sVec3D*)this->models[0]->getVertexArray(), this->models[0]->getVertexCount());
+    this->obbTree = new OBBTree(depth, models[0]->getModelInfo(), this);
     return true;
   }
   else
   {
-    PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
+    PRINTF(1)("could not create obb-tree, because no model was loaded yet\n");
     this->obbTree = NULL;
     return false;
@@ -468 +468 @@
  * @param drawMode the mode to draw this entity under
  */
-void WorldEntity::drawBVTree(unsigned int depth, int drawMode) const
+void WorldEntity::drawBVTree(int depth, int drawMode) const
 {
   glMatrixMode(GL_MODELVIEW);
@@ -480 +480 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
+
   if (this->obbTree)
     this->obbTree->drawBV(depth, drawMode);
+
+
   glPopMatrix();
 }
@@ -571 +574 @@
     std::string name = getModel( 0 )->getName();
 
-    if (  name.find( ResourceManager::getInstance()->getDataDir() ) == 0 ) 
+    if (  name.find( ResourceManager::getInstance()->getDataDir() ) == 0 )
     {
       name.erase(ResourceManager::getInstance()->getDataDir().size());