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

Timestamp:

Mar 7, 2006, 5:05:50 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new style for resources (prework/movement)

File:

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

trunk/src/world_entities/world_entity.cc

@@ -22 +22 @@
 #include "model.h"
 #include "md2Model.h"
-#include "resource_manager.h"
-#include "load_param.h"
+#include "util/loading/resource_manager.h"
+#include "util/loading/load_param.h"
 #include "vector.h"
 #include "obb_tree.h"
@@ -86 +86 @@
   if (this->healthWidget != NULL)
     delete this->healthWidget;
-
 }
 
@@ -147 +146 @@
     if (this->scaling <= 0.0)
     {
+      PRINTF(1)("YOU GAVE ME A CRAPY SCALE resetting to 1.0\n");
       this->scaling = 1.0;
-      PRINTF(1)("YOU GAVE ME A CRAPY SCALE resetting to 1\n");
     }
     if(strstr(fileName, ".obj"))
     {
       PRINTF(4)("fetching OBJ file: %s\n", fileName);
-      if (this->scaling == 1.0)
-        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
-      else
-        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, this->scaling), modelNumber);
+      BaseObject* loadedModel = ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, this->scaling);
+      if (loadedModel != NULL)
+        this->setModel(dynamic_cast<Model*>(loadedModel), modelNumber);
 
       if( modelNumber == 0)
@@ -190 +188 @@
   if (this->models[modelNumber] != NULL)
   {
-    Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->models[modelNumber]);
+    Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(dynamic_cast<BaseObject*>(this->models[modelNumber]));
     if (resource != NULL)
       ResourceManager::getInstance()->unload(resource, RP_LEVEL);