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

Timestamp:

Dec 4, 2005, 12:02:26 AM (19 years ago)

Author:

snellen

Message:

space_ship.cc updated

File:

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

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

@@ -286 +286 @@
    //orthDirection = orthDirection.cross (direction);
    Vector upDirection (0.0, 1.0, 0.0); //z
-   
+
 
 
@@ -292 +292 @@
   if( this->bUp )
    {
-      if(travelSpeed <= 5000)  travelSpeed += 10;
+     accel += (this->getAbsDirV()).getNormalized();
+      //if(travelSpeed <= 5000)  travelSpeed += 10;
    }
 
   if( this->bDown )
-   {  
-     if(travelSpeed >= 10) travelSpeed -= 10;
+   {
+     accel -=  (this->getAbsDirV()).getNormalized();
+     //if(travelSpeed >= 10) travelSpeed -= 10;
    }
 
   if( this->bLeft /* > -this->getRelCoor().z*2*/)
   {
-    velocityDir -= rightDirection;
-    velocityDir.normalize();
+    accel -= rightDirection;
+    //velocityDir.normalize();
     //rot +=Vector(1,0,0);
     //rotVal -= .4;
@@ -309 +311 @@
   if( this->bRight /* > this->getRelCoor().z*2*/)
   {
-    velocityDir += rightDirection;
-    velocityDir.normalize();
+    accel += rightDirection;
+    //velocityDir.normalize();
     //rot += Vector(1,0,0);
     //rotVal += .4;
@@ -317 +319 @@
   {
     accel += upDirection;
+    //velocityDir.normalize();
     //rot += Vector(0,0,1);
     //rotVal += .4;
@@ -323 +326 @@
   {
     accel -= upDirection;
+    //velocityDir.normalize();
     //rot += Vector(0,0,1);
     //rotVal -= .4;
   }
 
-  velocity = velocityDir*(time*travelSpeed);
+  velocity += accel*(time);
   //rot.normalize();
   //this->setRelDirSoft(Quaternion(rotVal, rot), 5);