Changeset 6052 in orxonox.OLD for branches/spaceshipcontrol

Timestamp:

Dec 11, 2005, 6:00:58 PM (19 years ago)

Author:

bknecht

Message:

acceleration and brake/backward acceleration does now work

File:

• branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc (modified) (7 diffs)

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

@@ -246 +246 @@
 
   //orient the velocity in the direction of the spaceship.
-  travelSpeed = velocity.len();
-  velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
-  velocity = (velocity.getNormalized())*travelSpeed;
+  //travelSpeed = velocity.len();
+  //velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
+  //velocity = (velocity.getNormalized())*travelSpeed;
 
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.01;
+  
+  if(this->getAbsDirX().y < -0.2) this->shiftDir(Quaternion(time, Vector(0,0,1)));
+  else if(this->getAbsDirX().y > 0.2) this->shiftDir(Quaternion(-time, Vector(0,0,1)));
 
   //hoover effect
@@ -285 +288 @@
    {
      //this->shiftCoor(this->getAbsDirX());
-      accel += (this->getAbsDirX())*2;
-      rot += Vector (0,0,1);
-      rotVal -= .4;
+     accel += Vector(this->getAbsDirX().x,0,this->getAbsDirX().z).getNormalized()*2;
+     rot += Vector (0,0,1);
+     rotVal -= .004;
    }
 
@@ -293 +296 @@
    {
      //this->shiftCoor((this->getAbsDirX())*-1);
-     accel -= (this->getAbsDirX())*2;
+     accel -= Vector(this->getAbsDirX().x,0,this->getAbsDirX().z).getNormalized()*2;
      rot += Vector (0,0,1);
-     rotVal += .4;
+     rotVal += .004;
    }
 
@@ -304 +307 @@
     //velocityDir.normalize();
     rot +=Vector(1,0,0);
-    rotVal -= .2;
+    rotVal -= .002;
   }
   if( this->bRight /* > this->getRelCoor().z*2*/)
@@ -313 +316 @@
     //velocityDir.normalize();
     rot += Vector(1,0,0);
-    rotVal += .2;
+    rotVal += .002;
   }
 
@@ -354 +357 @@
   velocity += accel;
   rot.normalize();
-  this->setRelDirSoft(Quaternion(rotVal, rot), 5);
+  this->shiftDir(Quaternion(rotVal, rot));
 }
 
@@ -406 +409 @@
     this->xMouse = event.xRel;
     this->yMouse = event.yRel;
-    this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
+    //this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
   }
 }