[Orxonox-commit 2152] r6868 - code/branches/hudelements/src/modules/overlays/hud

[sfluecki at orxonox.net]

Author: sfluecki
Date: 2010-05-10 13:23:04 +0200 (Mon, 10 May 2010)
New Revision: 6868

Modified:
   code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
   code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h
Log:
nochma test?

Modified: code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-10 10:58:17 UTC (rev 6867)
+++ code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-10 11:23:04 UTC (rev 6868)
@@ -71,10 +71,7 @@
         aimMarker_->setMaterialName("Orxonox/NavCrosshair");
         this->wasOutOfView_ = true; // Ensure the material is changed right the first time..
 
-        setFont("Monofur");
-        setTextSize(0.05f);
-        setNavMarkerSize(0.05f);
-        setAimMarkerSize(0.04f);
+
 */
 /*
         background_->addChild(navMarker_);*/
@@ -85,6 +82,10 @@
 //         this->setVisible(false);
 	
 	
+	setFont("Monofur");
+	setTextSize(0.05f);
+        setNavMarkerSize(0.05f);
+//         setAimMarkerSize(0.04f);
     }
 
     HUDNavigation::~HUDNavigation()
@@ -109,30 +110,38 @@
 
     void HUDNavigation::setFont(const std::string& font)
     {
-        if (this->navText_ && !font.empty())
-            this->navText_->setFontName(font);
+        fontName_ = font;
+	if(!activeObjectList_.empty()) 
+	{
+	  for(tempRadarViewable = activeObjectList_.begin(); tempRadarViewable!=activeObjectList_.end(); ++tempRadarViewable)
+	   {
+	      if (tempRadarViewable->second.second && !fontName_.empty())
+		tempRadarViewable->second.second->setFontName(fontName_);
+	   }
+	}
     }
 
     const std::string& HUDNavigation::getFont() const
     {
-        if (this->navText_)
-            return this->navText_->getFontName();
-        else
-            return BLANKSTRING;
+        return fontName_;
     }
 
     void HUDNavigation::setTextSize(float size)
     {
-        if (this->navText_ && size >= 0.0f)
-            this->navText_->setCharHeight(size);
+      textSize_ = size;
+      if(!activeObjectList_.empty()) 
+	{
+	  for(tempRadarViewable = activeObjectList_.begin(); tempRadarViewable!=activeObjectList_.end(); ++tempRadarViewable)
+	    {
+	      if (tempRadarViewable->second.second && size >= 0.0f)
+		tempRadarViewable->second.second->setCharHeight(size);
+	    }
+	}   
     }
 
     float HUDNavigation::getTextSize() const
     {
-        if (this->navText_)
-            return this->navText_->getCharHeight();
-        else
-            return 0.0f;
+      return textSize_;
     }
 
     void HUDNavigation::tick(float dt)

Modified: code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h	2010-05-10 10:58:17 UTC (rev 6867)
+++ code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h	2010-05-10 11:23:04 UTC (rev 6868)
@@ -56,9 +56,12 @@
          virtual void objectChanged(RadarViewable* viewable){}
          inline float getRadarSensitivity() const{}
          inline void radarTick(float dt) {}
+	 
 
     private:
 
+	
+      
 	void sizeChanged();
         void angleChanged() { }
         void positionChanged() { }
@@ -103,6 +106,9 @@
 	activeObjectListType activeObjectList_;
 	activeObjectListType::iterator tempRadarViewable;
 	
+	std::string fontName_;
+	int textSize_;
+	
     };
     
 }