Changeset 647 for code/branches/FICN/src/orxonox/objects/SpaceShip.h

Timestamp:

Dec 19, 2007, 8:12:01 AM (16 years ago)

Author:

landauf

Message:

good morning everybody!
did some changes in the steering of SpaceShip

File:

• code/branches/FICN/src/orxonox/objects/SpaceShip.h (modified) (6 diffs)

code/branches/FICN/src/orxonox/objects/SpaceShip.h

@@ -19 +19 @@
             ~SpaceShip();
             virtual void loadParams(TiXmlElement* xmlElem);
-            void setMaxSpeedValues(float maxSpeedForward, float maxSpeedRotateUpDown, float maxSpeedRotateRightLeft, float maxSpeedLoopRightLeft);
             virtual void tick(float dt);
+/*
             void moveForward(float moveForward);
             void rotateUp(float rotateUp);
@@ -35 +35 @@
             void maxSpeedRotateRightLeft(float maxSpeedRotateRightLeft);
             void maxSpeedLoopRightLeft(float maxSpeedLoopRightLeft);
+*/
             bool mouseMoved(const OIS::MouseEvent &e);
             bool mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id);
@@ -41 +42 @@
 
         private:
-            bool bInvertMouse_;
+            bool bInvertYAxis_;
             bool setMouseEventCallback_;
             bool bLMousePressed_;
@@ -48 +49 @@
             Ogre::SceneNode* camNode_;
 
-            particle::ParticleInterface *tt_;
+            particle::ParticleInterface* tt_;
 
             BillboardSet redBillboard_;
@@ -59 +60 @@
             float reloadTime_;
 
+            float maxSideAndBackSpeed_;
+            float maxSpeed_;
+            float maxRotation_;
+            float translationAcceleration_;
+            float rotationAcceleration_;
+            float translationDamping_;
+            float rotationDamping_;
+
+            Radian maxRotationRadian_;
+            Radian rotationAccelerationRadian_;
+            Radian rotationDampingRadian_;
+            Radian zeroRadian_;
+            Radian mouseXRotation_;
+            Radian mouseYRotation_;
+
+            float mouseX_;
+            float mouseY_;
+
+/*
             float moveForward_;
             float rotateUp_;
@@ -93 +113 @@
             float minMouseX;
             bool moved;
-
+*/
             int emitterRate_;
     };