Changeset 8988 for code/branches/presentation2011/src/modules/overlays/hud/HUDNavigation.h

Timestamp:

Dec 14, 2011, 4:45:22 PM (14 years ago)

Author:

smerkli

Message:

merged hud branch

Location:

code/branches/presentation2011

Files:

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

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

@@ -24 +24 @@
  *   Co-authors:
  *      Reto Grieder
+ *      Matthias Spalinger
  *
  */
@@ -54 +55 @@
     virtual void tick ( float dt );
 
+    // RadarListener interface
     virtual void addObject ( RadarViewable* object );
     virtual void removeObject ( RadarViewable* viewable );
@@ -66 +68 @@
     inline float getRadarSensitivity() const
     { return 1.0f; }
+
+    unsigned int getMarkerLimit() { return this->markerLimit_; }
 
 private:
@@ -85 +89 @@
     { return navMarkerSize_; }
 
-    void setDetectionLimit( float limit )
-    { this->detectionLimit_ = limit; }
-    float getDetectionLimit() const
-    { return this->detectionLimit_; }
 
     void setTextSize ( float size );
@@ -102 +102 @@
     sortedList sortedObjectList_;
 
+    float getArrowSizeX(int dist);    
+    float getArrowSizeY(int dist);
 
     float navMarkerSize_;
     std::string fontName_;
     float textSize_;
+    bool showDistance;
 
-    unsigned int markerLimit_; //TODO: is it possible to set this over the console and/or the IG-Setting
-    float detectionLimit_; //!< Objects that are more far away than detectionLimit_ are not displayed on the HUD. 10000.0f is the default value.
-                           //!< In order to bypass this behaviour, set a negative detectionLimit_. Then the detection range is "infinite".
+    unsigned int markerLimit_;;
+
+
 };
 }