Changeset 9077 in orxonox.OLD

Timestamp:

Jul 4, 2006, 12:28:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/presentation: The Playmode is reset correctly, smoothly, and a real fealing of a Arcade game comes up

File:

• branches/presentation/src/world_entities/space_ships/spacecraft_2d.cc (modified) (2 diffs)

branches/presentation/src/world_entities/space_ships/spacecraft_2d.cc

@@ -371 +371 @@
         this->velocity += (accelerationDir - damping)* dt;
         this->shiftCoor (this->velocity * dt);
-
-        // limit the maximum rotation speed.
-        if (this->rotation != 0.0f)
-        {
-          float maxRot = 10.0 * dt;
-          if (unlikely(this->rotation > maxRot)) this->rotation = maxRot;
-          if (unlikely(this->rotation < -maxRot)) this->rotation = -maxRot;
-          this->direction *= Quaternion(-M_PI/4.0*this->rotation, Vector(0,1,0));
-
-          this->rotation = 0.0f;
-        }
-
-        this->setRelDirSoft(this->direction, 5);
+        this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 1.0f);
       }
       break;
@@ -415 +403 @@
   else if( event.type == EV_MOUSE_MOTION)
   {
-    float xMouse, yMouse;
-    xMouse = event.xRel*mouseSensitivity;
-    yMouse = event.yRel*mouseSensitivity;
-
-    // rotate the Player around the y-axis
-    this->rotation += xMouse;
-
-    this->cameraLook += yMouse;
-    // rotate the Camera around the z-axis
-    if (cameraLook > M_PI_4)
-      cameraLook = M_PI_4;
-    else if (cameraLook < -M_PI_4)
-      cameraLook = -M_PI_4;
-    //this->cameraNode.setRelDirSoft(this->direction,10);
-  }
-}
+
+
+
+    if (this->getPlaymode() == Playable::Full3D)
+    {
+      float xMouse, yMouse;
+      xMouse = event.xRel*mouseSensitivity;
+      yMouse = event.yRel*mouseSensitivity;
+
+      // rotate the Player around the y-axis
+      this->rotation += xMouse;
+
+      this->cameraLook += yMouse;
+      // rotate the Camera around the z-axis
+      if (cameraLook > M_PI_4)
+        cameraLook = M_PI_4;
+      else if (cameraLook < -M_PI_4)
+        cameraLook = -M_PI_4;
+      //this->cameraNode.setRelDirSoft(this->direction,10);
+    }
+  }
+}