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

Timestamp:

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

Author:

patrick

Message:

trunk: merged the cd branche back to trunk

Location:

trunk/src/world_entities

Files:

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

trunk/src/world_entities/environment.cc

@@ -37 +37 @@
   this->init();
   this->loadModel("models/ships/bolido.obj");
+//   if(this->obbTree == NULL)
+//     this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 

trunk/src/world_entities/test_entity.cc

@@ -41 +41 @@
 {
   this->init();
+  this->md2Model = new MD2Model("models/droidika.md2", "models/droideka.pcx");
 }
 
+
+//   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);
 
 

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());

trunk/src/world_entities/world_entity.h

@@ -2 +2 @@
  * @file world_entity.h
  * Definition of the basic WorldEntity
-*/
+ */
 
 #ifndef _WORLD_ENTITY_H
@@ -35 +35 @@
   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; };
 
   inline void loadMD2Texture(const std::string& fileName) { this->md2TextureFileName = fileName; }
-
-  bool buildObbTree(unsigned int depth);
-  /** @returns a reference to the obb tree of this worldentity */
-  BVTree* getOBBTree() const { return this->obbTree; };
 
   /** @param visibility if the Entity should be visible (been draw) */
@@ -57 +53 @@
 
   virtual void tick (float time);
-
   virtual void draw () const;
 
+  bool buildObbTree(int depth);
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
-  void drawBVTree(unsigned int depth, int drawMode) const;
-
+  /** @returns a reference to the obb tree of this worldentity */
+  inline BVTree* getOBBTree() const { return this->obbTree; };
+  void drawBVTree(int depth, int drawMode) const;
 
   void debugWE() { this->debugEntity(); }
@@ -77 +74 @@
 
   void toList(OM_LIST list);
+
 
   /** @returns a Reference to the objectListNumber to set. */
@@ -101 +99 @@
   void setHealthMax(float healthMax);
   void createHealthWidget();
+
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 private: