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

Timestamp:

Dec 9, 2005, 10:43:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: much cleaner Model Loading unloading, model is now private to WorldEntity (not protected)

File:

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

trunk/src/world_entities/world_entity.cc

@@ -58 +58 @@
 WorldEntity::~WorldEntity ()
 {
-  // Delete the model (unregister it with the ResourceManager)
-  if (likely(this->model != NULL))
-    ResourceManager::getInstance()->unload(this->model);
   // Delete the obbTree
   if( this->obbTree != NULL)
     delete this->obbTree;
+
+  // Delete the model (unregister it with the ResourceManager)
+  this->setModel(NULL);
 }
 
@@ -91 +91 @@
 void WorldEntity::loadModel(const char* fileName, float scaling)
 {
-  if (this->model)
-    ResourceManager::getInstance()->unload(this->model, RP_LEVEL);
   if (fileName != NULL)
   {
     PRINTF(4)("fetching %s\n", fileName);
     if (scaling == 1.0)
-      this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN);
+      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN));
     else
-      this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling);
+      this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling));
 
     this->buildObbTree(4);
@@ -106 +104 @@
     this->model = NULL;
 }
+
+/**
+ * sets a specific Model for the Object.
+ * @param model The Model to set
+ * @param modelNumber the n'th model in the List to get.
+ */
+void WorldEntity::setModel(Model* model, unsigned int modelNumber)
+{
+  if (this->model != NULL)
+  { 
+    Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->model);
+    if (resource != NULL)
+      ResourceManager::getInstance()->unload(resource, RP_LEVEL);
+    else
+      delete this->model;
+  }
+  this->model = model;
+
+//   if (this->model != NULL)  
+//     this->buildObbTree(4);
+}
+
 
 /**