Changeset 391

Timestamp:

Dec 5, 2007, 2:41:14 PM (17 years ago)

Author:

mbiber

Message:

fixed a bug and adapted constants

Location:

code/branches/steering/src

Files:

• orxonox.cc (modified) (5 diffs)
• spaceship_steering.cc (modified) (3 diffs)

code/branches/steering/src/orxonox.cc

@@ -85 +85 @@
   : mKeyboard(keyboard), mMouse(mouse)
     {
-      speed = 250;
-      loop = 100;
+      speed = 2500;
       rotate = 10;
+      loop = 400;
       mouseX = 0;
       mouseY = 0;
@@ -93 +93 @@
       minMouseX = 0;
       moved = false;
-      steering->brakeRotate(rotate*10);
+      steering->brakeRotate(rotate*5);
       steering->brakeLoop(loop);
       mMouse->setEventCallback(this);
@@ -117 +117 @@
       else
         steering->loopLeft(0);
-
+/*
       if(moved) {
         if (mouseY<0)
@@ -130 +130 @@
       }
       else {
-        steering->rotateUp(0);
-        steering->rotateDown(0);
-        steering->rotateRight(0);
-        steering->rotateLeft(0);
-      }
-
-      steering->tick(evt.timeSinceLastFrame);
-//      scenemanager->spacehip->tick(evt.timesincelastframe);
-      if(mKeyboard->isKeyDown(OIS::KC_ESCAPE))
-        cout << "maximal MouseX: " << maxMouseX << "\tminMouseX: " << minMouseX << endl;
-      return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
-    }
-
-    bool mouseMoved(const OIS::MouseEvent &e)
-    {
-      mouseX = e.state.X.rel;
-      mouseY = e.state.Y.rel;
-      if(mouseX>maxMouseX) maxMouseX = mouseX;
-      if(mouseX<minMouseX) minMouseX = mouseX;
-      cout << "mouseX: " << mouseX << "\tmouseY: " << mouseY << endl;
-      moved = true;
-      return true;
-    }
+*/
+        if(moved) {
+          if (mouseY<0)
+            steering->rotateUp(-mouseY*rotate);
+          if (mouseY>0)
+            steering->rotateDown(mouseY*rotate);
+          if (mouseX>0)
+            steering->rotateRight(mouseX*rotate);
+          if (mouseX<0)
+            steering->rotateLeft(-mouseX*rotate);
+          moved = false;
+        }
+        else {
+          steering->rotateUp(0);
+          steering->rotateDown(0);
+          steering->rotateRight(0);
+          steering->rotateLeft(0);
+        }
+
+        steering->tick(evt.timeSinceLastFrame);
+        //      scenemanager->spacehip->tick(evt.timesincelastframe);
+        if(mKeyboard->isKeyDown(OIS::KC_ESCAPE))
+          cout << "maximal MouseX: " << maxMouseX << "\tminMouseX: " << minMouseX << endl;
+        return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
+        }
+
+        bool mouseMoved(const OIS::MouseEvent &e)
+        {
+          mouseX = e.state.X.rel;
+          mouseY = e.state.Y.rel;
+          if(mouseX>maxMouseX) maxMouseX = mouseX;
+          if(mouseX<minMouseX) minMouseX = mouseX;
+          cout << "mouseX: " << mouseX << "\tmouseY: " << mouseY << endl;
+          moved = true;
+          return true;
+}
 
     bool mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id) { return true; }
@@ -303 +316 @@
       node5->attachObject(head5);
 
-      steering = new SpaceshipSteering(500, 200, 200, 200);
+      steering = new SpaceshipSteering(5000, 50, 50, 150);
       steering->addNode(node);
 

code/branches/steering/src/spaceship_steering.cc

@@ -67 +67 @@
     if(speedRotateUpDown_ < 0)
       speedRotateUpDown_ += accelerationRotateUpDown_*time;
+    if(abs(speedRotateUpDown_)<accelerationRotateUpDown_*time)
+      speedRotateUpDown_ = 0;
   }
 
@@ -89 +91 @@
     if(speedRotateRightLeft_ < 0)
       speedRotateRightLeft_ += accelerationRotateRightLeft_*time;
+    if(abs(speedRotateRightLeft_)<accelerationRotateRightLeft_*time)
+      speedRotateRightLeft_ = 0;
   }
 
@@ -111 +115 @@
     if(speedLoopRightLeft_ < 0)
       speedLoopRightLeft_ += accelerationLoopRightLeft_*time;
+    if(abs(speedLoopRightLeft_)<accelerationLoopRightLeft_*time)
+      speedLoopRightLeft_ = 0;
   }