]> git.mxchange.org Git - flightgear.git/blobdiff - src/Cockpit/hud.cxx
- remove hud.cxx/readLabel and let the instr_label read its properties
[flightgear.git] / src / Cockpit / hud.cxx
index b0db049ad1ec0d19c001eba728c80ac0f9870138..a8b7f5dd6ffd58611ef08da794846310f0bf3b92 100644 (file)
@@ -41,8 +41,8 @@
 #include <math.h>
 
 #include <stdlib.h>
-#include <stdio.h>             // char related functions
-#include <string.h>            // strcmp()
+#include <stdio.h>              // char related functions
+#include <string.h>             // strcmp()
 
 #include SG_GLU_H
 
@@ -84,19 +84,12 @@ int HUD_style = 0;
 float HUD_matrix[16];
 
 
-//$$$ begin - added, Neetha, 28 Nov 2k
-
 static string  name;
 static int     x;
 static int     y;
 static UINT    width;
 static UINT    height;
-static float   factor;
 static float   span_units;
-static float   division_units;
-static float   minor_division = 0;
-static UINT    screen_hole;
-static UINT    lbl_pos;
 static bool    working;
 static string  loadfn;
 static UINT    options;
@@ -110,13 +103,9 @@ static int     dp_showing = 0;
 static string  label_format;
 static string  prelabel;
 static string  postlabel;
-static int     justi;
-static int     blinking;
 static float   maxBankAngle;
 static float   maxSlipAngle;
 static UINT    gap_width;
-static bool    latitude;
-static bool    longitude;
 static bool    tick_bottom;
 static bool    tick_top;
 static bool    tick_right;
@@ -129,43 +118,21 @@ static float   marker_off;
 static string  type;
 static bool    enable_pointer;
 static string  type_pointer;
-static bool    frl_spot;
-static bool    target;
-static bool    vel_vector;
-static bool    drift;
-static bool    alpha;
-static bool    energy;
-static bool    climb_dive;
-static bool    glide;
-static float   glide_slope_val;
-static bool    worm_energy;
-static bool    waypoint;
-static string  type_tick;//hud
-static string  length_tick;//hud
-static bool    label_box;//hud
-static int     digits; //suma
-static float   radius; //suma
-static int     divisions; //suma
-static int     zoom; //suma
-static int     zenith; //suma
-static int     nadir ; //suma
-static int     hat; //suma
-static bool    tsi; //suma
-static float   rad; //suma
+static string  type_tick;
+static string  length_tick;
+static float   radius;
+static int     divisions;
+static int     zoom;
+static bool    tsi;
+static float   rad;
 
 
 static FLTFNPTR load_fn;
-static fgLabelJust justification;
-static const char *pre_label_string  = 0;
-static const char *post_label_string = 0;
 
 int readHud( istream &input );
 int readInstrument ( const SGPropertyNode * node);
-static instr_item * readLadder ( const SGPropertyNode * node);
 static instr_item * readCard ( const SGPropertyNode * node);
-static instr_item * readLabel( const SGPropertyNode * node);
 static instr_item * readTBI( const SGPropertyNode * node);
-//$$$ end   - added, Neetha, 28 Nov 2k
 
 static void drawHUD();
 static void fgUpdateHUDVirtual();
@@ -175,7 +142,7 @@ public:
     RECT rect;
 
     locRECT( UINT left, UINT top, UINT right, UINT bottom);
-    RECT get_rect(void) { return rect;}
+    RECT get_rect(void) { return rect; }
 };
 
 locRECT :: locRECT( UINT left, UINT top, UINT right, UINT bottom)
@@ -198,67 +165,6 @@ locRECT :: locRECT( UINT left, UINT top, UINT right, UINT bottom)
 // mustange and the engine readouts of a B36!
 //
 
-#define INSTRDEFS 21
-
-//$$$ begin - added, Neetha, 28 Nov 2k
-static instr_item *
-readLadder(const SGPropertyNode * node)
-{
-
-    instr_item *p;
-
-    name               = node->getStringValue("name");
-    x                  = node->getIntValue("x");
-    y                  = node->getIntValue("y");
-    width              = node->getIntValue("width");
-    height             = node->getIntValue("height");
-    factor             = node->getFloatValue("compression_factor");
-    span_units         = node->getFloatValue("span_units");
-    division_units     = node->getFloatValue("division_units");
-    screen_hole        = node->getIntValue("screen_hole");
-    lbl_pos            = node->getIntValue("lbl_pos");
-    frl_spot           = node->getBoolValue("enable_frl",false);
-    target             = node->getBoolValue("enable_target_spot",false);
-    vel_vector         = node->getBoolValue("enable_velocity_vector",false);
-    drift              = node->getBoolValue("enable_drift_marker",false);
-    alpha              = node->getBoolValue("enable_alpha_bracket",false);
-    energy             = node->getBoolValue("enable_energy_marker",false);
-    climb_dive         = node->getBoolValue("enable_climb_dive_marker",false);
-    glide              = node->getBoolValue("enable_glide_slope_marker",false);
-    glide_slope_val    = node->getFloatValue("glide_slope",-4.0);
-    worm_energy        = node->getBoolValue("enable_energy_marker",false);
-    waypoint           = node->getBoolValue("enable_waypoint_marker",false);
-    working            = node->getBoolValue("working");
-    zenith             = node->getIntValue("zenith");  //suma
-    nadir              = node->getIntValue("nadir");  //suma
-    hat                = node->getIntValue("hat");
-    // The factor assumes a base of 55 degrees per 640 pixels.
-    // Invert to convert the "compression" factor to a
-    // pixels-per-degree number.
-    if(fgGetBool("/sim/hud/enable3d", true))
-    {
-        if (HUD_style == 1)
-        {
-            factor = 1;
-            factor = (640./55.) / factor;
-        }
-    }
-
-    SG_LOG(SG_INPUT, SG_INFO, "Done reading instrument " << name);
-
-    p = (instr_item *) new HudLadder( name, x, y,
-                                      width, height, factor,
-                                      get_roll, get_pitch,
-                                      span_units, division_units, minor_division,
-                                      screen_hole, lbl_pos, frl_spot, target, vel_vector,
-                                      drift, alpha, energy, climb_dive,
-                                      glide, glide_slope_val, worm_energy,
-                                      waypoint, working, zenith, nadir, hat);
-
-    return p;
-
-} //end readLadder
-
 static instr_item *
 readCard(const SGPropertyNode * node)
 {
@@ -291,17 +197,17 @@ readCard(const SGPropertyNode * node)
     marker_off         = node->getFloatValue("marker_offset",0.0);
     enable_pointer     = node->getBoolValue("enable_pointer",true);
     type_pointer       = node->getStringValue("pointer_type");
-    type_tick          = node->getStringValue("tick_type");//hud Can be 'circle' or 'line'
-    length_tick        = node->getStringValue("tick_length");//hud For variable length
+    type_tick          = node->getStringValue("tick_type"); // 'circle' or 'line'
+    length_tick        = node->getStringValue("tick_length"); // for variable length
     working            = node->getBoolValue("working");
-    radius             = node->getFloatValue("radius"); //suma
-    divisions          = node->getIntValue("divisions"); //suma
-    zoom               = node->getIntValue("zoom"); //suma
+    radius             = node->getFloatValue("radius");
+    divisions          = node->getIntValue("divisions");
+    zoom               = node->getIntValue("zoom");
 
     SG_LOG(SG_INPUT, SG_INFO, "Done reading instrument " << name);
 
 
-    if(type=="gauge") {
+    if (type=="gauge") {
         span_units = maxValue - minValue;
     }
 
@@ -359,12 +265,12 @@ readCard(const SGPropertyNode * node)
                                          marker_off,
                                          enable_pointer,
                                          type_pointer,
-                                         type_tick,//hud
-                                         length_tick,//hud
+                                         type_tick,
+                                         length_tick,
                                          working,
-                                         radius, //suma
-                                         divisions, //suma
-                                         zoom  //suma
+                                         radius,
+                                         divisions,
+                                         zoom
                                          );
     } else {
         p = (instr_item *) new  gauge_instr( x,       // x
@@ -384,165 +290,6 @@ readCard(const SGPropertyNode * node)
     return p;
 }// end readCard
 
-static instr_item *
-readLabel(const SGPropertyNode * node)
-{
-    instr_item *p;
-
-    int font_size = (fgGetInt("/sim/startup/xsize") > 1000) ? HUD_FONT_LARGE : HUD_FONT_SMALL;
-
-    name               = node->getStringValue("name");
-    x                  = node->getIntValue("x");
-    y                  = node->getIntValue("y");
-    width              = node->getIntValue("width");
-    height             = node->getIntValue("height");
-    loadfn             = node->getStringValue("data_source");
-    label_format       = node->getStringValue("label_format");
-    prelabel           = node->getStringValue("pre_label_string");
-    postlabel          = node->getStringValue("post_label_string");
-    scaling            = node->getFloatValue("scale_data");
-    options            = node->getIntValue("options");
-    justi              = node->getIntValue("justification");
-    blinking           = node->getIntValue("blinking");
-    latitude           = node->getBoolValue("latitude",false);
-    longitude          = node->getBoolValue("longitude",false);
-    label_box          = node->getBoolValue("label_box",false);//hud
-    working            = node->getBoolValue("working");
-    digits             = node->getIntValue("digits"); //suma
-
-
-    SG_LOG(SG_INPUT, SG_INFO, "Done reading instrument " << name);
-
-
-    if ( justi == 0 ) {
-        justification = LEFT_JUST;
-    } else {
-        if ( justi == 1 ) {
-            justification = CENTER_JUST;
-        } else {
-            if ( justi == 2 ) {
-                justification = RIGHT_JUST;
-            }
-        }
-    }
-
-    if ( prelabel == "NULL" ) {
-        pre_label_string = NULL;
-    } else {
-        if ( prelabel == "blank" ) {
-            pre_label_string = " ";
-        } else {
-            pre_label_string = prelabel.c_str();
-        }
-    }
-
-    if ( postlabel == "blank" ) {
-        post_label_string = " ";
-    } else {
-        if ( postlabel == "NULL" ) {
-            post_label_string = NULL;
-        } else {
-            if ( postlabel == "units" ) {
-                post_label_string = units;
-            } else {
-                post_label_string = postlabel.c_str();
-            }
-        }
-    }
-
-#ifdef ENABLE_SP_FMDS
-    if ( loadfn== "aux1" ) {
-        load_fn = get_aux1;
-    } else if ( loadfn == "aux2" ) {
-        load_fn = get_aux2;
-    } else if ( loadfn == "aux3" ) {
-        load_fn = get_aux3;
-    } else if ( loadfn == "aux4" ) {
-        load_fn = get_aux4;
-    } else if ( loadfn == "aux5" ) {
-        load_fn = get_aux5;
-    } else if ( loadfn == "aux6" ) {
-        load_fn = get_aux6;
-    } else if ( loadfn == "aux7" ) {
-        load_fn = get_aux7;
-    } else if ( loadfn == "aux8" ) {
-        load_fn = get_aux8;
-    } else if ( loadfn == "aux9" ) {
-        load_fn = get_aux9;
-    } else if ( loadfn == "aux10" ) {
-        load_fn = get_aux10;
-    } else if ( loadfn == "aux11" ) {
-        load_fn = get_aux11;
-    } else if ( loadfn == "aux12" ) {
-        load_fn = get_aux12;
-    } else if ( loadfn == "aux13" ) {
-        load_fn = get_aux13;
-    } else if ( loadfn == "aux14" ) {
-        load_fn = get_aux14;
-    } else if ( loadfn == "aux15" ) {
-        load_fn = get_aux15;
-    } else if ( loadfn == "aux16" ) {
-        load_fn = get_aux16;
-    } else if ( loadfn == "aux17" ) {
-        load_fn = get_aux17;
-    } else if ( loadfn == "aux18" ) {
-        load_fn = get_aux18;
-    } else
-#endif
-    if ( loadfn == "ax" ) {
-        load_fn = get_Ax;
-    } else if ( loadfn == "speed" ) {
-        load_fn = get_speed;
-    } else if ( loadfn == "mach" ) {
-        load_fn = get_mach;
-    } else if ( loadfn == "altitude" ) {
-        load_fn = get_altitude;
-    } else if ( loadfn == "agl" ) {
-        load_fn = get_agl;
-    } else if ( loadfn == "framerate" ) {
-        load_fn = get_frame_rate;
-    } else if ( loadfn == "heading" ) {
-        load_fn = get_heading;
-    } else if ( loadfn == "fov" ) {
-        load_fn = get_fov;
-    } else if ( loadfn == "vfc_tris_culled" ) {
-        load_fn = get_vfc_tris_culled;
-    } else if ( loadfn == "vfc_tris_drawn" ) {
-        load_fn = get_vfc_tris_drawn;
-    } else if ( loadfn == "aoa" ) {
-        load_fn = get_aoa;
-    } else if ( loadfn == "latitude" ) {
-        load_fn  = get_latitude;
-    } else if ( loadfn == "anzg" ) {
-        load_fn = get_anzg;
-    } else if ( loadfn == "longitude" ) {
-        load_fn   = get_longitude;
-    } else if (loadfn=="throttleval") {
-        load_fn = get_throttleval;
-    }
-
-    p = (instr_item *) new instr_label ( x,
-                                         y,
-                                         width,
-                                         height,
-                                         load_fn,
-                                         label_format.c_str(),
-                                         pre_label_string,
-                                         post_label_string,
-                                         scaling,
-                                         options,
-                                         justification,
-                                         font_size,
-                                         blinking,
-                                         latitude,
-                                         longitude,
-                                         label_box, //hud
-                                         working,
-                                         digits); //suma
-
-    return p;
-} // end readLabel
-
 static instr_item *
 readTBI(const SGPropertyNode * node)
 {
@@ -558,8 +305,8 @@ readTBI(const SGPropertyNode * node)
     maxSlipAngle   = node->getFloatValue("maxSlipAngle");
     gap_width      = node->getIntValue("gap_width");
     working        = node->getBoolValue("working");
-    tsi            = node->getBoolValue("tsi"); //suma
-    rad            = node->getFloatValue("rad"); //suma
+    tsi            = node->getBoolValue("tsi");
+    rad            = node->getFloatValue("rad");
 
     SG_LOG(SG_INPUT, SG_INFO, "Done reading instrument " << name);
 
@@ -574,8 +321,8 @@ readTBI(const SGPropertyNode * node)
                                         maxSlipAngle,
                                         gap_width,
                                         working,
-                                        tsi, //suma
-                                        rad); //suma
+                                        tsi,
+                                        rad);
 
     return p;
 } //end readTBI
@@ -622,56 +369,46 @@ int readInstrument(const SGPropertyNode * node)
     if (ladder_group != 0) {
         int nLadders = ladder_group->nChildren();
         for (int j = 0; j < nLadders; j++) {
-
-            HIptr = readLadder(ladder_group->getChild(j));
-            HUD_deque.insert( HUD_deque.begin(), HIptr);
-
-        }// for - ladders
+            HIptr = static_cast<instr_item *>(new HudLadder(ladder_group->getChild(j)));
+            HUD_deque.insert(HUD_deque.begin(), HIptr);
+        }
     }
 
     const SGPropertyNode * card_group = node->getNode("cards");
     if (card_group != 0) {
         int nCards = card_group->nChildren();
         for (int j = 0; j < nCards; j++) {
-
             HIptr = readCard(card_group->getChild(j));
-            HUD_deque.insert( HUD_deque.begin(), HIptr);
-
-        }//for - cards
+            HUD_deque.insert(HUD_deque.begin(), HIptr);
+        }
     }
 
     const SGPropertyNode * label_group = node->getNode("labels");
     if (label_group != 0) {
         int nLabels = label_group->nChildren();
         for (int j = 0; j < nLabels; j++) {
-
-            HIptr = readLabel(label_group->getChild(j));
-            HUD_deque.insert( HUD_deque.begin(), HIptr);
-
-        }//for - labels
+            HIptr = static_cast<instr_item *>(new instr_label(label_group->getChild(j)));
+            HUD_deque.insert(HUD_deque.begin(), HIptr);
+        }
     }
 
     const SGPropertyNode * tbi_group = node->getNode("tbis");
     if (tbi_group != 0) {
         int nTbis = tbi_group->nChildren();
         for (int j = 0; j < nTbis; j++) {
-
             HIptr = readTBI(tbi_group->getChild(j));
             HUD_deque.insert( HUD_deque.begin(), HIptr);
-
-        }//for - tbis
+        }
     }
 
     const SGPropertyNode * rwy_group = node->getNode("runways");
     if (rwy_group != 0) {
         int nRwy = rwy_group->nChildren();
         for (int j = 0; j < nRwy; j++) {
-            SG_LOG( SG_COCKPIT, SG_DEBUG,
-                    "**************  Reading runway properties" );
+            SG_LOG(SG_COCKPIT, SG_DEBUG, "***  Reading runway properties ***");
             HIptr = readRunway(rwy_group->getChild(j));
             HUD_deque.insert( HUD_deque.begin(), HIptr);
-
-        }//for - runways
+        }
     }
     return 0;
 }//end readinstrument
@@ -838,7 +575,7 @@ void fgHUDReshape(void) {
 void fgUpdateHUD( void ) {
 
     static const SGPropertyNode *enable3d_node = fgGetNode("/sim/hud/enable3d");
-    if( HUD_style == 1 && enable3d_node->getBoolValue() ) {
+    if ( HUD_style == 1 && enable3d_node->getBoolValue() ) {
         fgUpdateHUDVirtual();
         return;
     }
@@ -846,7 +583,7 @@ void fgUpdateHUD( void ) {
     static const float normal_aspect = float(640) / float(480);
     // note: aspect_ratio is Y/X
     float current_aspect = 1.0f/globals->get_current_view()->get_aspect_ratio();
-    if( current_aspect > normal_aspect ) {
+    if ( current_aspect > normal_aspect ) {
         float aspect_adjust = current_aspect / normal_aspect;
         float adjust = 320.0f*aspect_adjust - 320.0f;
         fgUpdateHUD( -adjust, 0.0f, 640.0f+adjust, 480.0f );
@@ -877,7 +614,8 @@ void fgUpdateHUDVirtual()
     lookat[0] = -sin(SG_DEGREES_TO_RADIANS * view->getHeadingOffset_deg());
     lookat[1] = tan(SG_DEGREES_TO_RADIANS * view->getPitchOffset_deg());
     lookat[2] = -cos(SG_DEGREES_TO_RADIANS * view->getHeadingOffset_deg());
-    if(fabs(lookat[1]) > 9999) lookat[1] = 9999; // FPU sanity
+    if (fabs(lookat[1]) > 9999)
+        lookat[1] = 9999; // FPU sanity
     gluLookAt(0, 0, 0, lookat[0], lookat[1], lookat[2], 0, 1, 0);
 
     // Map the -1:1 square to a 55.0x41.25 degree wide patch at z=1.
@@ -929,7 +667,7 @@ void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
 
 void drawHUD()
 {
-    if( !HUD_deque.size() ) // Trust everyone, but ALWAYS cut the cards!
+    if ( !HUD_deque.size() ) // Trust everyone, but ALWAYS cut the cards!
         return;
 
     HUD_TextList.erase();
@@ -960,9 +698,9 @@ void drawHUD()
         glEnable(GL_LINE_SMOOTH);
         glAlphaFunc(GL_GREATER, HUD->alphaClamp());
         glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);
-        glLineWidth(1.5);
+        //glLineWidth(1.5);
     } else {
-        glLineWidth(1.0);
+        //glLineWidth(1.0);
     }
 
     HUD->setColor();
@@ -1034,7 +772,7 @@ void drawHUD()
     if (HUD->isAntialiased()) {
         glDisable(GL_ALPHA_TEST);
         glDisable(GL_LINE_SMOOTH);
-        glLineWidth(1.0);
+        //glLineWidth(1.0);
     }
 
     glEnable(GL_DEPTH_TEST);
@@ -1114,9 +852,12 @@ void HUD_Properties::valueChanged(SGPropertyNode *node)
             i = 0;
         SGPropertyNode *n = fgGetNode("/sim/hud/palette", true);
         if ((n = n->getChild("color", i, false))) {
-            _red->setFloatValue(n->getFloatValue("red", 1.0));
-            _green->setFloatValue(n->getFloatValue("green", 1.0));
-            _blue->setFloatValue(n->getFloatValue("blue", 1.0));
+            if (n->hasValue("red"))
+                _red->setFloatValue(n->getFloatValue("red", 1.0));
+            if (n->hasValue("green"))
+                _green->setFloatValue(n->getFloatValue("green", 1.0));
+            if (n->hasValue("blue"))
+                _blue->setFloatValue(n->getFloatValue("blue", 1.0));
             if (n->hasValue("alpha"))
                 _alpha->setFloatValue(n->getFloatValue("alpha", 0.67));
             if (n->hasValue("alpha-clamp"))