Changeset 6720 in orxonox.OLD

Timestamp:

Jan 25, 2006, 5:08:23 PM (18 years ago)

Author:

bensch

Message:

trunk: bug in loadModel

File:

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

trunk/src/world_entities/world_entity.cc

@@ -135 +135 @@
       strcpy(lodFile, fileName);
       char* depth = strchr(lodFile, '#');
-      for (unsigned int i = 0; i < 5; i++)
+      for (unsigned int i = 0; i < 3; i++)
       {
         *depth = 48+(int)i;
-        printf("-------%s\n", lodFile);
         if (ResourceManager::isInDataDir(lodFile))
           this->loadModel(lodFile, scaling, i);
@@ -144 +143 @@
       return;
     }
-    if (scaling == 0.0)
-    {
-      scaling = 1.0;
+    if (this->scaling <= 0.0)
+    {
+      this->scaling = 1.0;
       PRINTF(1)("YOU GAVE ME A CRAPY SCALE resetting to 1\n");
     }
@@ -152 +151 @@
     {
       PRINTF(4)("fetching OBJ file: %s\n", fileName);
-      if (scaling == 1.0)
+      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, &scaling), modelNumber);
+        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, this->scaling), modelNumber);
 
       if( modelNumber == 0)