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

Timestamp:

Mar 23, 2005, 5:43:07 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented garbage collector, is not yet collecting, i have to update the list.h first.

Location:

orxonox/trunk/src/world_entities

Files:

• projectile.cc (modified) (4 diffs)
• projectile.h (modified) (2 diffs)
• test_gun.cc (modified) (1 diff)
• weapon.cc (modified) (1 diff)
• weapon.h (modified) (1 diff)

orxonox/trunk/src/world_entities/projectile.cc

@@ -20 +20 @@
 
 #include "world_entity.h"
+#include "null_parent.h"
 #include "objModel.h"
 #include "primitive.h"
@@ -35 +36 @@
   this->projectileModel = new Primitive(P_SPHERE);
   this->flightDirection = NULL;
+  this->currentLifeTime = 0.0f;
+  this->ttl = 1.0f;
   this->speed = 1.1f;
 }
@@ -69 +72 @@
 
 /**
+   \brief 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;
+}
+
+
+/**
    \brief signal tick, time dependent things will be handled here
    \param time since last tick
@@ -74 +89 @@
 void Projectile::tick (float time) 
 {
-  *this->flightDirection = *this->flightDirection * speed;
-  this->shiftCoor(this->flightDirection);
+  this->currentLifeTime += time;
+  if( this->ttl < this->currentLifeTime)
+    {
+      *this->flightDirection = *this->flightDirection * speed;
+      this->shiftCoor(this->flightDirection);
+      return;
+    }
+  this->finalize();
+  //NullParent* np = NullParent::getInstance();
+  /* garbage colelction */
+  // \fix: there is no gc in this class, its all been done by GarbageCollector
 }
 

orxonox/trunk/src/world_entities/projectile.h

@@ -21 +21 @@
 
   void setFlightDirection(Quaternion* flightDirection);
+  void setSpeed(float speed);
+  void setTTL(float ttl);
 
   virtual void hit (WorldEntity* weapon, Vector* loc);
@@ -32 +34 @@
   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)
+  float ttl;                           //!< time to life, after this time, the projectile will garbage collect itself
   Vector* flightDirection;             //!< direction in which the shoot flights
+  
 };
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -93 +93 @@
   pj->setFlightDirection(q);
 
+  printf("TestGun::current speed is: %f", this->getSpeed());
+
   this->worldEntities->add(pj);
 }

orxonox/trunk/src/world_entities/weapon.cc

@@ -183 +183 @@
 */
 void Weapon::fire()
-{
-  
-}
+{}
 
 

orxonox/trunk/src/world_entities/weapon.h

@@ -61 +61 @@
   bool hasWeaponIdleTimeElapsed(void);
 
-  virtual void fire(void);
+  virtual void fire(void) = 0;
   virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void destroy(void);