Quiet some log output.

[flightgear.git] / src / Instrumentation / HUD / HUD_misc.cxx

diff --git a/src/Instrumentation/HUD/HUD_misc.cxx b/src/Instrumentation/HUD/HUD_misc.cxx
index 2ee8a901044fbb7a8029c2a52c57fe49e8c4e616..17e33b4892359a721b0bdfaf7fe416347c1ece2f 100644 (file)
--- a/src/Instrumentation/HUD/HUD_misc.cxx
+++ b/src/Instrumentation/HUD/HUD_misc.cxx
@@ -23,28 +23,31 @@
 #endif
 
 #include "HUD.hxx"
+#include "HUD_private.hxx"
+
+#include <Main/globals.hxx>
 
 // MIL-STD-1787B aiming reticle
 
 HUD::AimingReticle::AimingReticle(HUD *hud, const SGPropertyNode *n, float x, float y) :
 Item(hud, n, x, y),
+_active_condition(0),
+_tachy_condition(0),
+_align_condition(0),
+_diameter(n->getNode("diameter-input", false)),
 _pitch(n->getNode("pitch-input", false)),
 _yaw(n->getNode("yaw-input", false)),
 _speed(n->getNode("speed-input", false)),
 _range(n->getNode("range-input", false)),
-_offset_x(n->getNode("offset-x-input", false)),
-_offset_y(n->getNode("offset-y-input", false)),
-_diameter(n->getNode("diameter-input", false)),
 _t0(n->getNode("arc-start-input", false)),
 _t1(n->getNode("arc-stop-input", false)),
+_offset_x(n->getNode("offset-x-input", false)),
+_offset_y(n->getNode("offset-y-input", false)),
+_bullet_size(_w / 6.0),
+_inner_radius(_w / 2.0),
 _compression(n->getFloatValue("compression-factor")),
 _limit_x(n->getFloatValue("limit-x")),
-_limit_y(n->getFloatValue("limit-y")),
-_active_condition(0),
-_tachy_condition(0),
-_align_condition(0),
-_bullet_size(_w / 6.0),
-_inner_radius(_w / 2.0)
+_limit_y(n->getFloatValue("limit-y"))
 
 {
     const SGPropertyNode *node = n->getNode("active-condition");
@@ -54,39 +57,34 @@ _inner_radius(_w / 2.0)
     const SGPropertyNode *tnode = n->getNode("tachy-condition");
     if (tnode)
         _tachy_condition = sgReadCondition(globals->get_props(), tnode);
-    
+
     const SGPropertyNode *anode = n->getNode("align-condition");
     if (anode)
         _align_condition = sgReadCondition(globals->get_props(), anode);
+
 }
 
 
 void HUD::AimingReticle::draw(void)
 {
     bool active = _active_condition ? _active_condition->test() : true;
-    bool tachy = _tachy_condition ? _tachy_condition->test() : true;
-    bool align = _align_condition ? _align_condition->test() : true;
+    bool tachy = _tachy_condition ? _tachy_condition->test() : false;
+    bool align = _align_condition ? _align_condition->test() : false;
 
     float diameter = _diameter.isValid() ? _diameter.getFloatValue() : 2.0f; // outer circle
-    float x = _center_x + _offset_x.getFloatValue();
-    float y = _center_y + _offset_y.getFloatValue();
-
-    float t0 = _t0.isValid() ? _t0.getFloatValue() : 2.0f; // start arc
-    float t1 = _t1.isValid() ? _t1.getFloatValue() : 2.0f; // start arc
-
-    float yaw_value = _yaw.getFloatValue();
-    float pitch_value = _pitch.getFloatValue();
-    float tof_value = _range.getFloatValue()* 3 / _speed.getFloatValue();
-
-//        SG_LOG(SG_INPUT, SG_ALERT, "HUD: compression" << _compression);
-
-//        SG_LOG(SG_INPUT, SG_ALERT, "HUD: limit_x" << _limit_x);
+    float x = _center_x + (_offset_x.isValid() ? _offset_x.getFloatValue() : 0);
+    float y = _center_y + (_offset_y.isValid() ? _offset_y.getFloatValue() : 0);
 
     if (active) { // stadiametric (4.2.4.4)
         draw_bullet(x, y, _bullet_size);
         draw_circle(x, y, _inner_radius);
         draw_circle(x, y, diameter * _inner_radius);
     } else if (tachy){//tachiametric
+        float t0 = _t0.isValid() ? _t0.getFloatValue() : 2.0f; // start arc
+        float t1 = _t1.isValid() ? _t1.getFloatValue() : 2.0f; // stop arc
+        float yaw_value = _yaw.getFloatValue();
+        float pitch_value = _pitch.getFloatValue();
+        float tof_value = _range.getFloatValue()* 3 / _speed.getFloatValue();
         draw_bullet(x, y, _bullet_size);
         draw_circle(x, y, _inner_radius);
         draw_line(x + _inner_radius, y, x + _inner_radius * 3, y);
@@ -121,8 +119,6 @@ void HUD::AimingReticle::draw(void)
         pos_y < y - _limit_y + limit_offset? 
             pos_y = y - _limit_y + limit_offset: pos_y;
 
-        //        SG_LOG(SG_INPUT, SG_ALERT, "HUD: pos y" << pos_y);
-
         draw_circle(pos_x, pos_y, diameter * _inner_radius);
 
         draw_arc(x, y, t0, t1, (diameter + 2) * _inner_radius );