Changeset 1395 for code/trunk/src

Timestamp:

May 23, 2008, 6:52:17 PM (17 years ago)

Author:

FelixSchulthess

Message:

moved navigation marker to new class: Navigation

Location:

code/trunk/src/orxonox/hud

Files:

• Navigation.cc (modified) (2 diffs)
• Navigation.h (modified) (1 diff)

code/trunk/src/orxonox/hud/Navigation.cc

@@ -27 +27 @@
 
 #include <OgreOverlayManager.h>
+#include <OgreStringConverter.h>
 #include <GraphicsEngine.h>
 #include "objects/SpaceShip.h"
@@ -109 +110 @@
 
         int d = (float)(getDist2Focus()/10);
-        if(d) test->setCaption("Distance: " + Ogre::StringConverter::toString(d));
-        else test->setCaption("");
+        if(d) navText_->setCaption("Distance: " + Ogre::StringConverter::toString(d));
+        else navText_->setCaption("");
     }
 

code/trunk/src/orxonox/hud/Navigation.h

@@ -44 +44 @@
             Ogre::OverlayContainer* container_;
             Ogre::PanelOverlayElement* navMarker_;      // the panel used to show the arrow
-            Ogre::TextAreaOverlayElement navText_;      // displaying distance...
+            Ogre::TextAreaOverlayElement* navText_;      // displaying distance...
                 Vector3 shipPos_;                           // position of ship
                 int windowW_, windowH_;