Changeset 1615 for code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.h

Timestamp:

Jun 22, 2008, 12:06:55 AM (16 years ago)

Author:

rgrieder

Message:

• added blankString to String so you can return ""; even if it's a const std::string&
• fixed several bugs with aspect correct and margin alignment
• added console commands for OrxonoxOverlays and OverlayGroups for rotate, scale and scroll (you can access the by name (from name=.. in xml file), e.g. "OrxonoxOverlay rotateOverlay SpeedBar 90)
• converted everything in overlays/ to 4 spaces/tab
• removed all using namespace Ogre;
• added background_ Panel to OrxonoxOverlay, since most of the derived classes can use that
• should work now, but I'll have to test on a tardis box first

File:

• code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.h (modified) (3 diffs)

code/branches/hud/src/orxonox/overlays/hud/HUDNavigation.h

@@ -39 +39 @@
     class _OrxonoxExport HUDNavigation : public OrxonoxOverlay, public Tickable
     {
-      public:
+    public:
         HUDNavigation();
         ~HUDNavigation();
@@ -45 +45 @@
         void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
-        void tick(float dt);
-
-        float getDist2Focus() const;
-
-      protected:
+    private:
         void sizeChanged();
         void angleChanged() { }
         void positionChanged() { }
 
-      private:
-        HUDNavigation(HUDNavigation& instance);
+        void tick(float dt);
+
+        // XMLPort accessors
+        void setNavMarkerSize(float size) { this->navMarkerSize_ = size; }
+        float getNavMarkerSize() const    { return this->navMarkerSize_; }
+
+        void setAimMarkerSize(float size) { this->aimMarkerSize_ = size; }
+        float getAimMarkerSize() const    { return this->aimMarkerSize_; }
+
+        void setTextSize(float size);
+        float getTextSize() const;
+
+        void setFont(const std::string& font);
+        const std::string& getFont() const;
+
         void updateMarker();
         void updateFocus();
+        float getDist2Focus() const;
 
-        // XMLPort accessors
-        void setNavMarkerSize(float size);
-        float getNavMarkerSize() const;
-        void setAimMarkerSize(float size);
-        float getAimMarkerSize() const;
-        void setTextSize(float size);
-        float getTextSize() const;
-        void setFont(const std::string& font);
-        std::string getFont() const;
-
-        Ogre::OverlayContainer* container_;         //!< Container that holds the navigation elements
         Ogre::PanelOverlayElement* navMarker_;      //!< the panel used to show the arrow and the target marker
         float navMarkerSize_;                       //!< One paramter size of the navigation marker
@@ -76 +75 @@
         Ogre::TextAreaOverlayElement* navText_;     //!< Text overlay to display the target distance
         bool wasOutOfView_;                         //!< Performance booster variable: setMaterial is not cheap
-  };
+    };
 }