Changeset 7146 in orxonox.OLD

Timestamp:

Feb 14, 2006, 8:04:01 PM (18 years ago)

Author:

snellen

Message:

new condition to prevent jumping

File:

• branches/control/src/world_entities/space_ships/space_ship.cc (modified) (2 diffs)

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

@@ -339 +339 @@
 {
   Playable::tick(time);
- 
-  if( ( xMouse != 0 
+
+  if( ( xMouse != 0
         || yMouse != 0 )
-        && this->getOwner() == this->getHostID()  )
+        && this->getOwner() == this->getHostID()  )
    {
     if (xMouse > controlVelocityX) xMouse = controlVelocityX;
@@ -351 +351 @@
     pitchDir = (Quaternion(xMouse*mouseSensitivity*0.5, Vector(1,0,0)));
 
-    if( fabsf(mouseDir.distance(this->getAbsDir())) < maxRudderAmplitude )//prevent 'jumping'
-    {
-     
-     mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity*yInvert, Vector(0,0,1))*pitchDir);
-    }
+    Quaternion correctionQuat = (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity*yInvert, Vector(0,0,1))*pitchDir);
+    if( fabsf((mouseDir*correctionQuat).distance(this->getAbsDir())) < maxRudderAmplitude )//prevent 'jumping'
+     {
+       mouseDir *= correctionQuat;
+     }
+    else
+     {
+       mouseDir = quatSlerp(mouseDir,mouseDir*correctionQuat,fabsf(time));
+     }
     xMouse = yMouse = 0;
    }
 
- 
+
 
 //   if( this != State::getPlayer()->getControllable())