Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/world_entities/environment.cc

Timestamp:

Apr 7, 2005, 3:54:49 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

File:

• orxonox/branches/levelloader/src/world_entities/environment.cc (modified) (2 diffs)

orxonox/branches/levelloader/src/world_entities/environment.cc

@@ -30 +30 @@
 Environment::Environment () : WorldEntity()
 {
-  this->model = new OBJModel("../data/models/fighter.obj");
+  this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
+  //  this->model = new OBJModel("../data/models/fighter.obj");
 }
 
@@ -54 +55 @@
         string = grabParameter( root, "model");
         if( string != NULL)
-                this->model = new OBJModel( string);
+        this->model = (Model*) ResourceManager::getInstance()->load( string, RP_LEVEL);
         else
         {
                 PRINTF0("Environment is missing a proper 'model'\n");
-                this->model = new OBJModel( "../data/models/reaplow.obj");
+        this->model = (Model*) ResourceManager::getInstance()->load( "cube", RP_LEVEL);
         }
         if( this->model == NULL)