Changeset 5907 in orxonox.OLD

Timestamp:

Dec 3, 2005, 10:30:42 PM (19 years ago)

Author:

bknecht

Message:

spaceship updated

Location:

branches/spaceshipcontrol/src/world_entities/space_ships

Files:

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

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

@@ -115 +115 @@
   travelSpeed = 15.0;
   this->velocity = Vector(0.0,0.0,0.0);
+  this->velocityDir = Vector(1.0,0.0,0.0);
 
 //   GLGuiButton* button = new GLGuiPushButton();
@@ -280 +281 @@
   /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
   /* calculate the direction in which the craft is heading  */
-   Vector forwardDirection (1.0, 0.0, 0.0);
+   Vector forwardDirection (1.0, 0.0, 0.0); //x
    //direction = this->absDirection.apply (direction);
-   Vector rightDirection (0.0, 0.0, 1.0);
+   Vector rightDirection (0.0, 0.0, 0.1); //y
    //orthDirection = orthDirection.cross (direction);
-   Vector upDirection (0.0, 1.0, 0.0);
+   Vector upDirection (0.0, 1.0, 0.0); //z
+   
+
 
 
   if( this->bUp )
    {
-    //if(velocity.len() == 0)
-     accel += forwardDirection;
-    //else
-      //travelSpeed++;
+      if(travelSpeed <= 5000)  travelSpeed += 10;
    }
 
   if( this->bDown )
-   {
-    //if(velocity.len() == 0)
-     accel -= forwardDirection;
-   // else
-     //travelSpeed--;
+   {  
+     if(travelSpeed >= 10) travelSpeed -= 10;
    }
 
   if( this->bLeft /* > -this->getRelCoor().z*2*/)
   {
-    accel -= rightDirection;
+    velocityDir -= rightDirection;
+    velocityDir.normalize();
     //rot +=Vector(1,0,0);
     //rotVal -= .4;
@@ -311 +309 @@
   if( this->bRight /* > this->getRelCoor().z*2*/)
   {
-    accel += rightDirection;
+    velocityDir += rightDirection;
+    velocityDir.normalize();
     //rot += Vector(1,0,0);
     //rotVal += .4;
@@ -328 +327 @@
   }
 
-  velocity += accel*time;
+  velocity = velocityDir*(time*travelSpeed);
   //rot.normalize();
   //this->setRelDirSoft(Quaternion(rotVal, rot), 5);

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

@@ -57 +57 @@
 
     Vector                velocity;           //!< the velocity of the player.
+    Vector                velocityDir;        //!< the direction of the velocity of the spaceship
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.