Changeset 6167 in orxonox.OLD for branches/christmas_branche/src/world_entities/world_entity.cc

Timestamp:

Dec 19, 2005, 11:37:06 PM (18 years ago)

Author:

patrick

Message:

christmas: md2 model loading issues

File:

• branches/christmas_branche/src/world_entities/world_entity.cc (modified) (1 diff)

branches/christmas_branche/src/world_entities/world_entity.cc

@@ -120 +120 @@
       }
 
-    PRINTF(4)("fetching %s\n", fileName);
-    if (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);
-    if (modelNumber == 0)
-    this->buildObbTree(4);
+      if( strchr(fileName, '.obj') != NULL)
+      {
+        PRINTF(4)("fetching OBJ file: %s\n", fileName);
+        if (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);
+
+        if( modelNumber == 0)
+          this->buildObbTree(4);
+      }
+      else if( strchr(fileName, '.md2') != NULL)
+      {
+        PRINTF(4)("fetching MD2 file: %s\n", fileName);
+        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
+      }
   }
   else