[Orxonox-commit 5219] r9882 - in code/branches/radarDreiD: data/overlays src/modules/overlays/hud

[wroennin at orxonox.net]

Author: wroennin
Date: 2013-12-09 14:26:10 +0100 (Mon, 09 Dec 2013)
New Revision: 9882

Modified:
   code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo
   code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc
   code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h
Log:
added XMLProt for detectionLimit_

Modified: code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo	2013-12-09 13:14:06 UTC (rev 9881)
+++ code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo	2013-12-09 13:26:10 UTC (rev 9882)
@@ -121,6 +121,7 @@
      rotation      			= 0
      sensitivity   			= 1.0
      halfDotSizeDistance 	= 3000
+     detectionLimit 		= 10000.0
      maximumDotSize 		= 0.1
      maximumDotSize3D      	= 0.06
      mapAngle3D   			= 0.6435011

Modified: code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc	2013-12-09 13:14:06 UTC (rev 9881)
+++ code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc	2013-12-09 13:26:10 UTC (rev 9882)
@@ -67,7 +67,6 @@
         this->shapeMaterials_[RadarViewable::Dot]      = "RadarDot.png";
         this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png";
         this->shapeMaterials_[RadarViewable::Square]   = "RadarSquare.png";
-        this->setDetectionLimit( 10000.0f );
         this->owner_ = 0;
 
         this->map3DFront_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
@@ -120,9 +119,7 @@
         XMLPortParam(HUDRadar, "material3DFront", set3DMaterialFront, get3DMaterialFront, xmlelement, mode);
         XMLPortParam(HUDRadar, "material3DBack", set3DMaterialBack, get3DMaterialBack, xmlelement, mode);
         XMLPortParam(HUDRadar, "mapAngle3D", setMapAngle, getMapAngle, xmlelement, mode);
-
-
-
+        XMLPortParam(HUDRadar, "detectionLimit", setDetectionLimit, getDetectionLimit, xmlelement, mode);
     }
 
     void HUDRadar::addObject(RadarViewable* object)

Modified: code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h
===================================================================
--- code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h	2013-12-09 13:14:06 UTC (rev 9881)
+++ code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h	2013-12-09 13:26:10 UTC (rev 9882)
@@ -58,10 +58,8 @@
         float getHalfDotSizeDistance() const { return this->halfDotSizeDistance_; }
         void setHalfDotSizeDistance(float distance) { this->halfDotSizeDistance_ = distance; }
 
-        void setDetectionLimit( float limit )
-        { this->detectionLimit_ = limit; }
-        float getDetectionLimit() const
-        { return this->detectionLimit_; }
+        void setDetectionLimit( float limit ) { this->detectionLimit_ = limit; }
+        float getDetectionLimit() const { return this->detectionLimit_; }
 
         float getMaximumDotSize() const { return this->maximumDotSize_; }
         void setMaximumDotSize(float size) { this->maximumDotSize_ = size; }