Changeset 8993 for code/branches/presentation2011

Timestamp:

Dec 17, 2011, 12:35:33 AM (13 years ago)

Author:

jo

Message:

Repairing the radar.

Location:

code/branches/presentation2011/src/modules/overlays/hud

Files:

• HUDNavigation.cc (modified) (5 diffs)
• HUDNavigation.h (modified) (2 diffs)

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

@@ -76 +76 @@
 
     // Set default values
-    setFont ( "Monofur" );
-    setTextSize ( 0.05f );
-    setNavMarkerSize ( 0.05f );
+    this->setFont ( "Monofur" );
+    this->setTextSize ( 0.05f );
+    this->setNavMarkerSize ( 0.05f );
+    this->setDetectionLimit( 10000.0f ); 
 }
 
@@ -100 +101 @@
     XMLPortParam ( HUDNavigation, "textSize",      setTextSize,      getTextSize,      xmlelement, mode );
     XMLPortParam ( HUDNavigation, "navMarkerSize", setNavMarkerSize, getNavMarkerSize, xmlelement, mode );
+    XMLPortParam ( HUDNavigation, "detectionLimit", setDetectionLimit, getDetectionLimit, xmlelement, mode ); 
 }
 
@@ -175 +177 @@
 
     unsigned int markerCount_ = 0;
+    bool closeEnough_ = false; //only display objects that are close enough to be relevant for the player
 
 //         for (ObjectMap::iterator it = activeObjectList_.begin(); it != activeObjectList_.end(); ++it)
@@ -180 +183 @@
     {
         ObjectMap::iterator it = activeObjectList_.find ( listIt->first );
-
-        if ( markerCount_ < markerLimit_ )
+        closeEnough_ = listIt->second < detectionLimit_ ;
+        // display radarviewables on HUD if the marker limit and max-distance is not exceeded 
+        if ( markerCount_ < markerLimit_ && (closeEnough_ ||  detectionLimit_ < 0) ) 
         {
 
@@ -307 +311 @@
             it->second.text_->show();
         }
-        else
+        else // do not display on HUD 
         {
             it->second.panel_->hide();

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

@@ -85 +85 @@
     // XMLPort accessors
     void setNavMarkerSize ( float size )
-    { navMarkerSize_ = size; this->sizeChanged(); }
+        { navMarkerSize_ = size; this->sizeChanged(); }
     float getNavMarkerSize() const
-    { return navMarkerSize_; }
-
+        { return navMarkerSize_; }
+    void setDetectionLimit( float limit ) 
+        { this->detectionLimit_ = limit; } 
+    float getDetectionLimit() const 
+        { return this->detectionLimit_; }
 
     void setTextSize ( float size );
@@ -110 +113 @@
     bool showDistance;
 
-    unsigned int markerLimit_;;
-
+    unsigned int markerLimit_;
+    float detectionLimit_; //!< Objects that are more far away than detectionLimit_ are not displayed on the HUD. 10000.0f is the default value. 
 
 };