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

Timestamp:

Nov 24, 2005, 6:03:24 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the GuidedMissiles to the trunk, without the changed aiming_turret

Location:

trunk/src/world_entities/weapons

Files:

• guided_missile.cc (copied) (copied from branches/guidedmissile/src/world_entities/weapons/guided_missile.cc)
• guided_missile.h (copied) (copied from branches/guidedmissile/src/world_entities/weapons/guided_missile.h)
• projectile.cc (modified) (2 diffs)
• projectile.h (modified) (2 diffs)
• turret.cc (modified) (1 diff)

trunk/src/world_entities/weapons/projectile.cc

@@ -38 +38 @@
   this->lifeCycle = 0.0;
   this->lifeSpan = 1.0f; /* sec */
+  this->target = NULL;
 
   this->remove();
@@ -98 +99 @@
 }
 
+
+
+void Projectile::setTarget(PNode* target)
+{
+
+  if (this->target == NULL)
+     this->target = new PNode();
+  this->target->setParent(target);
+}
+
+
 /**
  * signal tick, time dependent things will be handled here

trunk/src/world_entities/weapons/projectile.h

@@ -31 +31 @@
     inline bool isChageable() { return this->bChargeable; };
 
+    void setTarget(PNode* target);
 
     /** @brief This is called, when the Projectile is Emitted */
@@ -54 +55 @@
 
     Vector                velocity;                  //!< velocity of the projectile.
+
+    PNode*                target;                    //!< A target for guided Weapons.
 };
 

trunk/src/world_entities/weapons/turret.cc

@@ -138 +138 @@
     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
+  
 
   pj->setParent(NullParent::getInstance());