Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/world_entities/terrain.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/terrain.cc (modified) (2 diffs)

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

@@ -16 +16 @@
 
 #include "terrain.h"
-
+#include "stdincl.h"
+#include "model.h"
+#include "vector.h"
 #include "glincl.h"
 
@@ -43 +45 @@
   if (strstr(fileName, ".obj") || strstr(fileName, ".OBJ"))
     {
-      this->model = (OBJModel*)new OBJModel(fileName);
+      this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_LEVEL);
     }
   else