Changeset 1362 for code/trunk/src/orxonox/objects/SpaceShip.h

Timestamp:

May 22, 2008, 2:56:48 PM (16 years ago)

Author:

scheusso

Message:

merged hud3 branch into trunk and changed camera orientation

File:

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

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -29 +29 @@
 #ifndef _SpaceShip_H__
 #define _SpaceShip_H__
-
+#include <string>
 #include "OrxonoxPrereqs.h"
-
 #include <OgrePrerequisites.h>
 
+#include "util/Math.h"
 #include "core/InputInterfaces.h"
 #include "Camera.h"
@@ -66 +66 @@
 
             void getFocus();
-
+            static SpaceShip* instance_s;
+            static Vector3 getSPosition();
+            static Quaternion getSOrientation();
+            static std::string whereAmI();
             static void setMaxSpeedTest(float value)
                 { SpaceShip::instance_s->setMaxSpeed(value); }
@@ -76 +79 @@
             void mouseScrolled      (int abs, int rel) { }
 
+            float getMaxSpeed();
 
         private:
             void createCamera();
-            static SpaceShip* instance_s;
 
             Vector3 testvector_;
@@ -88 +91 @@
 
             Ogre::SceneNode* camNode_;
-            Camera* cam_;  
+            Camera* cam_;
             std::string camName_;