Changeset 5913 in orxonox.OLD

Timestamp:

Dec 4, 2005, 2:50:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: AimingTurret with GuidedMissiles

Location:

branches/spaceshipcontrol/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (2 diffs)
• guided_missile.cc (modified) (2 diffs)

branches/spaceshipcontrol/src/world_entities/weapons/aiming_turret.cc

@@ -93 +93 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
-  this->setProjectileType(CL_ROCKET);
+  this->setProjectileType(CL_GUIDED_MISSILE);
 
 
@@ -142 +142 @@
     return;
 
-    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
+  pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
 
+  pj->setTarget(this->target->getParent());
   pj->setParent(NullParent::getInstance());
   pj->setAbsCoor(this->getEmissionPoint());

branches/spaceshipcontrol/src/world_entities/weapons/guided_missile.cc

@@ -49 +49 @@
   this->energyMax = 10;
   this->lifeSpan = 5;
-  this->agility = 5;
+  this->agility = 20;
   this->maxVelocity = 100;
 
@@ -151 +151 @@
 void GuidedMissile::tick (float time)
 {
+  printf("test\n");
   //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
   if (target != NULL && target->getParent() != NullParent::getInstance())