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

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/space_ships

Files:

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

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.