Changeset 7138 in orxonox.OLD

Timestamp:

Feb 14, 2006, 3:41:50 PM (18 years ago)

Author:

snellen

Message:

space-ship control modified

Location:

branches/control/src/world_entities/space_ships

Files:

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

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

@@ -144 +144 @@
   xMouse = yMouse = 0;
   yInvert = 1;
-  mouseSensitivity = 0.001;
-  airViscosity = 0.9;
+  mouseSensitivity = 0.01;
+  airViscosity = 0.8;
   controlVelocityX = 25;
   controlVelocityY = 150;
-  shipInertia = 1.5;
+  shipInertia = M_PI_4;
+  maxRudderAmplitude = 0.6 ;
 //  cycle = 0.0;
 
@@ -176 +177 @@
   registerEvent(KeyMapper::PEV_LEFT);
   registerEvent(KeyMapper::PEV_RIGHT);
-  //registerEvent(SDLK_q);
+
   //registerEvent(SDLK_e);
+  //registerEvent(SDLK_e);
+  //registerEvent(SDLK_e);
+  //registerEvent(SDLK_e);
+
   registerEvent(KeyMapper::PEV_FIRE1);
   registerEvent(KeyMapper::PEV_NEXT_WEAPON);
@@ -334 +339 @@
 {
   Playable::tick(time);
-
-  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
+ 
+  if( ( xMouse != 0 
+        || yMouse != 0 )
+        && this->getOwner() == this->getHostID()  )
    {
     if (xMouse > controlVelocityX) xMouse = controlVelocityX;
@@ -344 +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);
+
     xMouse = yMouse = 0;
    }
 
+ 
 
 //   if( this != State::getPlayer()->getControllable())
@@ -367 +377 @@
 
   //orient the spaceship in direction of the mouse
-   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, 0.5);//fabsf(time)*shipInertia);
+   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir,fabsf(time)*shipInertia);
    if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
     this->setAbsDir( rotQuat);
@@ -451 +461 @@
   if( this->bRollL /* > -this->getRelCoor().z*2*/)
   {
+    if( fabsf(mouseDir.distance(this->getAbsDir())) < maxRudderAmplitude )//prevent 'jumping'
     mouseDir *= Quaternion(-time*2, Vector(1,0,0));
 //    accel -= rightDirection;
@@ -459 +470 @@
   if( this->bRollR /* > this->getRelCoor().z*2*/)
   {
+    if( fabsf(mouseDir.distance(this->getAbsDir())) < maxRudderAmplitude )//prevent 'jumping'
     mouseDir *= Quaternion(time*2, Vector(1,0,0));
 

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

@@ -78 +78 @@
     Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly
     float                 shipInertia;        //!< the inertia of the ship(how fast the ship reacts to a mouse input)
+    float                 maxRudderAmplitude; //!< the higher this value the biger the max rudderamplitude [0...2PI]
     Quaternion            rotQuat;
     Quaternion            pitchDir;