Changeset 6159 in orxonox.OLD

Timestamp:

Dec 18, 2005, 3:17:29 PM (18 years ago)

Author:

snellen

Message:

guided_missile.cc in /world_entities/weapons updated

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• space_ships/helicopter.cc (modified) (2 diffs)
• weapons/guided_missile.cc (modified) (2 diffs)

branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc

@@ -247 +247 @@
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.1;
-  
+
 
   //hoover effect
@@ -281 +281 @@
    {
      //this->shiftCoor(this->getAbsDirX());
+
      accel += Vector(this->getAbsDirX().x,0,this->getAbsDirX().z).getNormalized()*2;
      if((this->getAbsDirX()).y > -.2)

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

@@ -150 +150 @@
 */
 void GuidedMissile::tick (float time)
-{ 
-
-   
+{
 
   if (target != NULL && target->getParent() != NullParent::getInstance())
@@ -160 +158 @@
     correctionVector = ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ));
 
-     if (velocity.dot(diffVector) != 0)
-
       if(velocity.dot(diffVector) > 0)
        velocity += (( correctionVector - velocity).getNormalized()) * agility;
+      else if (velocity.dot(diffVector) < 0)
+       velocity -= ( ( correctionVector - velocity).getNormalized()) * agility;
       else
-       velocity -= ( ( correctionVector - velocity).getNormalized()) * agility;
-
-     else
-      velocity += diffVector * agility;
+       velocity += diffVector * agility;
 
      this->setAbsDir(Quaternion(velocity, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)));