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

Timestamp:

Dec 9, 2005, 11:26:02 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: preparations for LOD's

File:

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

trunk/src/world_entities/world_entity.cc

@@ -44 +44 @@
   this->setClassID(CL_WORLD_ENTITY, "WorldEntity");
 
-  this->model = NULL;
   this->obbTree = NULL;
 
-  if (root)
+  if (root != NULL)
     this->loadParams(root);
 
@@ -78 +77 @@
   LoadParam(root, "model", this, WorldEntity, loadModel)
       .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)")
-      .defaultValues(2, NULL, 1.0f);
+      .defaultValues(3, NULL, 1.0f, 0);
 
 }
@@ -89 +88 @@
  * @todo fix this, so it only has one loadModel-Function.
 */
-void WorldEntity::loadModel(const char* fileName, float scaling)
+void WorldEntity::loadModel(const char* fileName, float scaling, unsigned int modelNumber)
 {
   if (fileName != NULL)
@@ -102 +101 @@
   }
   else
-    this->model = NULL;
+    this->setModel(NULL);
 }
 
@@ -112 +111 @@
 void WorldEntity::setModel(Model* model, unsigned int modelNumber)
 {
-  if (this->model != NULL)
+  if (this->models.size() <= modelNumber)
+    this->models.resize(modelNumber+1, NULL);
+
+  if (this->models[modelNumber] != NULL)
   { 
-    Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->model);
+    Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->models[modelNumber]);
     if (resource != NULL)
       ResourceManager::getInstance()->unload(resource, RP_LEVEL);
     else
-      delete this->model;
-  }
-  this->model = model;
+      delete this->models[modelNumber];
+  }
+  this->models[modelNumber] = model;
 
 //   if (this->model != NULL)  
@@ -136 +138 @@
     delete this->obbTree;
 
-  if (this->model != NULL)
+  if (this->models[0] != NULL)
   {
     PRINTF(4)("creating obb tree\n");
 
 
-    this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+    this->obbTree = new OBBTree(depth, (sVec3D*)this->models[0]->getVertexArray(), this->models[0]->getVertexCount());
     return true;
   }
@@ -236 +238 @@
   glMultMatrixf((float*)matrix);
 
-  if (this->model)
-    this->model->draw();
+  if (this->models[0])
+    this->models[0]->draw();
   glPopMatrix();
 }