Changeset 1406 for code/branches/network/src/orxonox/objects/SpaceShip.h

Timestamp:

May 24, 2008, 1:39:05 PM (16 years ago)

Author:

rgrieder

Message:

• merged Felix's changes from trunk to network branch
• added "svn:eol-style native" property to keybindings.ini

File:

• code/branches/network/src/orxonox/objects/SpaceShip.h (modified) (4 diffs)

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

@@ -44 +44 @@
     {
         public:
-          
+
             static SpaceShip *getLocalShip();
-            
+
             SpaceShip();
             ~SpaceShip();
@@ -64 +64 @@
             void setTransDamp(float value);
             void setRotDamp(float value);
+            void getFocus();
 
-            void getFocus();
-            static Vector3 getSPosition();
-            static Quaternion getSOrientation();
             static std::string whereAmI();
             static void setMaxSpeedTest(float value)
@@ -80 +78 @@
 
             float getMaxSpeed();
+            Vector3 getDir();
+            Vector3 getOrth();
+            Camera* getCamera();
 
         private:
@@ -85 +86 @@
 
             Vector3 testvector_;
+            Vector3 initialDir_;
+            Vector3 currentDir_;
+            Vector3 initialOrth_;
+            Vector3 currentOrth_;
             bool bInvertYAxis_;
             bool setMouseEventCallback_;