Changeset 5893 in orxonox.OLD

Timestamp:

Dec 3, 2005, 4:43:36 PM (19 years ago)

Author:

snellen

Message:

space_ship.cc 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

@@ -118 +118 @@
 //   button->setBindNode(this);
 
+  //add events to the eventlist
   registerEvent(KeyMapper::PEV_UP);
   registerEvent(KeyMapper::PEV_DOWN);
@@ -248 +249 @@
 {
   // spaceship controlled movement
-  this->move(time);
+  this->calculateVelocity(time);
+
+  Vector move = (velocity)*time;
+
+  this->shiftCoor (move);
 
   this->getWeaponManager()->tick(time);
@@ -256 +261 @@
 
 /**
- *  action if spaceship moves
+ *  calculate the velocity
  * @param time the timeslice since the last frame
 */
-void SpaceShip::move (float time)
+void SpaceShip::calculateVelocity (float time)
 {
   Vector accel(0.0, 0.0, 0.0);
@@ -301 +306 @@
   }
 
-  Vector move = accel * time *acceleration;
-
-/*  if (accel.z < 0)
-    this->setRelDirSoft(Quaternion(-.4, accel), 5);
-  else if (accel.z > 0)
-    this->setRelDirSoft(Quaternion(.4, accel), 5);
-  else*/
+  velocity += accel*time;
   rot.normalize();
   this->setRelDirSoft(Quaternion(rotVal, rot), 5);
-  this->shiftCoor (move);
 }
 

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

@@ -42 +42 @@
   private:
 
-    void move(float time);
+    void calculateVelocity(float time);
     void weaponAction();