Changeset 6132 in orxonox.OLD

Timestamp:

Dec 16, 2005, 4:43:33 PM (18 years ago)

Author:

snellen

Message:

guided_missile.cc in /world_entities/weapon updated

Location:

branches/spaceshipcontrol/src/world_entities/weapons

Files:

• guided_missile.cc (modified) (2 diffs)
• guided_missile.h (modified) (1 diff)

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

@@ -48 +48 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->lifeSpan = 5.0;
-  this->agility = 50;
-  this->maxVelocity = 300;
+  this->lifeSpan = 10.0;
+  this->agility = 4;
+  this->maxVelocity = 100;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
@@ -156 +156 @@
   if (target != NULL && target->getParent() != NullParent::getInstance())
    {
-    float speed = velocity.len();
-    Vector diffVector = ((target->getAbsCoor() - this->getAbsCoor()).getNormalized());
+    speed = velocity.len();
+    diffVector = ((target->getAbsCoor() - this->getAbsCoor()).getNormalized());
+    correctionVector = ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ));
 
      if (velocity.dot(diffVector) != 0)
 
       if(velocity.dot(diffVector) > 0)
-       velocity += ( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ) - velocity).getNormalized()) * agility;
+       velocity += (( correctionVector - velocity).getNormalized()) * agility;
       else
-       velocity -= ( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ) - velocity).getNormalized()) * agility;
+       velocity -= ( ( correctionVector - velocity).getNormalized()) * agility;
 
      else

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

@@ -41 +41 @@
     float                             agility;
     float                             maxVelocity;
+    float                             speed;
+    Vector                            diffVector ;
+    Vector                            correctionVector;
 
     WorldEntity* hitEntity; // FIXME TEMPORARY