Changeset 8920 for code/branches/hud/src

Timestamp:

Nov 2, 2011, 4:11:58 PM (13 years ago)

Author:

mspaling

Message:

Arrow in HUD now changes its size according to distance

Location:

code/branches/hud/src/modules/overlays/hud

Files:

• HUDNavigation.cc (modified) (6 diffs)
• HUDNavigation.h (modified) (2 diffs)

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

@@ -25 +25 @@
  *      Reto Grieder
  *      Oliver Scheuss
+ *      Matthias Spalinger
  *
  */
@@ -77 +78 @@
     setTextSize ( 0.05f );
     setNavMarkerSize ( 0.05f );
+    this->showDistance = false;
 }
 
@@ -141 +143 @@
 }
 
-
+float HUDNavigation::getArrowSizeX(int dist)
+{    
+    if (dist < 600) 
+        dist = 600;
+    return this->getActualSize().x * 900 * navMarkerSize_ / dist;
+}
+
+float HUDNavigation::getArrowSizeY(int dist)
+{    
+    if (dist < 600)
+        dist = 600;   
+    return this->getActualSize().y * 900 * navMarkerSize_ / dist;
+}
 
 void HUDNavigation::tick ( float dt )
@@ -173 +187 @@
             // Get Distance to HumanController and save it in the TextAreaOverlayElement.
             int dist = listIt->second;
-
-            //it->second.text_->setCaption ( multi_cast<std::string> ( dist ) ); //display distance next to cursor
-            //float textLength = multi_cast<std::string> ( dist ).size() * it->second.text_->getCharHeight() * 0.3f;
-            
-            it->second.text_->setCaption(it->first->getRVName()); //display name next to cursor
-            float textLength = it->first->getRVName().size() * it->second.text_->getCharHeight() * 0.3f;
+            float textLength = 0.0f;
+
+            //display distance next to cursor
+            if (showDistance){
+            it->second.text_->setCaption ( multi_cast<std::string> ( dist ) );
+            textLength = multi_cast<std::string> ( dist ).size() * it->second.text_->getCharHeight() * 0.3f;
+            }
+
+            //display name next to cursor
+            else{
+            it->second.text_->setCaption(it->first->getRVName()); 
+            textLength = it->first->getRVName().size() * it->second.text_->getCharHeight() * 0.3f;
+            }
 
             // Transform to screen coordinates
@@ -206 +227 @@
                     it->second.wasOutOfView_ = true;
                 }
+
+                //float xDistScale = this->getActualSize().x * 1000.0f * navMarkerSize_ / dist;
+                //float yDistScale = this->getActualSize().y * 1000.0f * navMarkerSize_ / dist;
+
+                // Adjust Arrowsize according to distance
+                it->second.panel_->setDimensions(getArrowSizeX(dist),getArrowSizeY(dist));
 
                 // Switch between top, bottom, left and right position of the arrow at the screen border
@@ -262 +289 @@
                   //it->second.panel_->setMaterialName ( "Orxonox/NavTDC" );
                     it->second.panel_->setMaterialName( TextureGenerator::getMaterialName( "tdc.png", it->first->getRadarObjectColour()) );
+                    it->second.panel_->setDimensions ( navMarkerSize_ * this->getActualSize().x, navMarkerSize_ * this->getActualSize().y );
                     it->second.wasOutOfView_ = false;
                 }

code/branches/hud/src/modules/overlays/hud/HUDNavigation.h

@@ -24 +24 @@
  *   Co-authors:
  *      Reto Grieder
+ *      Matthias Spalinger
  *
  */
@@ -97 +98 @@
     sortedList sortedObjectList_;
 
+    float getArrowSizeX(int dist);    
+    float getArrowSizeY(int dist);
 
     float navMarkerSize_;
     std::string fontName_;
     float textSize_;
+    bool showDistance;
 
     unsigned int markerLimit_;; //TODO: is it possible to set this over the console and/or the IG-Setting