Changeset 3683 in orxonox.OLD for orxonox/trunk/src/world_entities/projectile.cc

Timestamp:

Mar 30, 2005, 9:37:52 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: projectile speed issue: fixed some strange behaveour. still got the problem, that the the projectile have variable relative speeds to the player…

File:

• orxonox/trunk/src/world_entities/projectile.cc (modified) (5 diffs)

orxonox/trunk/src/world_entities/projectile.cc

@@ -20 +20 @@
 
 #include "world_entity.h"
+#include "weapon.h"
 #include "null_parent.h"
 #include "model.h"
@@ -30 +31 @@
    \brief standard constructor
 */
-Projectile::Projectile () : WorldEntity()
+Projectile::Projectile (Weapon* weapon) : WorldEntity()
 {
   this->model = (Model*)ResourceManager::getInstance()->load("sphere", PRIM, RP_LEVEL);
+  this->weapon = weapon;
   this->flightDirection = NULL;
   this->currentLifeTime = 0.0f;
@@ -66 +68 @@
   Vector v(1, 0, 0);
   *this->flightDirection = flightDirection->apply(v);
+  this->flightDirection->normalize();
 }
 
@@ -86 +89 @@
 void Projectile::setSpeed(float speed)
 {
-  this->speed = speed;
+  this->speed = speed * 5;
   printf("Projectile::setting speed to: %f\n", this->speed);
 }
@@ -96 +99 @@
 void Projectile::tick (float time) 
 {
+  this->speed = this->weapon->getSpeed() * 5;  
+  this->shiftCoor(*this->flightDirection * this->speed * time);
+  printf("current speed is: %f\n", this->speed);
+
   this->currentLifeTime += time;
-  if( this->ttl < this->currentLifeTime)
-    {
-      *this->flightDirection = *this->flightDirection * this->speed * time;
-      this->shiftCoor(this->flightDirection);
-      this->flightDirection->debug();
-      return;
-    }
-  this->finalize();
-  //NullParent* np = NullParent::getInstance();
-  /* garbage colelction */
-  // \fix: there is no gc in this class, its all been done by GarbageCollector
+  if( this->ttl > this->currentLifeTime)
+    this->finalize();
 }