Changeset 6868 for code/branches

Timestamp:

May 10, 2010, 1:23:04 PM (15 years ago)

Author:

sfluecki

Message:

nochma test?

Location:

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

Files:

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

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

@@ -72 +72 @@
         this->wasOutOfView_ = true; // Ensure the material is changed right the first time..
 
-        setFont("Monofur");
-        setTextSize(0.05f);
-        setNavMarkerSize(0.05f);
-        setAimMarkerSize(0.04f);
+
 */
 /*
@@ -86 +83 @@
         
         
+        setFont("Monofur");
+        setTextSize(0.05f);
+        setNavMarkerSize(0.05f);
+//         setAimMarkerSize(0.04f);
     }
 
@@ -110 +111 @@
     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_;
     }
 

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

@@ -57 +57 @@
          inline float getRadarSensitivity() const{}
          inline void radarTick(float dt) {}
+         
 
     private:
 
+        
+      
         void sizeChanged();
         void angleChanged() { }
@@ -104 +107 @@
         activeObjectListType::iterator tempRadarViewable;
         
+        std::string fontName_;
+        int textSize_;
+        
     };