Changeset 317 for code/branches/steering/src/spaceship_steering.cc

Timestamp:

Nov 28, 2007, 3:00:45 PM (16 years ago)

Author:

mbiber

Message:

update steering

File:

• code/branches/steering/src/spaceship_steering.cc (modified) (8 diffs)

code/branches/steering/src/spaceship_steering.cc

@@ -7 +7 @@
 maxSpeedLoopRightLeft) {
   moveForward_ = 0;
-  brake_ = 0;
   rotateUp_ = 0;
   rotateDown_ = 0;
@@ -14 +13 @@
   loopRight_ = 0;
   loopLeft_ = 0;
+  brakeForward_ = 0;
+  brakeRotate_ = 0;
+  brakeLoop_ = 0;
   speedForward_ = 0;
   speedRotateUpDown_ = 0;
@@ -33 +35 @@
     accelerationForward_ = moveForward_;
     if(speedForward_ < maxSpeedForward_)
-      speedForward_ += accelerationForward_;
+      speedForward_ += accelerationForward_*time;
     if(speedForward_ > maxSpeedForward_)
       speedForward_ = maxSpeedForward_;
   }
-  else {
-    accelerationForward_ = brake_;
+  if(moveForward_ <= 0) {
+    accelerationForward_ = brakeForward_;
     if(speedForward_ > 0)
-      speedForward_ -= accelerationForward_;
+      speedForward_ -= accelerationForward_*time;
     if(speedForward_ < 0)
       speedForward_ = 0;
@@ -48 +50 @@
     accelerationRotateUpDown_ = rotateUp_;
     if(speedRotateUpDown_ < maxSpeedRotateUpDown_)
-      speedRotateUpDown_ += accelerationRotateUpDown_;
+      speedRotateUpDown_ += accelerationRotateUpDown_*time;
     if(speedRotateUpDown_ > maxSpeedRotateUpDown_)
       speedRotateUpDown_ = maxSpeedRotateUpDown_;
   }
-  else if(rotateDown_ > 0) {
+  if(rotateDown_ > 0) {
     accelerationRotateUpDown_ = rotateDown_;
     if(speedRotateUpDown_ > -maxSpeedRotateUpDown_)
-      speedRotateUpDown_ -= accelerationRotateUpDown_;
+      speedRotateUpDown_ -= accelerationRotateUpDown_*time;
     if(speedRotateUpDown_ < -maxSpeedRotateUpDown_)
       speedRotateUpDown_ = -maxSpeedRotateUpDown_;
   }
-  else {
+  if(rotateUp_ == 0 && rotateDown_ == 0) {
+    accelerationRotateUpDown_ = brakeRotate_;
     if(speedRotateUpDown_ > 0)
-      speedRotateUpDown_ -= accelerationRotateUpDown_;
+      speedRotateUpDown_ -= accelerationRotateUpDown_*time;
     if(speedRotateUpDown_ < 0)
-      speedRotateUpDown_ += accelerationRotateUpDown_;
+      speedRotateUpDown_ += accelerationRotateUpDown_*time;
   }
 
@@ -69 +72 @@
     accelerationRotateRightLeft_ = rotateRight_;
     if(speedRotateRightLeft_ > -maxSpeedRotateRightLeft_)
-      speedRotateRightLeft_ -= accelerationRotateRightLeft_;
+      speedRotateRightLeft_ -= accelerationRotateRightLeft_*time;
     if(speedRotateRightLeft_ < -maxSpeedRotateRightLeft_)
       speedRotateRightLeft_ = -maxSpeedRotateRightLeft_;
   }
-  else if(rotateLeft_ > 0) {
+  if(rotateLeft_ > 0) {
     accelerationRotateRightLeft_ = rotateLeft_;
     if(speedRotateRightLeft_ < maxSpeedRotateRightLeft_)
-      speedRotateRightLeft_ += accelerationRotateRightLeft_;
+      speedRotateRightLeft_ += accelerationRotateRightLeft_*time;
     if(speedRotateRightLeft_ > maxSpeedRotateRightLeft_)
       speedRotateRightLeft_ = maxSpeedRotateRightLeft_;
   }
-  else {
+  if(rotateRight_ == 0 && rotateLeft_ == 0) {
+    accelerationRotateRightLeft_ = brakeRotate_;
     if(speedRotateRightLeft_ > 0)
-      speedRotateRightLeft_ -= accelerationRotateRightLeft_;
+      speedRotateRightLeft_ -= accelerationRotateRightLeft_*time;
     if(speedRotateRightLeft_ < 0)
-      speedRotateRightLeft_ += accelerationRotateRightLeft_;
+      speedRotateRightLeft_ += accelerationRotateRightLeft_*time;
   }
 
@@ -90 +94 @@
     accelerationLoopRightLeft_ = loopRight_;
     if(speedLoopRightLeft_ < maxSpeedLoopRightLeft_)
-      speedLoopRightLeft_ += accelerationLoopRightLeft_;
+      speedLoopRightLeft_ += accelerationLoopRightLeft_*time;
     if(speedLoopRightLeft_ > maxSpeedLoopRightLeft_)
       speedLoopRightLeft_ = maxSpeedLoopRightLeft_;
   }
-  else if(loopLeft_ > 0) {
+  if(loopLeft_ > 0) {
     accelerationLoopRightLeft_ = loopLeft_;
     if(speedLoopRightLeft_ > -maxSpeedLoopRightLeft_)
-      speedLoopRightLeft_ -= accelerationLoopRightLeft_;
+      speedLoopRightLeft_ -= accelerationLoopRightLeft_*time;
     if(speedLoopRightLeft_ < -maxSpeedLoopRightLeft_)
       speedLoopRightLeft_ = -maxSpeedLoopRightLeft_;
   }
-  else {
+  if(loopLeft_ == 0 && loopRight_ == 0) {
+    accelerationLoopRightLeft_ = brakeLoop_;
     if(speedLoopRightLeft_ > 0)
-      speedLoopRightLeft_ -= accelerationLoopRightLeft_;
+      speedLoopRightLeft_ -= accelerationLoopRightLeft_*time;
     if(speedLoopRightLeft_ < 0)
-      speedLoopRightLeft_ += accelerationLoopRightLeft_;
+      speedLoopRightLeft_ += accelerationLoopRightLeft_*time;
   }
 
@@ -123 +128 @@
 void SpaceshipSteering::moveForward(float moveForward) {
   moveForward_ = moveForward;
-}
-
-void SpaceshipSteering::brake(float brake) {
-  brake_ = brake;
 }
 
@@ -153 +154 @@
 }
 
+void SpaceshipSteering::brakeForward(float brakeForward) {
+  brakeForward_ = brakeForward;
+}
+
+void SpaceshipSteering::brakeRotate(float brakeRotate) {
+  brakeRotate_ = brakeRotate;
+}
+
+void SpaceshipSteering::brakeLoop(float brakeLoop) {
+  brakeLoop_ = brakeLoop;
+}
+
 void SpaceshipSteering::maxSpeedForward(float maxSpeedForward) {
   maxSpeedForward_ = maxSpeedForward;