[Orxonox-commit 5632] r10292 - in code/trunk: data/overlays src/modules/overlays/hud

[landauf at orxonox.net]

Author: landauf
Date: 2015-03-01 15:27:01 +0100 (Sun, 01 Mar 2015)
New Revision: 10292

Modified:
   code/trunk/data/overlays/HUD.oxo
   code/trunk/data/overlays/HUDTemplates3.oxo
   code/trunk/data/overlays/HUDTemplatesFPS.oxo
   code/trunk/src/modules/overlays/hud/HUDNavigation.cc
Log:
fixed text size in HUD (marker which shows the enemy's name). the configured size was not used and it was completely distorted if the window was resized. now both works.

Modified: code/trunk/data/overlays/HUD.oxo
===================================================================
--- code/trunk/data/overlays/HUD.oxo	2015-03-01 14:08:45 UTC (rev 10291)
+++ code/trunk/data/overlays/HUD.oxo	2015-03-01 14:27:01 UTC (rev 10292)
@@ -60,7 +60,7 @@
    name          = "Navigation"
    correctAspect = true
    font          = "Monofur"
-   textSize      = 0.05
+   textSize      = 0.02
    navMarkerSize = 0.03
    aimMarkerSize = 0.02
   />

Modified: code/trunk/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/trunk/data/overlays/HUDTemplates3.oxo	2015-03-01 14:08:45 UTC (rev 10291)
+++ code/trunk/data/overlays/HUDTemplates3.oxo	2015-03-01 14:27:01 UTC (rev 10292)
@@ -102,7 +102,7 @@
      name          = "Navigation"
      correctaspect = true
      font          = "Monofur"
-     textsize      = 0.05
+     textsize      = 0.02
      navMarkerSize = 0.03
      aimMarkerSize = 0.02
     />

Modified: code/trunk/data/overlays/HUDTemplatesFPS.oxo
===================================================================
--- code/trunk/data/overlays/HUDTemplatesFPS.oxo	2015-03-01 14:08:45 UTC (rev 10291)
+++ code/trunk/data/overlays/HUDTemplatesFPS.oxo	2015-03-01 14:27:01 UTC (rev 10292)
@@ -45,7 +45,7 @@
      name          = "Navigation"
      correctaspect = true
      font          = "Monofur"
-     textsize      = 0.05
+     textsize      = 0.02
      navMarkerSize = 0.03
      aimMarkerSize = 0.04
     />

Modified: code/trunk/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/trunk/src/modules/overlays/hud/HUDNavigation.cc	2015-03-01 14:08:45 UTC (rev 10291)
+++ code/trunk/src/modules/overlays/hud/HUDNavigation.cc	2015-03-01 14:27:01 UTC (rev 10292)
@@ -134,7 +134,7 @@
         for (std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.begin(); it != this->activeObjectList_.end(); ++it)
         {
             if (it->second.text_ != NULL)
-            it->second.text_->setFontName(this->fontName_);
+                it->second.text_->setFontName(this->fontName_);
         }
     }
 
@@ -154,7 +154,7 @@
         for (std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.begin(); it!=this->activeObjectList_.end(); ++it)
         {
             if (it->second.text_)
-            it->second.text_->setCharHeight(size);
+                it->second.text_->setCharHeight(size);
         }
     }
 
@@ -540,7 +540,7 @@
             if (it->second.panel_ != NULL)
                 it->second.panel_->setDimensions(this->navMarkerSize_ * xScale, this->navMarkerSize_ * yScale);
             if (it->second.text_ != NULL)
-                it->second.text_->setCharHeight(it->second.text_->getCharHeight() * yScale);
+                it->second.text_->setCharHeight(this->textSize_ * yScale);
             if (it->second.target_ != NULL)
                 it->second.target_->setDimensions(this->aimMarkerSize_ * xScale, this->aimMarkerSize_ * yScale);
         }
@@ -596,7 +596,7 @@
         Ogre::TextAreaOverlayElement* text = static_cast<Ogre::TextAreaOverlayElement*>( Ogre::OverlayManager::getSingleton()
                 .createOverlayElement("TextArea", "HUDNavigation_navText_" + getUniqueNumberString()));
         text->setFontName(this->fontName_);
-        text->setCharHeight(text->getCharHeight() * yScale);
+        text->setCharHeight(this->textSize_ * yScale);
         text->setColour(object->getRadarObjectColour());
 
         health->hide();