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

[wroennin at orxonox.net]

Author: wroennin
Date: 2013-12-02 13:12:06 +0100 (Mon, 02 Dec 2013)
New Revision: 9835

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 XML port and variable mapAngle_

Modified: code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo	2013-12-01 23:19:44 UTC (rev 9834)
+++ code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo	2013-12-02 12:12:06 UTC (rev 9835)
@@ -125,19 +125,20 @@
    
   
     <HUDRadar
-     name          = "Radar"
-     background    = "Orxonox/Radar3D"
-     material2D    = "Orxonox/Radar"
-     material3Dmiddle    = "Orxonox/Radar3D"
-     correctaspect = true
-     size          = "0.17, 0.17"
-     position      = "1.0, 1.0"
-     pickpoint     = "1.0, 1.0"
-     rotation      = 0
-     sensitivity   = 1.0
-     halfDotSizeDistance = 3000
-     maximumDotSize = 0.1
-     maximumDotSize3D      = 0.07
+     name          			= "Radar"
+     background    			= "Orxonox/Radar3D"
+     material2D    			= "Orxonox/Radar"
+     material3Dmiddle   	= "Orxonox/Radar3D"
+     correctaspect 			= true
+     size          			= "0.17, 0.17"
+     position      			= "1.0, 1.0"
+     pickpoint     			= "1.0, 1.0"
+     rotation      			= 0
+     sensitivity   			= 1.0
+     halfDotSizeDistance 	= 3000
+     maximumDotSize 		= 0.1
+     maximumDotSize3D      	= 0.07
+     mapAngle3D   			= 0.6435011
     />
     
 

Modified: code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc	2013-12-01 23:19:44 UTC (rev 9834)
+++ code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc	2013-12-02 12:12:06 UTC (rev 9835)
@@ -101,6 +101,7 @@
         XMLPortParam(HUDRadar, "maximumDotSize3D", setMaximumDotSize3D, getMaximumDotSize3D, xmlelement, mode);
         XMLPortParam(HUDRadar, "Material2D", set2DMaterial, get2DMaterial, xmlelement, mode);
         XMLPortParam(HUDRadar, "Material3Dmiddle", set3DMaterial, get3DMaterial, xmlelement, mode);
+        XMLPortParam(HUDRadar, "mapAngle3D", setMapAngle, getMapAngle, xmlelement, mode);
 
 
     }
@@ -210,7 +211,7 @@
             	coord = get3DProjection(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition(), 0.6435011, detectionLimit_);
 
             	// set zOrder on screen
-            	bool overXZPlain = isObjectHigherThanShipOnMap(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition(), 0.6435011);
+            	bool overXZPlain = isObjectHigherThanShipOnMap(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition(), this->mapAngle_);
 
             	if(overXZPlain == false && (it->second->getZOrder() >  100 * this->overlay_->getZOrder())) // it appears that zOrder of attached Overlayelements is 100 times the zOrder of the Overlay
             		it->second->_notifyZOrder(this->overlay_->getZOrder() * 100 - 1);

Modified: code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h
===================================================================
--- code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h	2013-12-01 23:19:44 UTC (rev 9834)
+++ code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h	2013-12-02 12:12:06 UTC (rev 9835)
@@ -79,6 +79,10 @@
         // used also by RadarListener interface!
         void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
 
+        // Determines angle between line of sight and x/z-plain on the 3D minimap
+        float getMapAngle() const { return this->mapAngle_; }
+        void setMapAngle(float mapAngle) { this->mapAngle_ = mapAngle; }
+
         // RadarListener interface
         virtual void addObject(RadarViewable* viewable);
         virtual void removeObject(RadarViewable* viewable);
@@ -100,6 +104,7 @@
         float halfDotSizeDistance_;
         float maximumDotSize_;
         float maximumDotSize3D_;
+        float mapAngle_;
 
         std::string material2D_;
         std::string material3D_;