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

[wroennin at orxonox.net]

Author: wroennin
Date: 2013-11-25 16:31:29 +0100 (Mon, 25 Nov 2013)
New Revision: 9824

Modified:
   code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo
   code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc
Log:
Updated

Modified: code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo	2013-11-25 15:10:21 UTC (rev 9823)
+++ code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo	2013-11-25 15:31:29 UTC (rev 9824)
@@ -128,7 +128,7 @@
      name          = "Radar"
      background    = "Orxonox/Radar3D"
      material2D    = "Orxonox/Radar"
-     material3D    = "Orxonox/Radar3D"
+     material3Dmiddle    = "Orxonox/Radar3D"
      correctaspect = true
      size          = "0.17, 0.17"
      position      = "1.0, 1.0"
@@ -139,9 +139,8 @@
      maximumDotSize = 0.1
      maximumDotSize3D      = 0.07
     />
+    
 
-
-
     <HUDTimer
      name     = "Timer"
      position = "0.5, 0.85"

Modified: code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc	2013-11-25 15:10:21 UTC (rev 9823)
+++ code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.cc	2013-11-25 15:31:29 UTC (rev 9824)
@@ -100,7 +100,9 @@
         XMLPortParam(HUDRadar, "maximumDotSize", setMaximumDotSize, getMaximumDotSize, xmlelement, mode);
         XMLPortParam(HUDRadar, "maximumDotSize3D", setMaximumDotSize3D, getMaximumDotSize3D, xmlelement, mode);
         XMLPortParam(HUDRadar, "Material2D", set2DMaterial, get2DMaterial, xmlelement, mode);
-        XMLPortParam(HUDRadar, "Material3D", set3DMaterial, get3DMaterial, xmlelement, mode);
+        XMLPortParam(HUDRadar, "Material3Dmiddle", set3DMaterial, get3DMaterial, xmlelement, mode);
+
+
     }
 
     void HUDRadar::addObject(RadarViewable* object)
@@ -170,9 +172,10 @@
         if(RadarMode_)
         {
         	this->setBackgroundMaterial(material3D_);
+        	//this->radar3Dback_->show();
+        	//this
 
 
-
         }
         else
         	this->setBackgroundMaterial(material2D_);