Changeset 1292 for code/branches/hud3/src/orxonox/objects

Timestamp:

May 15, 2008, 5:37:06 PM (17 years ago)

Author:

FelixSchulthess

Message:

svn save

Location:

code/branches/hud3/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (3 diffs)
• SpaceShip.h (modified) (2 diffs)

code/branches/hud3/src/orxonox/objects/SpaceShip.cc

@@ -30 +30 @@
 #include "SpaceShip.h"
 
-#include <string>
-
 #include <OgreCamera.h>
 #include <OgreRenderWindow.h>
@@ -56 +54 @@
 {
     ConsoleCommand(SpaceShip, setMaxSpeedTest, AccessLevel::Debug, false);
+    ConsoleCommand(SpaceShip, whereAmI, AccessLevel::User, true);
     ConsoleCommandGeneric(test1, SpaceShip, createExecutor(createFunctor(&SpaceShip::setMaxSpeedTest), "setMaxSpeed", AccessLevel::Debug), false);
     ConsoleCommandGeneric(test2, SpaceShip, createExecutor(createFunctor(&SpaceShip::setMaxSpeedTest), "setMaxBlubber", AccessLevel::Debug), false);
@@ -432 +431 @@
     }
 
+    std::string SpaceShip::whereAmI() {
+        return getConvertedValue<int, std::string>(SpaceShip::instance_s->getPosition().x)
+        + "  " + getConvertedValue<int, std::string>(SpaceShip::instance_s->getPosition().y)
+        + "  " + getConvertedValue<int, std::string>(SpaceShip::instance_s->getPosition().z);
+    }
+
     void SpaceShip::tick(float dt)
     {

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

@@ -29 +29 @@
 #ifndef _SpaceShip_H__
 #define _SpaceShip_H__
-
+#include <string>
 #include "OrxonoxPrereqs.h"
-
 #include <OgrePrerequisites.h>
 
@@ -65 +64 @@
             void getFocus();
 
+            static std::string whereAmI();
             static void setMaxSpeedTest(float value)
                 { SpaceShip::instance_s->setMaxSpeed(value); }