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

Timestamp:

Mar 26, 2005, 3:28:39 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: moved protoclass to folder proto
added protosingleton
added resourceManager
modiefied some stuff to work better

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (2 diffs)
• player.h (modified) (1 diff)
• world_entity.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -22 +22 @@
 #include "track_manager.h"
 #include "objModel.h"
+#include "resource_manager.h"
 #include "weapon.h"
 #include "test_gun.h"
@@ -44 +45 @@
      the player.cc for debug also
   */
-  this->model = new OBJModel("../data/models/reaplow.obj");
+  this->model = (Model*) ResourceManager::load("../data/models/reaplow.obj", OBJ);
   travelSpeed = 15.0;
   velocity = new Vector();

orxonox/trunk/src/world_entities/player.h

@@ -10 +10 @@
 
 template<class T> class tList;
-class OBJModel;
 class Weapon;
 class Vector;

orxonox/trunk/src/world_entities/world_entity.h

@@ -12 +12 @@
 //class CollisionCluster;
 class CharacterAttributes;
-class OBJModel;
+class Model;
 
 
@@ -48 +48 @@
   
  protected:
-  OBJModel* model;                  //!< The model that should be loaded for this entity.
+  Model* model;                  //!< The model that should be loaded for this entity.
   CharacterAttributes* charAttr;      //!< the character attributes of a world_entity