Changeset 1394 for code/trunk/src/orxonox

Timestamp:

May 23, 2008, 6:49:46 PM (16 years ago)

Author:

FelixSchulthess

Message:

moved navigation marker to new class: Navigation

Location:

code/trunk/src/orxonox/hud

Files:

• HUD.cc (modified) (3 diffs)
• HUD.h (modified) (1 diff)
• Navigation.cc (modified) (3 diffs)
• Navigation.h (modified) (3 diffs)

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

@@ -60 +60 @@
         orxonoxHUD = om->create("Orxonox/HUD");
         container = static_cast<Ogre::OverlayContainer*>(om->createOverlayElement("Panel", "Orxonox/HUD/container"));
-        // test
-        test = static_cast<TextAreaOverlayElement*>(om->createOverlayElement("TextArea", "test123"));
-        test->show();
-        test->setMetricsMode(Ogre::GMM_RELATIVE);
-        test->setDimensions(0.3, 0.3);
-        test->setPosition(0.02, 0.02);
-        test->setFontName("Console");
-        test->setCaption("init");
 
         // creating text to display fps
@@ -101 +93 @@
         container->setHeight(1.0);
         container->setMetricsMode(Ogre::GMM_RELATIVE);
-        container->addChild(test);
         container->addChild(fpsText);
 
@@ -121 +112 @@
     void HUD::tick(float dt)
     {
-        int d = (float)(nav->getDist2Focus()/10);
-        if(d) test->setCaption("Distance: " + Ogre::StringConverter::toString(d));
-        else test->setCaption("");
-
         energyBar->resize();
 

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

@@ -51 +51 @@
             Ogre::Overlay* orxonoxHUD;
             Ogre::OverlayContainer* container;
-            Ogre::TextAreaOverlayElement* test;
             Ogre::TextAreaOverlayElement* fpsText;
             BarOverlayElement* energyBar;

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

@@ -1 +1 @@
 /*
-*   ORXONOX - the hottest 3D action shooter ever to exist
+*   ORXONOX - the hotnavText_ 3D action shooter ever to exist
 *
 *
@@ -50 +50 @@
     void Navigation::init(){
                 om = &OverlayManager::getSingleton();
+        // create nav text
+        navText_ = static_cast<TextAreaOverlayElement*>(om->createOverlayElement("TextArea", "navText"));
+        navText_->show();
+        navText_->setMetricsMode(Ogre::GMM_RELATIVE);
+        navText_->setDimensions(0.3, 0.3);
+        navText_->setPosition(0.02, 0.02);
+        navText_->setFontName("Console");
+        navText_->setCaption("init");
+        container_->addChild(navText_);
+
+
         // create nav marker ...
         navMarker_ = static_cast<PanelOverlayElement*>(om->createOverlayElement("Panel", "NavMarker"));
@@ -96 +107 @@
             }
         }
+
+        int d = (float)(getDist2Focus()/10);
+        if(d) test->setCaption("Distance: " + Ogre::StringConverter::toString(d));
+        else test->setCaption("");
     }
 

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

@@ -31 +31 @@
 #include <OgrePrerequisites.h>
 #include <OgrePanelOverlayElement.h>
+#include <OgreTextAreaOverlayElement.h>
 #include "../OrxonoxPrereqs.h"
 #include "util/Math.h"
@@ -41 +42 @@
         private:
                 Ogre::OverlayManager* om;                                   // our one and only overlay manager
+            Ogre::OverlayContainer* container_;
+            Ogre::PanelOverlayElement* navMarker_;      // the panel used to show the arrow
+            Ogre::TextAreaOverlayElement navText_;      // displaying distance...
                 Vector3 shipPos_;                           // position of ship
                 int windowW_, windowH_;
@@ -50 +54 @@
                 Navigation(Ogre::OverlayContainer* container, RadarObject* focus);
                 ~Navigation();
-            Ogre::OverlayContainer* container_;
-                        Ogre::PanelOverlayElement* navMarker_;     // the panel used to show the dot
                         RadarObject* focus_;                        // next pointer of linked list