Changeset 6942 for code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h

Timestamp:

May 20, 2010, 8:30:38 PM (14 years ago)

Author:

scheusso

Message:

merging hudelements into presentation3 and reducing (or increasing) output level of lod debug output

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/HUDNavigation.h (modified) (3 diffs)

code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h

@@ -32 +32 @@
 #include "overlays/OverlaysPrereqs.h"
 
+#include <map>
+#include <string>
+
 #include "util/OgreForwardRefs.h"
 #include "tools/interfaces/Tickable.h"
+#include "interfaces/RadarListener.h"
 #include "overlays/OrxonoxOverlay.h"
 
 namespace orxonox
 {
-    class _OverlaysExport HUDNavigation : public OrxonoxOverlay, public Tickable
+    class _OverlaysExport HUDNavigation : public OrxonoxOverlay, public Tickable, public RadarListener
     {
     public:
@@ -47 +51 @@
         virtual void tick(float dt);
 
+        virtual void addObject(RadarViewable* object);
+        virtual void removeObject(RadarViewable* viewable);
+        virtual void objectChanged(RadarViewable* viewable) {}
+
+        virtual void changedOwner();
+        virtual void sizeChanged();
+        virtual void angleChanged() { }
+        virtual void positionChanged() { }
+        virtual void radarTick(float dt) {}
+
+        inline float getRadarSensitivity() const
+            { return 1.0f; }
+
     private:
-        void sizeChanged();
-        void angleChanged() { }
-        void positionChanged() { }
+        struct ObjectInfo
+        {
+            Ogre::PanelOverlayElement* panel_;
+            Ogre::TextAreaOverlayElement* text_;
+            bool outOfView_;
+            bool wasOutOfView_;
+        };
 
         // XMLPort accessors
-        void setNavMarkerSize(float size) { this->navMarkerSize_ = size; this->sizeChanged(); }
-        float getNavMarkerSize() const    { return this->navMarkerSize_; }
-
-/*
-        void setAimMarkerSize(float size) { this->aimMarkerSize_ = size; this->sizeChanged(); }
-        float getAimMarkerSize() const    { return this->aimMarkerSize_; }
-*/
+        void setNavMarkerSize(float size)
+            { navMarkerSize_ = size; this->sizeChanged(); }
+        float getNavMarkerSize() const
+            { return navMarkerSize_; }
 
         void setTextSize(float size);
@@ -67 +85 @@
         const std::string& getFont() const;
 
-        void updateMarker();
-        void updateFocus();
-        float getDist2Focus() const;
+        typedef std::map<RadarViewable*, ObjectInfo > ObjectMap;
+        ObjectMap activeObjectList_;
 
-        Ogre::PanelOverlayElement* navMarker_;      //!< the panel used to show the arrow and the target marker
-        float navMarkerSize_;                       //!< One paramter size of the navigation marker
-/*
-        Ogre::PanelOverlayElement* aimMarker_;      //!< Panel used to show the aim Marker
-        float aimMarkerSize_;                       //!< One paramter size of the aim marker
-*/
-        Ogre::TextAreaOverlayElement* navText_;     //!< Text overlay to display the target distance
-        bool wasOutOfView_;                         //!< Performance booster variable: setMaterial is not cheap
+        float navMarkerSize_;
+        std::string fontName_;
+        float textSize_;
     };
 }