Changeset 6509 in orxonox.OLD

Timestamp:

Jan 16, 2006, 1:09:26 PM (18 years ago)

Author:

bknecht

Message:

Control: Major changes in Spaceshipcontrol. Go check it out! It's not perfect, though.

Location:

branches/spaceshipcontrol/src/world_entities/space_ships

Files:

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

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

@@ -129 +129 @@
   xMouse = yMouse = 0;
   mouseSensitivity = 0.001;
-  airViscosity = 1.0;
-  cycle = 0.0;
+  airViscosity = 0.95;
+//  cycle = 0.0;
 
   this->setMaxEnergy(100);
   this->setEnergy(80);
 
-  travelSpeed = 15.0;
-  acceleration = 5.0;
+  travelSpeed = 40.0;
+  acceleration = 3;
   this->velocity = this->getAbsDirX()*travelSpeed;
   this->mouseDir = this->getAbsDir();
+  this->pitchDir = this->getAbsDir();
 
 //   GLGuiButton* button = new GLGuiPushButton();
@@ -276 +277 @@
   this->calculateVelocity(time);
 
-  Vector move = velocity.getNormalized()*travelSpeed;
-
+  Vector move = velocity*time;
+  
   //orient the velocity in the direction of the spaceship.
   travelSpeed = velocity.len();
@@ -290 +291 @@
 
   // this is the air friction (necessary for a smooth control)
-  if(velocity.len() != 0) velocity -= velocity*0.01;
+  if(travelSpeed != 0) velocity -= velocity.getNormalized()*travelSpeed*travelSpeed*0.0005;
+  
+  //other physics (gravity)
+  if((this->getAbsDirY()).y*travelSpeed < 60 && (this->getAbsDirY()).y>0)
+  move += Vector(0,-1,0)*120*time + Vector(0,2,0)*(this->getAbsDirY()).y*travelSpeed*time;
+  if((this->getAbsDirY()).y*travelSpeed < 60 && (this->getAbsDirY()).y<0)
+  move += Vector(0,-1,0)*120*time - Vector(0,2,0)*(this->getAbsDirY()).y*travelSpeed*time;
 
   //hoover effect
@@ -302 +309 @@
   //SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
 
-  this->shiftCoor (move);
+  this->shiftCoor(move);
 
   this->getWeaponManager()->tick(time);
@@ -315 +322 @@
 void SpaceShip::calculateVelocity (float time)
 {
-  //Vector accel(0.0, 0.0, 0.0);
+  Vector accel(0.0, 0.0, 0.0);
   /*
   Vector rot(0.0, 0.0, 0.0); // wird benötigt für Helicopter
@@ -323 +330 @@
   /* 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 )
@@ -329 +336 @@
      //this->shiftCoor(this->getAbsDirX());
       //accel += (this->getAbsDirX())*2;
-      if(travelSpeed < 30) travelSpeed += acceleration*time;
-
-      /* Heli-Steuerung
-         accel += (this->getAbsDirX()*2;
-         if(
-      */
+      
+      accel += (this->getAbsDirX())*3*acceleration;
+
    }
 
@@ -341 +345 @@
      //this->shiftCoor((this->getAbsDirX())*-1);
      //accel -= (this->getAbsDirX())*2;
-     if(travelSpeed >= 0) travelSpeed -= acceleration*time;
+     accel -= (this->getAbsDirX())*3*acceleration;
    }
 
@@ -399 +403 @@
   }
 
-  //velocity += accel;
+  velocity += accel;
   //rot.normalize();
   //this->setRelDirSoft(Quaternion(rotVal, rot), 5);
@@ -442 +446 @@
     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)));
+    
+    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;
+    
+    //pitchDir *= (Quaternion(xMouse*mouseSensitivity*0.01, 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);

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

@@ -66 +66 @@
     float                 yMouse;             //!< mouse moved in y-Direction
     float                 mouseSensitivity;   //!< the mouse sensitivity
-    float                 cycle;              //!< hovercycle
+//    float                 cycle;              //!< hovercycle
 
     Vector                velocity;           //!< the velocity of the player.
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
     Quaternion            rotQuat;
+    Quaternion            pitchDir;
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.