Changeset 6131 in orxonox.OLD for branches/spaceshipcontrol/src

Timestamp:

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

Author:

snellen

Message:

guided_missile.cc in /world_entities/weapon updated

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (2 diffs)
• space_ships/space_ship.h (modified) (1 diff)
• weapons/guided_missile.cc (modified) (2 diffs)

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

@@ -269 +269 @@
   
   //orient the spaceship in direction of the mouse
-   Quaternion rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time));
+   rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)*3);
    if (this->getAbsDir().distance(rotQuat) > 0.001)  
-     this->setAbsDir( Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)));
+    this->setAbsDir( rotQuat);
    //this->setAbsDirSoft(mouseDir,5);
    
@@ -423 +423 @@
     this->yMouse = event.yRel;
     mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
-    
+    if( xMouse*xMouse + yMouse*yMouse < 0.9)
+     this->setAbsDir(mouseDir);
   }
 }

branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.h

@@ -66 +66 @@
     Vector                velocity;           //!< the velocity of the player.
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
+    Quaternion rotQuat;
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.

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

@@ -49 +49 @@
   this->energyMax = 10;
   this->lifeSpan = 5.0;
-  this->agility = 0.1;
-  this->maxVelocity = 100;
+  this->agility = 50;
+  this->maxVelocity = 300;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
@@ -150 +150 @@
 */
 void GuidedMissile::tick (float time)
-{
+{ 
+
+   
 
   if (target != NULL && target->getParent() != NullParent::getInstance())
    {
-     float speed = velocity.len();
-
-     velocity += (((target->getAbsCoor() - this->getAbsCoor()).getNormalized())*speed - velocity)*agility;
-     velocity *= (velocity.getNormalized())*speed;
-
-
-     velocity *= maxVelocity/speed;
+    float speed = velocity.len();
+    Vector diffVector = ((target->getAbsCoor() - this->getAbsCoor()).getNormalized());
+
+     if (velocity.dot(diffVector) != 0)
+
+      if(velocity.dot(diffVector) > 0)
+       velocity += ( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ) - velocity).getNormalized()) * agility;
+      else
+       velocity -= ( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ) - velocity).getNormalized()) * agility;
+
+     else
+      velocity += diffVector * agility;
 
      this->setAbsDir(Quaternion(velocity, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)));
    }
 
+  velocity *= maxVelocity/velocity.len();
   Vector v = this->velocity * (time);
   this->shiftCoor(v);