Changeset 9818 for code/branches/radarDreiD

Timestamp:

Nov 25, 2013, 4:01:10 PM (11 years ago)

Author:

wroennin

Message:

HUDRadar: Added various XML ports, added changing between different BackgroundMaterials; MiscConfigMenu.lua: added point to change between 3D/2D; HUDTemplates3: updated parameters for new ports

Location:

code/branches/radarDreiD

Files:

• data/gui/scripts/MiscConfigMenu.lua (modified) (2 diffs)
• data/overlays/HUDTemplates3.oxo (modified) (3 diffs)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• src/modules/overlays/hud/HUDRadar.cc (modified) (7 diffs)
• src/modules/overlays/hud/HUDRadar.h (modified) (4 diffs)

code/branches/radarDreiD/data/gui/scripts/MiscConfigMenu.lua

@@ -38 +38 @@
     table.insert(P.commandList, "HUDNavigation MarkerLimit_")
     table.insert(P.commandList, "HUDNavigation showDistance")
+    table.insert(P.commandList, "HUDRadar RadarMode_")
 
     P.nameList = {}
@@ -60 +61 @@
     table.insert(P.nameList, "Marker Limit")
     table.insert(P.nameList, "Show Distance next to cursor")
+    table.insert(P.nameList, "Set Radar on 3D mode")
 
     P.linesList = {}

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

@@ -111 +111 @@
     <HUDRadar
      name          = "Radar"
-     backgroundtex = "radar.png"
+     background    = "Orxonox/Radar"
      correctaspect = true
      size          = "0.17, 0.17"
@@ -122 +122 @@
     />
     -->
-    
+   
+   
+  
     <HUDRadar
      name          = "Radar"
-     backgroundtex = "radar3D_2_0.png"
+     background    = "Orxonox/Radar3D"
+     material2D    = "Orxonox/Radar"
+     material3D    = "Orxonox/Radar3D"
      correctaspect = true
      size          = "0.17, 0.17"
@@ -133 +137 @@
      sensitivity   = 1.0
      halfDotSizeDistance = 3000
-     maximumDotSize      = 0.1
+     maximumDotSize = 0.1
+     maximumDotSize3D      = 0.07
     />
+
+
 
     <HUDTimer

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

@@ -74 +74 @@
         OrxonoxOverlay(context)
     {
-        RegisterObject(HUDNavigation)
-;        this->setConfigValues();
+        RegisterObject(HUDNavigation);
+        this->setConfigValues();
 
         // Set default values

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

@@ -42 +42 @@
 #include "Scene.h"
 #include "Radar.h"
+#include "core/config/ConfigValueIncludes.h"
 
 namespace orxonox
@@ -51 +52 @@
     {
         RegisterObject(HUDRadar);
+        this->setConfigValues();
 
         this->marker_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
@@ -61 +63 @@
         this->setHalfDotSizeDistance(3000.0f);
         this->setMaximumDotSize(0.1f);
+        this->setMaximumDotSize3D(0.07f);
 
         this->shapeMaterials_[RadarViewable::Dot]      = "RadarDot.png";
@@ -82 +85 @@
     }
 
+
+
+    void HUDRadar::setConfigValues()
+       {
+           SetConfigValue(RadarMode_, true);
+       }
+
     void HUDRadar::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -89 +99 @@
         XMLPortParam(HUDRadar, "halfDotSizeDistance", setHalfDotSizeDistance, getHalfDotSizeDistance, xmlelement, mode);
         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);
     }
 
@@ -153 +166 @@
         // update the distances for all objects
         std::map<RadarViewable*,Ogre::PanelOverlayElement*>::iterator it;
+
+
+        if(RadarMode_)
+        {
+                this->setBackgroundMaterial(material3D_);
+
+
+
+        }
+        else
+                this->setBackgroundMaterial(material2D_);
+
+
+
         for( it = this->radarObjects_.begin(); it != this->radarObjects_.end(); ++it )
         {
@@ -166 +193 @@
             float distance = (wePointer->getWorldPosition() - this->owner_->getPosition()).length();
             // calculate the size with 1/distance dependency for simplicity (instead of exp(-distance * lambda)
-            float size = maximumDotSize_ * halfDotSizeDistance_ / (halfDotSizeDistance_ + distance) * it->first->getRadarObjectScale();
-
-
+
+            float size;
+            if(RadarMode_)
+                size = maximumDotSize3D_ * halfDotSizeDistance_ / (halfDotSizeDistance_ + distance) * it->first->getRadarObjectScale();
+            else
+                size = maximumDotSize_ * halfDotSizeDistance_ / (halfDotSizeDistance_ + distance) * it->first->getRadarObjectScale();
             it->second->setDimensions(size, size);
 
             // calc position on radar...
-            //Vector2 coord = get2DViewcoordinates(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition());
-            Vector2 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);
-
-            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);
-            if(overXZPlain == true && (it->second->getZOrder() <= 100 * this->overlay_->getZOrder()))
-                it->second->_notifyZOrder(this->overlay_->getZOrder() * 100 + 1);
-
-
+            Vector2 coord;
+            if(RadarMode_)
+            {
+                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);
+
+                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);
+                if(overXZPlain == true && (it->second->getZOrder() <= 100 * this->overlay_->getZOrder()))
+                        it->second->_notifyZOrder(this->overlay_->getZOrder() * 100 + 1);
+            }
+            else
+                coord = get2DViewcoordinates(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition());
 
             coord *= math::pi / 3.5f; // small adjustment to make it fit the texture

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

@@ -35 +35 @@
 #include <map>
 #include <vector>
+#include <string>
 
 #include "util/OgreForwardRefs.h"
@@ -51 +52 @@
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
         virtual void changedOwner();
+        void setConfigValues();
 
     private:
@@ -64 +66 @@
         float getMaximumDotSize() const { return this->maximumDotSize_; }
         void setMaximumDotSize(float size) { this->maximumDotSize_ = size; }
+
+        float getMaximumDotSize3D() const { return this->maximumDotSize3D_; }
+        void setMaximumDotSize3D(float size) { this->maximumDotSize3D_ = size;}
+
+        std::string get2DMaterial() const {return this->material2D_; }
+        void set2DMaterial(std::string material2D) { this->material2D_ = material2D; }
+
+        std::string get3DMaterial() const {return this->material3D_; }
+        void set3DMaterial(std::string material3D) { this->material3D_ = material3D; }
 
         float getRadarSensitivity() const { return this->sensitivity_; }
@@ -85 +96 @@
         Ogre::PanelOverlayElement* marker_;
 
+        bool RadarMode_; // Determines, if Radar runs in 3D or 2D Mode
+
         float halfDotSizeDistance_;
         float maximumDotSize_;
+        float maximumDotSize3D_;
+
+        std::string material2D_;
+        std::string material3D_;
 
         float sensitivity_;