Changeset 8874 for code/branches/ai2/src/modules/overlays/hud/HUDRadar.cc

Timestamp:

Sep 4, 2011, 3:15:41 PM (13 years ago)

Author:

jo

Message:

Radar & Navigation tweaks: Radar is now hiding 'radar invisible' objects in the same way as the navigation markers are hidden. New 'feature': objects that are too far away are not displayed.

File:

• code/branches/ai2/src/modules/overlays/hud/HUDRadar.cc (modified) (5 diffs)

code/branches/ai2/src/modules/overlays/hud/HUDRadar.cc

@@ -64 +64 @@
         this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png";
         this->shapeMaterials_[RadarViewable::Square]   = "RadarSquare.png";
-
+        this->setDetectionLimit( 10000.0f );
         this->owner_ = 0;
     }
@@ -94 +94 @@
         if (object == dynamic_cast<RadarViewable*>(this->owner_))
             return;
+        if( showObject(object) == false ) //do not show objects that are "invisible" or "radar invisible"
+            return;
 
         // Make sure the object hasn't been added yet
@@ -123 +125 @@
     void HUDRadar::objectChanged( RadarViewable* rv )
     {
-        if (rv == dynamic_cast<RadarViewable*>(this->owner_))
-            return;
+        if(rv == dynamic_cast<RadarViewable*>(this->owner_)) //case: player changed
+            return;
+        if( showObject(rv) == false ) //case: (radar) invisible object changed
+            return;
+        if( this->radarObjects_.find(rv) == this->radarObjects_.end() ) // if (radar) invisibility becomes (radar) visible
+            this->addObject(rv);
         assert( this->radarObjects_.find(rv) != this->radarObjects_.end() );
         Ogre::PanelOverlayElement* panel = this->radarObjects_[rv];
@@ -172 +178 @@
             coord *= math::pi / 3.5f; // small adjustment to make it fit the texture
             it->second->setPosition((1.0f + coord.x - size) * 0.5f, (1.0f - coord.y - size) * 0.5f);
-            it->second->show();
+            if( distance < detectionLimit_ || detectionLimit_ < 0 )
+                it->second->show();
+            else
+                it->second->hide();
 
             // if this object is in focus, then set the focus marker
@@ -184 +193 @@
     }
 
+    bool HUDRadar::showObject(RadarViewable* rv)
+    {
+        if ( rv == dynamic_cast<RadarViewable*> ( this->getOwner() ) )
+            return false;
+        assert( rv->getWorldEntity() );
+        if ( rv->getWorldEntity()->isVisible()==false || rv->getRadarVisibility()==false )
+            return false;
+        return true;
+    }
+
+
     void HUDRadar::changedOwner()
     {