Csaba HALASZ & Syd ADAMS: make radar font configurable

[flightgear.git] / src / Instrumentation / wxradar.hxx

diff --git a/src/Instrumentation/wxradar.hxx b/src/Instrumentation/wxradar.hxx
index b7d145724e5ca4dee0a1dbfee513c2203c989c04..ab1db5c4b31926298dfdd328e22116bbbe3d13de 100644 (file)
--- a/src/Instrumentation/wxradar.hxx
+++ b/src/Instrumentation/wxradar.hxx
@@ -58,12 +58,9 @@ public:
 
     double _interval;
     double _time;
-
     bool _sim_init_done;
-
     string _name;
-
-    int _num; 
+    int _num;
 
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _Instrument;
@@ -82,7 +79,6 @@ public:
     SGPropertyNode* getInstrumentNode(const char* name, DefaultType value);
 
 private:
-
     string _texture_path;
 
     typedef enum { ARC, MAP, PLAN, ROSE } DisplayMode;
@@ -115,14 +111,14 @@ private:
     SGPropertyNode_ptr _radar_position_node;
     SGPropertyNode_ptr _radar_data_node;
     SGPropertyNode_ptr _radar_symbol_node;
-    
+
     SGPropertyNode_ptr _radar_centre_node;
     SGPropertyNode_ptr _radar_coverage_node;
     SGPropertyNode_ptr _radar_ref_rng_node;
     SGPropertyNode_ptr _radar_hdg_marker_node;
     SGPropertyNode_ptr _radar_rotate_node;
-    SGPropertyNode_ptr _radar_font_node;
 
+    SGPropertyNode_ptr _font_node;
     SGPropertyNode_ptr _ai_enabled_node;
 
     osg::ref_ptr<osg::Texture2D> _resultTexture;
@@ -134,6 +130,9 @@ private:
     osg::Vec2Array *_texCoords;
     osg::Matrixf _centerTrans;
     osg::ref_ptr<osgText::Font> _font;
+    osg::Vec4 _font_color;
+    float _font_size;
+    float _font_spacing;
 
     list_of_SGWxRadarEcho _radarEchoBuffer;
 
@@ -154,9 +153,9 @@ private:
     bool inRadarRange(int type, double range);
 
     float calcRelBearing(float bearing, float heading);
-    
 };
 
+
 template<> inline
 SGPropertyNode* wxRadarBg::getInstrumentNode(const char* name, bool value)
 {
@@ -166,6 +165,7 @@ SGPropertyNode* wxRadarBg::getInstrumentNode(const char* name, bool value)
     return result;
 }
 
+
 template<> inline
 SGPropertyNode* wxRadarBg::getInstrumentNode(const char* name, double value)
 {
@@ -175,6 +175,7 @@ SGPropertyNode* wxRadarBg::getInstrumentNode(const char* name, double value)
     return result;
 }
 
+
 template<> inline
 SGPropertyNode* wxRadarBg::getInstrumentNode(const char* name,
                                              const char* value)