Changeset 5897 in orxonox.OLD for branches/spaceshipcontrol/src

Timestamp:

Dec 3, 2005, 5:34:09 PM (19 years ago)

Author:

snellen

Message:

space_ship.cc updated

File:

• branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) (3 diffs)

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

@@ -108 +108 @@
 
   PRINTF(4)("SPACESHIP INIT\n");
-  travelSpeed = 100.0;
+
+
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;
-  acceleration = 50.0;
+
+  travelSpeed = 15.0;
+  this->velocity = Vector(0.0,0.0,0.0);
 
 //   GLGuiButton* button = new GLGuiPushButton();
@@ -253 +256 @@
   Vector move = (velocity)*time;
 
+  if( velocity.len() != 0 )
+   {
+     this->setAbsDir(Quaternion(velocity, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)));
+   }
+
   this->shiftCoor (move);
 
@@ -267 +275 @@
 {
   Vector accel(0.0, 0.0, 0.0);
-  Vector rot(0.0, 0.0, 0.0);
-  float rotVal = 0.0;
+  //Vector rot(0.0, 0.0, 0.0);
+  //float rotVal = 0.0;
   /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
   /* calculate the direction in which the craft is heading  */
   Vector direction (1.0, 0.0, 0.0);
   //direction = this->absDirection.apply (direction);
-  Vector orthDirection (0.0, 0.0, 1.0);
+   Vector orthDirection (0.0, 0.0, 1.0);
   //orthDirection = orthDirection.cross (direction);
 
-  if( this->bUp)
-    accel += direction;
-  if( this->bDown)
-    accel -= direction;
+
+  if( this->bUp )
+    travelSpeed++;
+  if( this->bDown )
+    travelSpeed--;
+
 
   if( this->bLeft /* > -this->getRelCoor().z*2*/)
   {
     accel -=(orthDirection);
-    rot +=Vector(1,0,0);
-    rotVal -= .4;
+    //rot +=Vector(1,0,0);
+    //rotVal -= .4;
   }
   if( this->bRight /* > this->getRelCoor().z*2*/)
   {
     accel += orthDirection;
-    rot += Vector(1,0,0);
-    rotVal += .4;
+    //rot += Vector(1,0,0);
+    //rotVal += .4;
   }
   if (this->bAscend )
   {
     accel += Vector(0,1,0);
-    rot += Vector(0,0,1);
-    rotVal += .4;
+    //rot += Vector(0,0,1);
+    //rotVal += .4;
   }
   if (this->bDescend )
   {
     accel -= Vector(0,1,0);
-    rot += Vector(0,0,1);
-    rotVal -= .4;
+    //rot += Vector(0,0,1);
+    //rotVal -= .4;
   }
 
   velocity += accel*time;
-  rot.normalize();
-  this->setRelDirSoft(Quaternion(rotVal, rot), 5);
+  velocity = (velocity.getNormalized() ) *travelSpeed;
+  //rot.normalize();
+  //this->setRelDirSoft(Quaternion(rotVal, rot), 5);
 }