- fix turn bank indicator (bank scale type)

- cleanup

diff --git a/src/Instrumentation/HUD/HUD.hxx b/src/Instrumentation/HUD/HUD.hxx
index 6506cd7aa2c6517922d33806c1c39bdd03bc9e19..0afc934fdf36fea258e1ec88c3f866bb29728189 100644 (file)
--- a/src/Instrumentation/HUD/HUD.hxx
+++ b/src/Instrumentation/HUD/HUD.hxx
@@ -528,12 +528,15 @@ public:
     virtual void draw();
 
 private:
+    void draw_scale();
+    void draw_tee();
+    void draw_tick(float angle, float r1, float r2, int side);
+
     Input _bank;
     Input _sideslip;
 
     float _gap_width;
     bool  _bank_scale;
-    float _bank_scale_radius;
 };
 
 

diff --git a/src/Instrumentation/HUD/HUD_ladder.cxx b/src/Instrumentation/HUD/HUD_ladder.cxx
index 556f1b4a147ade85754cecd17294d893197c5dd1..f50ba7da74941ab8fb502298e63e5363da693a8f 100644 (file)
--- a/src/Instrumentation/HUD/HUD_ladder.cxx
+++ b/src/Instrumentation/HUD/HUD_ladder.cxx
@@ -213,8 +213,6 @@ void HUD::Ladder::draw(void)
             glEnable(GL_CLIP_PLANE1);
             glClipPlane(GL_CLIP_PLANE2, eqn_right);
             glEnable(GL_CLIP_PLANE2);
-            // glScissor(-100,-240, 200, 240);
-            // glEnable(GL_SCISSOR_TEST);
         }
 
         //****************************************************************
@@ -284,16 +282,15 @@ void HUD::Ladder::draw(void)
     } // if _velocity_vector
 
     // draw hud markers on top of each AI/MP target
-    if ( _target_markers ) {
-        SGPropertyNode *models
-            = globals->get_props()->getNode("/ai/models", true);
-        for ( int i = 0; i < models->nChildren(); i++ ) {
+    if (_target_markers) {
+        SGPropertyNode *models = globals->get_props()->getNode("/ai/models", true);
+        for (int i = 0; i < models->nChildren(); i++) {
             SGPropertyNode *chld = models->getChild(i);
             string name;
             name = chld->getName();
-            if ( name == "aircraft" || name == "multiplayer" ) {
+            if (name == "aircraft" || name == "multiplayer") {
                 string callsign = chld->getStringValue("callsign");
-                if ( callsign != "" ) {
+                if (callsign != "") {
                     float h_deg = chld->getFloatValue("radar/h-offset");
                     float v_deg = chld->getFloatValue("radar/v-offset");
                     float pos_x = (h_deg * cos(roll_value) -
@@ -609,7 +606,6 @@ void HUD::Ladder::draw(void)
     glDisable(GL_CLIP_PLANE0);
     glDisable(GL_CLIP_PLANE1);
     glDisable(GL_CLIP_PLANE2);
-    //  glDisable(GL_SCISSOR_TEST);
     glPopMatrix();
     //*************************************************************
 

diff --git a/src/Instrumentation/HUD/HUD_scale.cxx b/src/Instrumentation/HUD/HUD_scale.cxx
index 13090e914e1b114ed1ee83cf543648f55fd304cd..0ce10c4b6328ef33828da7282fd460dcd78dc814 100644 (file)
--- a/src/Instrumentation/HUD/HUD_scale.cxx
+++ b/src/Instrumentation/HUD/HUD_scale.cxx
@@ -22,18 +22,6 @@
 #include "HUD.hxx"
 
 
-//============== Scale class memeber definitions ===============
-//
-// Notes:
-// 1. Scales divide the specified location into half and then
-//    the half opposite the read direction in half again. A bar is
-//    then drawn along the second divider. Scale ticks are drawn
-//    between the middle and quarter section lines (minor division
-//    markers) or just over the middle line.
-//
-// 2.  This class was not intended to be instanciated. See moving_scale
-//     and gauge_instr classes.
-//==============================================================
 HUD::Scale::Scale( HUD *hud, const SGPropertyNode *n, float x, float y) :
     Item(hud, n, x, y),
     _input(n->getNode("input", false)),
@@ -50,9 +38,6 @@ HUD::Scale::Scale( HUD *hud, const SGPropertyNode *n, float x, float y) :
     if (_range_shown < 0)
         _range_shown = -_range_shown;
 
-//    float temp = (_input.max() - _input.min()) / 100;                // FIXME huh?
-//    if (_range_shown < temp)
-//        _range_shown = temp;
 }
 
 

diff --git a/src/Instrumentation/HUD/HUD_tbi.cxx b/src/Instrumentation/HUD/HUD_tbi.cxx
index 4782f2b598bae894a324e9bd1702ac50f720f752..dc8384e48e0cc5661a268a4fa03812740d7cfb76 100644 (file)
--- a/src/Instrumentation/HUD/HUD_tbi.cxx
+++ b/src/Instrumentation/HUD/HUD_tbi.cxx
@@ -27,8 +27,7 @@ HUD::TurnBankIndicator::TurnBankIndicator(HUD *hud, const SGPropertyNode *n, flo
     _bank(n->getNode("bank-input", false)),
     _sideslip(n->getNode("sideslip-input", false)),
     _gap_width(n->getFloatValue("gap-width", 5)),
-    _bank_scale(n->getBoolValue("bank-scale", false)),
-    _bank_scale_radius(n->getFloatValue("bank-scale-radius", 250.0))
+    _bank_scale(n->getBoolValue("bank-scale", false))
 {
     if (!_bank_scale) {
         _bank.set_max(30.0, false);
@@ -44,164 +43,167 @@ void HUD::TurnBankIndicator::draw(void)
     if (!_bank.isValid() || !_sideslip.isValid())
         return;
 
+    if (_bank_scale)
+        draw_scale();
+    else
+        draw_tee();
+}
+
+
+void HUD::TurnBankIndicator::draw_tee()
+{
+    // ___________  /\  ___________
+    //            | \/ |
+
     float bank = _bank.getFloatValue();
     float sideslip = _sideslip.getFloatValue();
 
     float span = get_span();
+    float tee = -_h;
 
-    float tee_height = _h;
-    float tee = -tee_height;
-    float ss_const = 2 * sideslip * span / 40.0;  // sideslip angle pixels per deg (width represents 40 deg)
+    // sideslip angle pixels per deg (width represents 40 deg)
+    float ss_const = 2 * sideslip * span / 40.0;
 
     glPushMatrix();
     glTranslatef(_center_x, _center_y, 0.0);
     glRotatef(-bank, 0.0, 0.0, 1.0);
 
-    if (!_bank_scale) {
-       glBegin(GL_LINES);
-
-       if (!_gap_width) {
-           glVertex2f(-span, 0.0);
-           glVertex2f(span, 0.0);
-
-       } else {
-           glVertex2f(-span, 0.0);
-           glVertex2f(-_gap_width, 0.0);
-           glVertex2f(_gap_width, 0.0);
-           glVertex2f(span, 0.0);
-       }
-
-       // draw teemarks
-       glVertex2f(_gap_width, 0.0);
-       glVertex2f(_gap_width, tee);
-       glVertex2f(-_gap_width, 0.0);
-       glVertex2f(-_gap_width, tee);
-       glEnd();
-
-       glBegin(GL_LINE_LOOP);
-       glVertex2f(ss_const, -_gap_width);
-       glVertex2f(ss_const + _gap_width, 0.0);
-       glVertex2f(ss_const, _gap_width);
-       glVertex2f(ss_const - _gap_width, 0.0);
-       glEnd();
-
-
-    } else { // draw MIL-STD 1878B/4.2.2.4 bank scale
-        draw_line(_center_x - 1.0, _y, _center_x + 1.0, _y);
-        draw_line(_center_x - 1.0, _y, _center_x - 1.0, _y + 10.0);
-        draw_line(_center_x + 1.0, _y, _center_x + 1.0, _y + 10.0);
-        draw_line(_center_x - 1.0, _y + 10.0, _center_x + 1.0, _y + 10.0);
-
-        float x1, y1, x2, y2, x3, y3, x4, y4, x5, y5;
-        float xc, yc;
-        float r = _bank_scale_radius;
-        float r1 = r - 10.0;
-        float r2 = r - 5.0;
-
-        xc = _x + _w / 2.0;                // FIXME redunant, no?
-        yc = _y + r;
-
-        // first n last lines
-        x1 = xc + r * cos(255.0 * SGD_DEGREES_TO_RADIANS);
-        y1 = yc + r * sin(255.0 * SGD_DEGREES_TO_RADIANS);
+    glBegin(GL_LINES);
 
-        x2 = xc + r1 * cos(255.0 * SGD_DEGREES_TO_RADIANS);
-        y2 = yc + r1 * sin(255.0 * SGD_DEGREES_TO_RADIANS);
-        draw_line(x1, y1, x2, y2);
+    if (!_gap_width) {
+        glVertex2f(-span, 0.0);
+        glVertex2f(span, 0.0);
 
-        x1 = xc + r * cos(285.0 * SGD_DEGREES_TO_RADIANS);
-        y1 = yc + r * sin(285.0 * SGD_DEGREES_TO_RADIANS);
-
-        x2 = xc + r1 * cos(285.0 * SGD_DEGREES_TO_RADIANS);
-        y2 = yc + r1 * sin(285.0 * SGD_DEGREES_TO_RADIANS);
-        draw_line(x1, y1, x2, y2);
-
-        // second n fifth  lines
-        x1 = xc + r * cos(260.0 * SGD_DEGREES_TO_RADIANS);
-        y1 = yc + r * sin(260.0 * SGD_DEGREES_TO_RADIANS);
+    } else {
+        glVertex2f(-span, 0.0);
+        glVertex2f(-_gap_width, 0.0);
+        glVertex2f(_gap_width, 0.0);
+        glVertex2f(span, 0.0);
+    }
 
-        x2 = xc + r2 * cos(260.0 * SGD_DEGREES_TO_RADIANS);
-        y2 = yc + r2 * sin(260.0 * SGD_DEGREES_TO_RADIANS);
-        draw_line(x1, y1, x2, y2);
+    // draw teemarks
+    glVertex2f(_gap_width, 0.0);
+    glVertex2f(_gap_width, tee);
+    glVertex2f(-_gap_width, 0.0);
+    glVertex2f(-_gap_width, tee);
+    glEnd();
 
-        x1 = xc + r * cos(280.0 * SGD_DEGREES_TO_RADIANS);
-        y1 = yc + r * sin(280.0 * SGD_DEGREES_TO_RADIANS);
+    glBegin(GL_LINE_LOOP);
+    glVertex2f(ss_const, -_gap_width);
+    glVertex2f(ss_const + _gap_width, 0.0);
+    glVertex2f(ss_const, _gap_width);
+    glVertex2f(ss_const - _gap_width, 0.0);
+    glEnd();
 
-        x2 = xc + r2 * cos(280.0 * SGD_DEGREES_TO_RADIANS);
-        y2 = yc + r2 * sin(280.0 * SGD_DEGREES_TO_RADIANS);
-        draw_line(x1, y1, x2, y2);
+    glPopMatrix();
+}
 
-        // third n fourth lines
-        x1 = xc + r * cos(265.0 * SGD_DEGREES_TO_RADIANS);
-        y1 = yc + r * sin(265.0 * SGD_DEGREES_TO_RADIANS);
 
+void HUD::TurnBankIndicator::draw_scale()
+{
+    // MIL-STD 1878B/4.2.2.4 bank scale
+    float bank = _bank.getFloatValue();
+    float sideslip = _sideslip.getFloatValue();
 
-        x2 = xc + r2 * cos(265.0 * SGD_DEGREES_TO_RADIANS);
-        y2 = yc + r2 * sin(265.0 * SGD_DEGREES_TO_RADIANS);
-        draw_line(x1, y1, x2, y2);
+    float cx = _center_x;
+    float cy = _center_y;
+
+    float r = _w / 2.0;
+    float minor = r - r * 3.0 / 70.0;
+    float major = r - r * 5.0 / 70.0;
+
+    // hollow 0 degree mark
+    float w = r / 70.0;
+    if (w < 1.0)
+        w = 1.0;
+    float h = r * 6.0 / 70.0;
+    draw_line(cx - w, _y, cx + w, _y);
+    draw_line(cx - w, _y, cx - w, _y + h);
+    draw_line(cx + w, _y, cx + w, _y + h);
+    draw_line(cx - w, _y + h, cx + w, _y + h);
+
+    // tick lines
+    draw_tick(10, r, minor, 0);
+    draw_tick(20, r, minor, 0);
+    draw_tick(30, r, major, 0);
+
+    int dir = bank > 0 ? 1 : -1;
+
+    if (fabsf(bank) > 25) {
+        draw_tick(45, r, minor, dir);
+        draw_tick(60, r, major, dir);
+    }
 
-        x1 = xc + r * cos(275.0 * SGD_DEGREES_TO_RADIANS);
-        y1 = yc + r * sin(275.0 * SGD_DEGREES_TO_RADIANS);
+    if (fabsf(bank) > 55) {
+        draw_tick(90, r, major, dir);
+        draw_tick(135, r, major, dir);
+    }
 
-        x2 = xc + r2 * cos(275.0 * SGD_DEGREES_TO_RADIANS);
-        y2 = yc + r2 * sin(275.0 * SGD_DEGREES_TO_RADIANS);
-        draw_line(x1, y1, x2, y2);
+    // bank marker
+    float a, rr = r + r * 2.0 / 70.0;
 
-        // draw marker
-        r = _bank_scale_radius + 5.0;  // add gap
+    a = (bank + 270.0) * SGD_DEGREES_TO_RADIANS;
+    float x1 = cx + rr * cos(a);
+    float y1 = cy + rr * sin(a);
 
-        // upper polygon
-        float valbank = bank * 15.0 / _bank.max(); // total span of TSI is 30 degrees
-        float valsideslip = sideslip * 15.0 / _sideslip.max();
+    rr = r * 3.0 / 70.0;
+    a = (bank + 240.0) * SGD_DEGREES_TO_RADIANS;
+    float x2 = x1 + rr * cos(a);
+    float y2 = y1 + rr * sin(a);
 
-        // values 270, 225 and 315 are angles in degrees...
-        x1 = xc + r * cos((valbank + 270.0) * SGD_DEGREES_TO_RADIANS);
-        y1 = yc + r * sin((valbank + 270.0) * SGD_DEGREES_TO_RADIANS);
+    a = (bank + 300.0) * SGD_DEGREES_TO_RADIANS;
+    float x3 = x1 + rr * cos(a);
+    float y3 = y1 + rr * sin(a);
 
-        x2 = x1 + 6.0 * cos(225 * SGD_DEGREES_TO_RADIANS);
-        y2 = y1 + 6.0 * sin(225 * SGD_DEGREES_TO_RADIANS);
-
-        x3 = x1 + 6.0 * cos(315 * SGD_DEGREES_TO_RADIANS);
-        y3 = y1 + 6.0 * sin(315 * SGD_DEGREES_TO_RADIANS);
+    draw_line(x1, y1, x2, y2);
+    draw_line(x2, y2, x3, y3);
+    draw_line(x3, y3, x1, y1);
 
-        draw_line(x1, y1, x2, y2);
-        draw_line(x2, y2, x3, y3);
-        draw_line(x3, y3, x1, y1);
 
-        // lower polygon                               // FIXME this is inefficient and wrong!
-        x1 = xc + r * cos((valbank + 270.0) * SGD_DEGREES_TO_RADIANS);
-        y1 = yc + r * sin((valbank + 270.0) * SGD_DEGREES_TO_RADIANS);
+    // sideslip marker
+    rr = r + r * 2.0 / 70.0;
+    a = (bank + sideslip + 270.0) * SGD_DEGREES_TO_RADIANS;
+    x1 = cx + rr * cos(a);
+    y1 = cy + rr * sin(a);
 
-        x2 = x1 + 6.0 * cos(225 * SGD_DEGREES_TO_RADIANS);
-        y2 = y1 + 6.0 * sin(225 * SGD_DEGREES_TO_RADIANS);
+    rr = r * 3.0 / 70.0;
+    a = (bank + sideslip + 240.0) * SGD_DEGREES_TO_RADIANS;
+    x2 = x1 + rr * cos(a);
+    y2 = y1 + rr * sin(a);
 
-        x3 = x1 + 6.0 * cos(315 * SGD_DEGREES_TO_RADIANS);
-        y3 = y1 + 6.0 * sin(315 * SGD_DEGREES_TO_RADIANS);
+    a = (bank + sideslip + 300.0) * SGD_DEGREES_TO_RADIANS;
+    x3 = x1 + rr * cos(a);
+    y3 = y1 + rr * sin(a);
 
-        x4 = x1 + 10.0 * cos(225 * SGD_DEGREES_TO_RADIANS);
-        y4 = y1 + 10.0 * sin(225 * SGD_DEGREES_TO_RADIANS);
+    rr = r * 6.0 / 70.0;
+    a = (bank + sideslip + 240.0) * SGD_DEGREES_TO_RADIANS;
+    float x4 = x1 + rr * cos(a);
+    float y4 = y1 + rr * sin(a);
 
-        x5 = x1 + 10.0 * cos(315 * SGD_DEGREES_TO_RADIANS);
-        y5 = y1 + 10.0 * sin(315 * SGD_DEGREES_TO_RADIANS);
+    a = (bank + sideslip + 300.0) * SGD_DEGREES_TO_RADIANS;
+    float x5 = x1 + rr * cos(a);
+    float y5 = y1 + rr * sin(a);
 
-        float cosss = cos(valsideslip * SGD_DEGREES_TO_RADIANS);
-        float sinss = sin(valsideslip * SGD_DEGREES_TO_RADIANS);
+    draw_line(x2, y2, x3, y3);
+    draw_line(x3, y3, x5, y5);
+    draw_line(x5, y5, x4, y4);
+    draw_line(x4, y4, x2, y2);
+}
 
-        x2 = x2 + cosss;
-        y2 = y2 + sinss;
-        x3 = x3 + cosss;
-        y3 = y3 + sinss;
-        x4 = x4 + cosss;
-        y4 = y4 + sinss;
-        x5 = x5 + cosss;
-        y5 = y5 + sinss;
 
-        draw_line(x2, y2, x3, y3);
-        draw_line(x3, y3, x5, y5);
-        draw_line(x5, y5, x4, y4);
-        draw_line(x4, y4, x2, y2);
-    }
-    glPopMatrix();
+void HUD::TurnBankIndicator::draw_tick(float angle, float r1, float r2, int side)
+{
+    float a = (270 - angle) * SGD_DEGREES_TO_RADIANS;
+    float c = cos(a);
+    float s = sin(a);
+    float x1 = r1 * c;
+    float x2 = r2 * c;
+    float y1 = _center_y + r1 * s;
+    float y2 = _center_y + r2 * s;
+    if (side >= 0)
+        draw_line(_center_x - x1, y1, _center_x - x2, y2);
+    if (side <= 0)
+        draw_line(_center_x + x1, y1, _center_x + x2, y2);
 }