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

Timestamp:

Mar 30, 2005, 5:42:02 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: debug-information for ResourceManager

Location:

orxonox/trunk/src/world_entities

Files:

• projectile.cc (modified) (2 diffs)
• projectile.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/projectile.cc

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

orxonox/trunk/src/world_entities/projectile.h

@@ -9 +9 @@
 #include "world_entity.h"
 
-class Primitive;
 class Vector;
 
@@ -32 +31 @@
  private:
   //physical attriutes like: force, speed, acceleration etc.
-  Primitive* projectileModel;          //!< this serves temporary as a plasma bullet
   float speed;                         //!< this is the speed of the projectile
   float currentLifeTime;               //!< this is the time, the projectile exists in this world (incremented by tick)