Changeset 1615 for code/branches/hud/src/orxonox/overlays/hud/HUDRadar.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/HUDRadar.h (modified) (3 diffs)

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

@@ -44 +44 @@
     class _OrxonoxExport HUDRadar : public OrxonoxOverlay, public RadarListener
     {
-      public:
+    public:
         HUDRadar();
         ~HUDRadar();
@@ -50 +50 @@
         void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
-        float getRadarSensitivity() const { return this->sensitivity_; }
-        void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
-
+    private:
+        // XML accessors
         float getHalfDotSizeDistance() const { return this->halfDotSizeDistance_; }
         void setHalfDotSizeDistance(float distance) { this->halfDotSizeDistance_ = distance; }
@@ -59 +58 @@
         void setMaximumDotSize(float size) { this->maximumDotSize_ = size; }
 
-      private:
+        float getRadarSensitivity() const { return this->sensitivity_; }
+        // used also by RadarListener interface!
+        void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
+
+        // RadarListener interface
         void displayObject(RadarViewable* viewable, bool bIsMarked);
-        float getRadarSensitivity() { return 1.0f; }
         void radarTick(float dt);