Changeset 7537 in orxonox.OLD for branches/cd/src/world_entities

Timestamp:

May 4, 2006, 4:35:25 PM (19 years ago)

Author:

patrick

Message:

collision: setup test topology

Location:

branches/cd/src/world_entities

Files:

• world_entity.cc (modified) (5 diffs)
• world_entity.h (modified) (1 diff)

branches/cd/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);
     }
   }
@@ -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());

branches/cd/src/world_entities/world_entity.h

@@ -36 +36 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0);
+  void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0, unsigned int obbTreeDepth = 4);
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };