Changeset 1292

Timestamp:

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

Author:

FelixSchulthess

Message:

svn save

Location:

code/branches/hud3/src/orxonox

Files:

• console/InGameConsole.cc (modified) (2 diffs)
• hud/RadarOverlayElement.cc (modified) (1 diff)
• hud/RadarOverlayElement.cc~ (modified) (1 diff)
• hud/RadarOverlayElement.h (modified) (1 diff)
• hud/RadarOverlayElement.h~ (modified) (2 diffs)
• objects/SpaceShip.cc (modified) (3 diffs)
• objects/SpaceShip.h (modified) (2 diffs)

code/branches/hud3/src/orxonox/console/InGameConsole.cc

@@ -43 +43 @@
 #include "core/InputManager.h"
 #include "GraphicsEngine.h"
-// just for testing purposes
-//#include "SpaceShip.h"
 
 #define LINES 20
@@ -83 +81 @@
     }
 
-    void InGameConsole::execute(){
-/*// just for testing purposes
-        if(consoleOverlayTextAreas[0]->getCaption() == ">")
-                consoleOverlayTextAreas[0]->setCaption(SpaceShip::instance_s->getPosition().x
-                        + "__" + SpaceShip::instance_s->getPosition().y
-                        + "__" + SpaceShip::instance_s->getPosition().z);*/
+    void InGameConsole::execute(){      
         newline();
         if (!CommandExecutor::execute(this->ib_->get())){

code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc

@@ -24 +24 @@
 *      ...
 *
+*/
+
+/*      local coordinate system of space ship:
+
+                        y
+                        +   z
+                        |  +
+                        | /
+                        |/
+               x +------O
 */
 

code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~

@@ -101 +101 @@
   } 
    
-  void RadarOverlayElement::setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY, ortZ){
+  void RadarOverlayElement::setMainShipPosition(int dirX, int dirY, int dirZ, int ortX, int ortY, int ortZ){
     dirX_=dirX;
     dirY_=dirY;

code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h

@@ -25 +25 @@
 *
 */
-
 
 #ifndef _RADAR_H__

code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h~

@@ -26 +26 @@
 */
 
+/*      local coordinate system of space ship:
+
+                        y
+                        +   z
+                        |  +
+                        | /
+                        |/
+               x +------O
+*/
 
 #ifndef _RADAR_H__
@@ -63 +72 @@
 
     void initRadarOverlayElement(Real left, Real top, int dim, Ogre::OverlayContainer* container);
-    void setMainShipPosition(int dirX, dirY, dirZ, ortX, ortY, ortZ);
+    void setMainShipPosition(int dirX, int dirY, int dirZ, int ortX, int ortY, int ortZ);
     
     int newShip(int X, int Y, int Z);

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); }