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

Timestamp:

Mar 27, 2005, 7:44:39 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: resource manager working, player uses it.

Location:

orxonox/trunk/src/world_entities

Files:

• environment.cc (modified) (1 diff)
• player.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (1 diff)

orxonox/trunk/src/world_entities/environment.cc

@@ -29 +29 @@
 Environment::Environment () : WorldEntity()
 {
-  this->model = new OBJModel("../data/models/fighter.obj");
+  this->model = (Model*) ResourceManager::load("models/reaplow.obj", OBJ);
+  //  this->model = new OBJModel("../data/models/fighter.obj");
 }
 

orxonox/trunk/src/world_entities/player.cc

@@ -45 +45 @@
      the player.cc for debug also
   */
-  this->model = (Model*) ResourceManager::load("../data/models/reaplow.obj", OBJ);
+  this->model = (Model*)ResourceManager::load("models/reaplow.obj", OBJ);
   travelSpeed = 15.0;
   velocity = new Vector();

orxonox/trunk/src/world_entities/world_entity.cc

@@ -51 +51 @@
 {
   // if( collisioncluster != NULL) delete collisioncluster;
-  delete this->model;
+  ResourceManager::unload(this->model);
 }
 

orxonox/trunk/src/world_entities/world_entity.h

@@ -9 +9 @@
 #include "p_node.h"
 #include "comincl.h"
+#include "resource_manager.h"
+
 
 //class CollisionCluster;