Changeset 6637 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jan 21, 2006, 1:27:29 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the SpaceShipControl branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6482:HEAD

minor conflicts, and added file hover.cc/h to the Makefile.

File:

• trunk/src/world_entities/space_ships/space_ship.cc (modified) (14 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -132 +132 @@
   bFire = false;
   xMouse = yMouse = 0;
+  yInvert = 1;
   mouseSensitivity = 0.001;
-  airViscosity = 1.0;
-  cycle = 0.0;
+  airViscosity = 0.01;
+  controlVelocityX = 25;
+  controlVelocityY = 150;
+  shipInertia = 0.5             ;
+//  cycle = 0.0;
 
   this->setMaxEnergy(100);
   this->setEnergy(80);
 
-  travelSpeed = 15.0;
-  this->velocity = Vector(0.0,0.0,0.0);
+  travelSpeed = 40.0;
+  acceleration = 3;
+  this->velocity = this->getAbsDirX()*travelSpeed;
   this->mouseDir = this->getAbsDir();
+  this->pitchDir = this->getAbsDir();
 
 //   GLGuiButton* button = new GLGuiPushButton();
@@ -155 +161 @@
 
   //add events to the eventlist
-  registerEvent(SDLK_w);
-  registerEvent(SDLK_s);
-  registerEvent(SDLK_a);
-  registerEvent(SDLK_d);
-  registerEvent(SDLK_q);
-  registerEvent(SDLK_e);
+  registerEvent(KeyMapper::PEV_UP);
+  registerEvent(KeyMapper::PEV_DOWN);
+  registerEvent(KeyMapper::PEV_LEFT);
+  registerEvent(KeyMapper::PEV_RIGHT);
+  //registerEvent(SDLK_q);
+  //registerEvent(SDLK_e);
   registerEvent(KeyMapper::PEV_FIRE1);
   registerEvent(KeyMapper::PEV_NEXT_WEAPON);
   registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
-  registerEvent(SDLK_PAGEUP);
-  registerEvent(SDLK_PAGEDOWN);
+  //registerEvent(SDLK_PAGEUP);
+  //registerEvent(SDLK_PAGEDOWN);
   registerEvent(EV_MOUSE_MOTION);
 
@@ -279 +285 @@
   this->weaponAction();
 
+  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;
+   }
+
+
 //   if( this != State::getPlayer()->getControllable())
 //     return;
@@ -285 +305 @@
   this->calculateVelocity(time);
 
-  Vector move = (velocity)*time;
-
+  Vector move = velocity*time;
+  
   //orient the velocity in the direction of the spaceship.
   travelSpeed = velocity.len();
@@ -293 +313 @@
 
   //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 +319 @@
 
   // this is the air friction (necessary for a smooth control)
-  if(velocity.len() != 0) velocity -= velocity*0.01;
-
+  if(travelSpeed >= 120) velocity -= velocity.getNormalized()*travelSpeed*travelSpeed*0.0001;
+  else if (travelSpeed <= 80) velocity -= velocity.getNormalized()*travelSpeed*0.001;
+  
+  //other physics (gravity)
+  if(travelSpeed < 120)
+  move += Vector(0,-1,0)*60*time + Vector(0,1,0)*travelSpeed/2*time;
+   
   //hoover effect
   //cycle += time;
@@ -306 +331 @@
 
   //readjust
-
-  /*
-    In the game "Yager" the spaceship gets readjusted when the player moves the mouse.
-    I (bknecht) go and check it out how they do it, we could probably use this also in Orxonox.
-  */
-  //if (xMouse != 0 && yMouse != 0)
-
   //if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
   //else if (this->getAbsDirZ().y < -0.1) this->shiftDir(Quaternion(-time*0.3, Vector(1,0,0)));
@@ -318 +336 @@
   //SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
 
-  this->shiftCoor (move);
+  this->shiftCoor(move);
 
 
@@ -337 +355 @@
   /* calculate the direction in which the craft is heading  */
 
-  Plane plane(Vector(0,1,0), Vector(0,0,0));
+  //Plane plane(Vector(0,1,0), Vector(0,0,0));
 
   if( this->bUp )
    {
      //this->shiftCoor(this->getAbsDirX());
-      accel += (this->getAbsDirX())*2;
-
-      /* Heli-Steuerung
-         accel += (this->getAbsDirX()*2;
-         if(
-      */
+      //accel += (this->getAbsDirX())*2;
+      accel += (this->getAbsDirX())*acceleration;
+
    }
 
@@ -353 +368 @@
    {
      //this->shiftCoor((this->getAbsDirX())*-1);
-     accel -= (this->getAbsDirX())*2;
+     //accel -= (this->getAbsDirX())*2;
+     accel -= (this->getAbsDirX())*0.5*acceleration;
    }
 
@@ -377 +393 @@
   if( this->bRollL /* > -this->getRelCoor().z*2*/)
   {
-    mouseDir *= Quaternion(-time, Vector(1,0,0));
+    mouseDir *= Quaternion(-time*2, Vector(1,0,0));
 //    accel -= rightDirection;
     //velocityDir.normalize();
@@ -385 +401 @@
   if( this->bRollR /* > this->getRelCoor().z*2*/)
   {
-    mouseDir *= Quaternion(time, Vector(1,0,0));
+    mouseDir *= Quaternion(time*2, Vector(1,0,0));
 
     //    accel += rightDirection;
@@ -432 +448 @@
 void SpaceShip::process(const Event &event)
 {
-
-
-  if( event.type == SDLK_a)
+  if( event.type == KeyMapper::PEV_LEFT)
       this->bRollL = event.bPressed;
-  else if( event.type == SDLK_d)
+  else if( event.type == KeyMapper::PEV_RIGHT)
       this->bRollR = event.bPressed;
   else if( event.type == KeyMapper::PEV_FIRE1)
@@ -446 +460 @@
   else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
     this->previousWeaponConfig();
-  else if( event.type == SDLK_w)
+  else if( event.type == KeyMapper::PEV_UP)
     this->bUp = event.bPressed; //this->shiftCoor(0,.1,0);
-  else if( event.type == SDLK_s)
+  else if( event.type == KeyMapper::PEV_DOWN)
     this->bDown = event.bPressed; //this->shiftCoor(0,-.1,0);
   else if( event.type == EV_MOUSE_MOTION)
   {
-    this->xMouse = event.xRel;
-    this->yMouse = event.yRel;
-    mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
-   // if( xMouse*xMouse + yMouse*yMouse < 0.9)
-     //this->setAbsDir(mouseDir);
+    this->xMouse += event.xRel;
+    this->yMouse += event.yRel;
   }
 }