Changeset 3677 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Mar 30, 2005, 6:15:46 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: more output info, some fixes in resourceManager

Location:

orxonox/trunk/src/world_entities

Files:

• primitive.cc (modified) (1 diff)
• terrain.cc (modified) (2 diffs)
• test_gun.cc (modified) (1 diff)
• weapon.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/primitive.cc

@@ -21 +21 @@
 #include "stdincl.h"
 #include "world_entity.h"
-#include "objModel.h"
+#include "model.h"
 #include "vector.h"
 

orxonox/trunk/src/world_entities/terrain.cc

@@ -17 +17 @@
 #include "terrain.h"
 #include "stdincl.h"
-#include "objModel.h"
+#include "model.h"
 #include "vector.h"
 #include "glincl.h"
@@ -45 +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

orxonox/trunk/src/world_entities/test_gun.cc

@@ -25 +25 @@
 #include "stdincl.h"
 #include "world_entity.h"
-#include "objModel.h"
+#include "model.h"
 #include "projectile.h"
 

orxonox/trunk/src/world_entities/weapon.cc

@@ -21 +21 @@
 #include "world_entity.h"
 #include "vector.h"
-#include "objModel.h"
+#include "model.h"
 #include "projectile.h"
 #include "list.h"