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

Timestamp:

Jul 19, 2005, 12:20:58 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: remake of the Projectile and TestBullet

File:

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

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

@@ -36 +36 @@
 
   this->weapon = weapon;
-  this->flightDirection = NULL;
-  this->currentLifeTime = 0.0f;
-  this->ttl = 0.75f; /* sec */
-  this->speed = 2.0f;
+  this->lifeCycle = 0.0;
+  this->lifeSpan = 0.75f; /* sec */
 }
 
@@ -65 +63 @@
 void Projectile::setFlightDirection(Quaternion flightDirection)
 {
-  if( this->flightDirection == NULL)
-    this->flightDirection = new Vector();
   Vector v(1, 0, 0);
-  *this->flightDirection = flightDirection.apply(v);
-  this->flightDirection->normalize();
+  this->flightDirection = flightDirection.apply(v);
+  this->flightDirection.normalize();
 }
-
-
-/**
- *  this sets the time to life of the projectile
- * @param ttl in second
-
-   after this life time, the projectile will garbage collect itself
-*/
-void Projectile::setTTL(float ttl)
-{
-  this->ttl = ttl;
-}
-
-
-/**
- *  sets the speed of the projectile
-*/
-void Projectile::setSpeed(float speed)
-{
-  this->speed = speed * 3; /* fix speed settings */
-  PRINTF(4)("Projectile::setting speed to: %f\n", this->speed);
-}
-
 
 /**
@@ -101 +74 @@
 void Projectile::setVelocity(const Vector &velocity)
 {
-  this->offsetVel = this->velocity = velocity;
-  this->offsetVel.normalize();
-  this->velocity += (this->offsetVel * 50.0);
+  Vector offsetVel = this->velocity = velocity;
+  offsetVel.normalize();
+  this->velocity += (offsetVel * 50.0);
 }
 
@@ -116 +89 @@
   this->shiftCoor(v);
 
-  this->currentLifeTime += time;
-  if( this->ttl < this->currentLifeTime)
-    {
-      PRINTF(5)("FINALIZE==========================\n");
-      PRINTF(5)("current life time is: %f/%f\n", this->currentLifeTime, this->ttl);
-      PRINTF(5)("FINALIZE===========================\n");
-      this->finalize();
-      this->currentLifeTime = 0.0f;
-    }
+  this->lifeCycle += time/this->lifeSpan;
+  if( this->lifeCycle >= 1)
+  {
+    PRINTF(5)("FINALIZE==========================\n");
+    PRINTF(5)("current life cycle is: %f\n", this->lifeCycle);
+    PRINTF(5)("FINALIZE===========================\n");
+    this->finalize();
+  }
 }
-
-/**
- *  the projectile gets hit by another entity
- * @param the other entity
- * @param place where it is hit
-*/
-void Projectile::hit (WorldEntity* entity, Vector* place)
-{}