Changeset 6378 in orxonox.OLD

Timestamp:

Dec 31, 2005, 5:06:56 PM (18 years ago)

Author:

bknecht

Message:

Control: new helicopter control

Location:

branches/spaceshipcontrol/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (10 diffs)
• helicopter.h (modified) (1 diff)

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

@@ -117 +117 @@
   xMouse = yMouse = 0;
   mouseSensitivity = 0.001;
+  rotorspeed = 1;
+  tailrotorspeed = 0;
 
   cycle = 0.0;
@@ -258 +260 @@
 */
 void Helicopter::tick (float time)
-{
+{ 
+  tailrotorspeed += xMouse/20;
+  if (tailrotorspeed >= 0.07) tailrotorspeed = 0.07;
+  else if (tailrotorspeed <= -0.07) tailrotorspeed = -0.07;
+  
+  if (tailrotorspeed > 0.0008) tailrotorspeed -= 0.001;
+  else if (tailrotorspeed < -0.0008) tailrotorspeed += 0.001;
+  if (tailrotorspeed <= 0.001 && tailrotorspeed >= -0.001) tailrotorspeed = 0;
+  
   // spaceship controlled movement
   this->calculateVelocity(time);
 
-  Vector move = (velocity)*time;
+  Vector move = (velocity);
 
   // this is the air friction (necessary for a smooth control)
@@ -268 +278 @@
 
   //physics: Gravity
-  this->shiftCoor(Vector(0,-0.05,0));
+  this->shiftCoor(Vector(0,-1,0));
+  
+  this->shiftCoor(getAbsDirY()*rotorspeed);
 
   //hoover effect
@@ -281 +293 @@
 
   this->shiftCoor (move);
+  this->shiftDir(Quaternion(-M_PI/4*tailrotorspeed, Vector(0,1,0)));
 
   this->getWeaponManager()->tick(time);
@@ -302 +315 @@
    {
      //this->shiftCoor(this->getAbsDirX());
-
-     accel += this->getAbsDirX()*2;
+     //accel -= this->getAbsDirY();
      rot += Vector (0,0,1);
-     rotVal -= time/8;
+     rotVal -= time/5;
    }
    else
@@ -315 +327 @@
    {
      //this->shiftCoor((this->getAbsDirX())*-1);
-     accel -= this->getAbsDirX()*2;
+     //accel -= this->getAbsDirY();
      rot += Vector (0,0,1);
-     rotVal += time/8;
+     rotVal += time/5;
    }
    else
@@ -327 +339 @@
   {
     //this->shiftDir(Quaternion(time, Vector(0,1,0)));
-    accel -= this->getAbsDirZ()*2;
+    //accel -= this->getAbsDirY();
     //velocityDir.normalize();
     rot += Vector(1,0,0);
-    rotVal -= time/8;
+    rotVal -= time/5;
   }
   else
@@ -340 +352 @@
   {
     //this->shiftDir(Quaternion(-time, Vector(0,1,0)));
-    accel += this->getAbsDirZ()*2;
+    accel += this->getAbsDirY();
     //velocityDir.normalize();
     rot += Vector(1,0,0);
@@ -371 +383 @@
     //this->shiftDir(Quaternion(time, Vector(0,0,1)));
 
-    accel += (this->getAbsDirY())*3;
+    rotorspeed += 0.05;
+    if (rotorspeed >= 2) rotorspeed = 2;
     //velocityDir.normalize();
     //rot += Vector(0,0,1);
     //rotVal += .4;
   }
+  else
+  {
+    if(rotorspeed >= 1.05) rotorspeed -= 0.05;
+  }
+  
   if (this->bDescend )
   {
     //this->shiftDir(Quaternion(-time, Vector(0,0,1)));
 
-    accel -= (this->getAbsDirY())*3;
+    rotorspeed -= 0.05;
+    if (rotorspeed <= 0) rotorspeed = 0;
     //velocityDir.normalize();
     //rot += Vector(0,0,1);
     //rotVal -= .4;
   }
-
-  velocity += accel;
+  else
+  {
+    if(rotorspeed <= 0.05) rotorspeed += 0.05;
+  }
+
+  //velocity += accel;
   rot.normalize();
   this->shiftDir(Quaternion(rotVal, rot));
@@ -438 +461 @@
   else if( event.type == EV_MOUSE_MOTION)
   {
-    this->xMouse = event.xRel;
-    this->yMouse = event.yRel;
-    if(((this->getAbsDirX().y) <= .2 && yMouse > 0) || ((this->getAbsDirX().y) >= -.2 && yMouse < 0)) yMouse = 0;
-    this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
+    this->xMouse = event.xRel*mouseSensitivity;
+    this->yMouse = event.yRel*mouseSensitivity;
+    
+    //this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
   }
 }

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

@@ -67 +67 @@
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.
+    float                 rotorspeed;         //!< the speed of the rotor.
+    float                 tailrotorspeed;     //!< the relativ speed ot the tail rotor
 
     float                 airViscosity;