Changeset 9835 for code/branches/radarDreiD

Timestamp:

Dec 2, 2013, 1:12:06 PM (11 years ago)

Author:

wroennin

Message:

added XML port and variable mapAngle_

Location:

code/branches/radarDreiD

Files:

• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/overlays/hud/HUDRadar.cc (modified) (2 diffs)
• src/modules/overlays/hud/HUDRadar.h (modified) (2 diffs)

code/branches/radarDreiD/data/overlays/HUDTemplates3.oxo

@@ -126 +126 @@
   
     <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
     />
     

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

@@ -102 +102 @@
         XMLPortParam(HUDRadar, "Material2D", set2DMaterial, get2DMaterial, xmlelement, mode);
         XMLPortParam(HUDRadar, "Material3Dmiddle", set3DMaterial, get3DMaterial, xmlelement, mode);
+        XMLPortParam(HUDRadar, "mapAngle3D", setMapAngle, getMapAngle, xmlelement, mode);
 
 
@@ -211 +212 @@
 
                 // 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

code/branches/radarDreiD/src/modules/overlays/hud/HUDRadar.h

@@ -80 +80 @@
         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);
@@ -101 +105 @@
         float maximumDotSize_;
         float maximumDotSize3D_;
+        float mapAngle_;
 
         std::string material2D_;