Changeset 6584 in orxonox.OLD

Timestamp:

Jan 18, 2006, 4:32:47 PM (18 years ago)

Author:

snellen

Message:

space_ship.cc updated

Location:

branches/spaceshipcontrol/src/world_entities/space_ships

Files:

• helicopter.h (modified) (1 diff)
• space_ship.cc (modified) (5 diffs)
• space_ship.h (modified) (1 diff)

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

@@ -57 +57 @@
     float                 xMouse;             //!< mouse moved in x-Direction
     float                 yMouse;             //!< mouse moved in y-Direction
+    int                   yInvert;
     float                 mouseSensitivity;   //!< the mouse sensitivity
     //float                 cycle;              //!< hovercycle

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

@@ -128 +128 @@
   bFire = false;
   xMouse = yMouse = 0;
+  yInvert = 1;
   mouseSensitivity = 0.001;
-  airViscosity = 0.95;
-  controlVelocityX = 20;
+  airViscosity = 0.01;
+  controlVelocityX = 25;
   controlVelocityY = 150;
-  shipInertia = 3.0             ;
+  shipInertia = 0.5             ;
 //  cycle = 0.0;
 
@@ -276 +277 @@
 void SpaceShip::tick (float time)
 {
+  if( xMouse != 0 || yMouse != 0)
+   {
+    if (xMouse > controlVelocityX) xMouse = controlVelocityX;
+    else if (xMouse < -controlVelocityX) xMouse = -controlVelocityX;
+    if (yMouse > controlVelocityY) yMouse = controlVelocityY;
+    else if (yMouse < -controlVelocityY) yMouse = -controlVelocityY;
+    
+    pitchDir = (Quaternion(xMouse*mouseSensitivity*0.5, Vector(1,0,0)));
+    
+    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;
+   }
 
   // spaceship controlled movement
@@ -338 +351 @@
      //this->shiftCoor(this->getAbsDirX());
       //accel += (this->getAbsDirX())*2;
-      
       accel += (this->getAbsDirX())*acceleration;
 
@@ -426 +438 @@
 void SpaceShip::process(const Event &event)
 {
-
-
   if( event.type == KeyMapper::PEV_LEFT)
       this->bRollL = event.bPressed;
@@ -446 +456 @@
   else if( event.type == EV_MOUSE_MOTION)
   {
-    this->xMouse = event.xRel;
-    this->yMouse = event.yRel;
-    
-    
-    
-    if (xMouse > controlVelocityX) xMouse = controlVelocityX;
-    else if (xMouse < -controlVelocityX) xMouse = -controlVelocityX;
-    if (yMouse > controlVelocityY) yMouse = controlVelocityY;
-    else if (yMouse < -controlVelocityY) yMouse = -controlVelocityY;
-    
-    pitchDir = (Quaternion(xMouse*mouseSensitivity*0.5, Vector(1,0,0)));
-    
-    mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1))*pitchDir);
-   // if( xMouse*xMouse + yMouse*yMouse < 0.9)
-     //this->setAbsDir(mouseDir);
+    this->xMouse += event.xRel;
+    this->yMouse += event.yRel;
   }
 }

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

@@ -66 +66 @@
     float                 yMouse;             //!< mouse moved in y-Direction
     float                 mouseSensitivity;   //!< the mouse sensitivity
+    int                   yInvert;
     int                   controlVelocityX;
     int                   controlVelocityY;