Changeset 5053 in orxonox.OLD

Timestamp:

Aug 16, 2005, 11:28:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loadModel in Projectiles

Location:

orxonox/trunk/src

Files:

• lib/math/vector.h (modified) (1 diff)
• world_entities/npc.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (1 diff)

orxonox/trunk/src/lib/math/vector.h

@@ -72 +72 @@
   inline float len() const { return sqrt (x*x+y*y+z*z); }
   /** normalizes the vector */
-  inline void normalize() {
-                      float l = len();
-                      if( unlikely(l == 0.0))
-                        {
-                          // Prevent divide by zero
-                          return;
-                        }
-                      x = x / l;
-                      y = y / l;
-                      z = z / l;
-                    }
+  inline void normalize() { float l = len(); if( unlikely(l == 0.0))return; this->x=this->x/l; this->y=this->y/l; this->z=this->z/l; };
   Vector getNormalized() const;
   Vector abs();

orxonox/trunk/src/world_entities/npc.cc

@@ -43 +43 @@
 void NPC::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(0)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
+  if (entity->isA(CL_PROJECTILE))
+    PRINTF(0)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
 }
 

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -118 +118 @@
   this->setClassID(CL_TEST_GUN, "TestGun");
 
-  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
+//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
+
+  this->loadModel("models/guns/test_gun.obj");
 
   this->setStateDuration(WS_SHOOTING, .3);