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

Timestamp:

Mar 30, 2005, 3:02:58 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: ResourceManager not totally static anymore, list-iterators, and so on

Location:

orxonox/trunk/src/world_entities

Files:

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

orxonox/trunk/src/world_entities/environment.cc

@@ -29 +29 @@
 Environment::Environment () : WorldEntity()
 {
-  this->model = (Model*) ResourceManager::load("models/reaplow.obj", OBJ);
+  this->model = (Model*) ResourceManager::getInstance()->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("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+  this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
   velocity = new Vector();

orxonox/trunk/src/world_entities/projectile.cc

@@ -33 +33 @@
 Projectile::Projectile () : WorldEntity()
 {
-  //this->model = new OBJModel("");
-  this->projectileModel = new Primitive(P_SPHERE);
+  this->model = (Model*)ResourceManager::getInstance()->load("cube", PRIM, RP_LEVEL);
+  //  this->projectileModel = new Primitive(P_SPHERE);
   this->flightDirection = NULL;
   this->currentLifeTime = 0.0f;
@@ -137 +137 @@
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);  
-  //this->model->draw();
-  this->projectileModel->draw();
+  this->model->draw();
+  //this->projectileModel->draw();
 
   glPopMatrix();

orxonox/trunk/src/world_entities/world_entity.cc

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