Changeset 6544 in orxonox.OLD

Timestamp:

Jan 18, 2006, 2:10:57 PM (18 years ago)

Author:

snellen

Message:

space_ship.cc updated

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• projectiles/guided_missile.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (4 diffs)
• space_ships/space_ship.h (modified) (1 diff)

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

@@ -44 +44 @@
   this->setMaxEnergy(10);
   this->lifeSpan = 10.0;
-  this->agility = 500;
+  this->agility = 5;
   this->maxVelocity = 75;
 

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

@@ -130 +130 @@
   mouseSensitivity = 0.001;
   airViscosity = 0.95;
+  controlVelocityX = 5;
+  controlVelocityY = 150;
+  shipInertia = 3.0             ;
 //  cycle = 0.0;
 
@@ -285 +288 @@
 
   //orient the spaceship in direction of the mouse
-   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, fabsf(time)*3.0);
+   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, fabsf(time)*shipInertia);
    if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
     this->setAbsDir( rotQuat);
@@ -299 +302 @@
   if((this->getAbsDirY()).y*travelSpeed < 120 && (this->getAbsDirY()).y<0)
   move += Vector(0,-1,0)*60*time - Vector(0,1,0)*(this->getAbsDirY()).y*travelSpeed/2*time;
-
+   
   //hoover effect
   //cycle += time;
@@ -448 +451 @@
     this->yMouse = event.yRel;
     
-    int controlVelocity = 150;
     
-    if (xMouse > controlVelocity) xMouse = controlVelocity;
-    else if (xMouse < -controlVelocity) xMouse = -controlVelocity;
-    if (yMouse > controlVelocity) yMouse = controlVelocity;
-    else if (yMouse < -controlVelocity) yMouse = -controlVelocity;
+    
+    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.01, Vector(1,0,0)));

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                   controlVelocityX;
+    int                   controlVelocityY;
 //    float                 cycle;              //!< hovercycle
 
     Vector                velocity;           //!< the velocity of the player.
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
+    float                 shipInertia;        //!< the inertia of the ship(how fast the ship reacts to a mouse input)
     Quaternion            rotQuat;
     Quaternion            pitchDir;