]> git.mxchange.org Git - flightgear.git/blobdiff - src/Cockpit/hud.cxx
adapt to changes in sg_exception interface
[flightgear.git] / src / Cockpit / hud.cxx
index 491e9ad5379e2db55ec737b87057b40874cb8461..f9b9f3a9749b9cac69fb896ef681d5ed2f79d22b 100644 (file)
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
 
-#include STL_STRING
-#include STL_FSTREAM
+#include <string>
+#include <fstream>
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#ifdef __BORLANDC__
-#  define exception c_exception
-#endif
-
 #include <math.h>
-
 #include <stdlib.h>
-#include <stdio.h>             // char related functions
-#include <string.h>            // strcmp()
-
-#include SG_GLU_H
+#include <stdio.h>              // char related functions
+#include <string.h>             // strcmp()
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/props/props.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props_io.hxx>
+
+#include <osg/GLU>
 
 #include <Aircraft/aircraft.hxx>
-#include <Autopilot/xmlauto.hxx>
-#include <GUI/new_gui.hxx>
+//#include <Autopilot/xmlauto.hxx>
+#include <GUI/new_gui.hxx>           // FGFontCache
 #include <Main/globals.hxx>
-#include <Main/fg_props.hxx>
 #include <Scenery/scenery.hxx>
-
-#if defined (__sun) || defined ( __sgi )
-extern "C" {
-    extern void *memmove(void *, const void *, size_t);
-}
-#endif
+#include <Airports/runways.hxx>
 
 #include "hud.hxx"
 
 
-static HUD_Properties *HUD;
+static HUD_Properties *HUDprop = 0;
 
 static char units[5];
 
-// The following routines obtain information concerning the aircraft's
-// current state and return it to calling instrument display routines.
-// They should eventually be member functions of the aircraft.
-//
-
-deque< instr_item * > HUD_deque;
+deque<SGSharedPtr<instr_item> > HUD_deque;
 
-fgTextList         HUD_TextList;
-fgLineList         HUD_LineList;
-fgLineList         HUD_StippleLineList;
+fgTextList HUD_TextList;
+fgLineList HUD_LineList;
+fgLineList HUD_StippleLineList;
 
 fntRenderer *HUDtext = 0;
 fntTexFont *HUD_Font = 0;
@@ -89,99 +69,19 @@ 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;
-static float   maxValue;
-static float   minValue;
-static float   scaling;
-static UINT    major_divs;
-static UINT    minor_divs;
-static UINT    modulator;
-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;
-static bool    tick_left;
-static bool    cap_bottom;
-static bool    cap_top;
-static bool    cap_right;
-static bool    cap_left;
-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 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();
+static void drawHUD(osg::State*);
+static void fgUpdateHUDVirtual(osg::State*);
+
 
 class locRECT {
 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)
@@ -194,420 +94,7 @@ locRECT :: locRECT( UINT left, UINT top, UINT right, UINT bottom)
 }
 // #define DEBUG
 
-//========================= End of Class Implementations===================
-// fgHUDInit
-//
-// Constructs a HUD object and then adds in instruments. At the present
-// the instruments are hard coded into the routine. Ultimately these need
-// to be defined by the aircraft's instrumentation records so that the
-// display for a Piper Cub doesn't show the speed range of a North American
-// 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)
-{
-
-    instr_item *p;
-
-    name                       = node->getStringValue("name");
-    x                          = node->getIntValue("x");
-    y                          = node->getIntValue("y");
-    width                      = node->getIntValue("width");
-    height                     = node->getIntValue("height");
-    loadfn                     = node->getStringValue("loadfn");
-    options                    = node->getIntValue("options");
-    maxValue           = node->getFloatValue("maxValue");
-    minValue           = node->getFloatValue("minValue");
-    scaling                    = node->getFloatValue("disp_scaling");
-    major_divs         = node->getIntValue("major_divs");
-    minor_divs         = node->getIntValue("minor_divs");
-    modulator          = node->getIntValue("modulator");
-    span_units         = node->getFloatValue("value_span");
-    type                       = node->getStringValue("type");
-    tick_bottom            = node->getBoolValue("tick_bottom",false);
-    tick_top           = node->getBoolValue("tick_top",false);
-    tick_right         = node->getBoolValue("tick_right",false);
-    tick_left          = node->getBoolValue("tick_left",false);
-    cap_bottom         = node->getBoolValue("cap_bottom",false);
-    cap_top                    = node->getBoolValue("cap_top",false);
-    cap_right          = node->getBoolValue("cap_right",false);
-    cap_left           = node->getBoolValue("cap_left",false);
-    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
-    working                    = node->getBoolValue("working");
-    radius                     = node->getFloatValue("radius"); //suma
-    divisions          = node->getIntValue("divisions"); //suma
-    zoom                       = node->getIntValue("zoom"); //suma
-
-    SG_LOG(SG_INPUT, SG_INFO, "Done reading instrument " << name);
-
-
-    if(type=="gauge") {
-        span_units = maxValue - minValue;
-    }
-
-    if (loadfn=="anzg") {
-        load_fn = get_anzg;
-    } else if (loadfn=="heading") {
-        load_fn = get_heading;
-    } else if (loadfn=="aoa") {
-        load_fn = get_aoa;
-    } else if (loadfn=="climb") {
-        load_fn = get_climb_rate;
-    } else if (loadfn=="altitude") {
-        load_fn = get_altitude;
-    } else if (loadfn=="agl") {
-        load_fn = get_agl;
-    } else if (loadfn=="speed") {
-        load_fn = get_speed;
-    } else if (loadfn=="view_direction") {
-        load_fn = get_view_direction;
-    } else if (loadfn=="aileronval") {
-        load_fn = get_aileronval;
-    } else if (loadfn=="elevatorval") {
-        load_fn = get_elevatorval;
-    } else if (loadfn=="elevatortrimval") {
-        load_fn = get_elev_trimval;
-    } else if (loadfn=="rudderval") {
-        load_fn = get_rudderval;
-    } else if (loadfn=="throttleval") {
-        load_fn = get_throttleval;
-    }
-
-
-    if ( (type == "dial") | (type == "tape") ) {
-        p = (instr_item *) new hud_card( x,
-                                         y,  
-                                         width,
-                                         height,
-                                         load_fn,
-                                         options,
-                                         maxValue, minValue,
-                                         scaling,
-                                         major_divs, minor_divs,
-                                         modulator,
-                                         dp_showing,
-                                         span_units,
-                                         type,
-                                         tick_bottom,
-                                         tick_top,
-                                         tick_right,
-                                         tick_left,
-                                         cap_bottom,
-                                         cap_top,
-                                         cap_right,
-                                         cap_left,
-                                         marker_off,
-                                         enable_pointer,
-                                         type_pointer,
-                                         type_tick,//hud
-                                         length_tick,//hud
-                                         working,
-                                         radius, //suma
-                                         divisions, //suma
-                                         zoom  //suma
-                                         );
-    } else {
-        p = (instr_item *) new  gauge_instr( x,            // x
-                                             y,  // y
-                                             width,            // width
-                                             height,            // height
-                                             load_fn, // data source
-                                             options,
-                                             scaling,
-                                             maxValue,minValue,
-                                             major_divs, minor_divs,
-                                             dp_showing,
-                                             modulator,
-                                             working);
-    }
-
-    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)
-{
-
-    instr_item *p;
-
-    name           = node->getStringValue("name");
-    x              = node->getIntValue("x");
-    y              = node->getIntValue("y");
-    width          = node->getIntValue("width");
-    height         = node->getIntValue("height");
-    maxBankAngle   = node->getFloatValue("maxBankAngle");
-    maxSlipAngle   = node->getFloatValue("maxSlipAngle");
-    gap_width      = node->getIntValue("gap_width");
-    working        = node->getBoolValue("working");
-    tsi                           = node->getBoolValue("tsi"); //suma
-    rad                           = node->getFloatValue("rad"); //suma
-
-    SG_LOG(SG_INPUT, SG_INFO, "Done reading instrument " << name);
-
-
-    p = (instr_item *) new fgTBI_instr(        x,
-                                        y,  
-                                        width,
-                                        height,
-                                        get_roll,
-                                        get_sideslip,
-                                        maxBankAngle, 
-                                        maxSlipAngle,
-                                        gap_width,
-                                        working,
-                                        tsi, //suma
-                                        rad); //suma
-
-    return p;
-} //end readTBI
-
-static instr_item * 
-readRunway(const SGPropertyNode * node) {
-       name    = node->getStringValue("name");
-       x       = node->getIntValue("x");
-       y       = node->getIntValue("y");
-       width = node->getIntValue("width");
-       height = node->getIntValue("height");
-       scaling = node->getDoubleValue("scale");
-       working = node->getBoolValue("working",true);
-       runway_instr *ri = new runway_instr(x,y,width,height,scaling,working);
-       double scale = node->getDoubleValue("arrow_scale",1.0); 
-       ri->setDrawArrow((scale>0)?true:false);
-       ri->setDrawArrowAlways((scale>0)?node->getBoolValue("arrow_always"):false);
-       ri->setStippleOutline(node->getIntValue("outer_stipple",0xFFFF));
-       ri->setStippleCenterline(node->getIntValue("center_stipple",0xFFFF));
-       ri->setArrowRotationRadius(node->getDoubleValue("arrow_radius"));
-       ri->setArrowScale(scale);
-       ri->setLineScale(node->getDoubleValue("line_scale",1.0));
-       ri->setScaleDist(node->getDoubleValue("scale_dist_nm"));
-       SG_LOG(SG_INPUT, SG_INFO, "Done reading instrument " << name);
-       return (instr_item *) ri;
-}
 
 
 int readInstrument(const SGPropertyNode * node)
@@ -616,7 +103,7 @@ int readInstrument(const SGPropertyNode * node)
         = fgGetNode("/sim/startup/units");
 
     instr_item *HIptr;
-    
+
     if ( !strcmp(startup_units_node->getStringValue(), "feet") ) {
         strcpy(units, " ft");
     } else {
@@ -628,62 +115,60 @@ 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
+            const char *type = card_group->getChild(j)->getStringValue("type", "gauge");
+
+            if (!strcmp(type, "gauge"))
+                HIptr = static_cast<instr_item *>(new gauge_instr(card_group->getChild(j)));
+            else if (!strcmp(type, "dial") || !strcmp(type, "tape"))
+                HIptr = static_cast<instr_item *>(new hud_card(card_group->getChild(j)));
+            else {
+                SG_LOG(SG_INPUT, SG_WARN, "HUD: unknown 'card' type: " << type);
+                continue;
+            }
+            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
+            HIptr = static_cast<instr_item *>(new fgTBI_instr(tbi_group->getChild(j)));
+            HUD_deque.insert(HUD_deque.begin(), HIptr);
+        }
     }
-    
+
     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" );
-            HIptr = readRunway(rwy_group->getChild(j));
-            HUD_deque.insert( HUD_deque.begin(), HIptr);
-
-        }//for - runways
-    }    
+            HIptr = static_cast<instr_item *>(new runway_instr(rwy_group->getChild(j)));
+            HUD_deque.insert(HUD_deque.begin(), HIptr);
+        }
+    }
     return 0;
-}//end readinstrument
+} //end readinstrument
 
 
-int readHud( istream &input ) 
+int readHud( istream &input )
 {
 
     SGPropertyNode root;
@@ -694,13 +179,15 @@ int readHud( istream &input )
         guiErrorMessage("Error reading HUD: ", e);
         return 0;
     }
-  
-       
+
+
     SG_LOG(SG_INPUT, SG_INFO, "Read properties for  " <<
            root.getStringValue("name"));
 
+    if (!root.getNode("depreciated"))
+        SG_LOG(SG_INPUT, SG_ALERT, "WARNING: use of depreciated old HUD");
 
-    HUD_deque.erase( HUD_deque.begin(), HUD_deque.end());  // empty the HUD deque
+    HUD_deque.erase( HUD_deque.begin(), HUD_deque.end());
 
 
     SG_LOG(SG_INPUT, SG_INFO, "Reading Hud instruments");
@@ -709,7 +196,7 @@ int readHud( istream &input )
     int nInstruments = instrument_group->nChildren();
 
     for (int i = 0; i < nInstruments; i++) {
-               
+
         const SGPropertyNode * node = instrument_group->getChild(i);
 
         SGPath path( globals->get_fg_root() );
@@ -726,7 +213,7 @@ int readHud( istream &input )
         } catch (const sg_exception &e) {
             guiErrorMessage("Error reading HUD instrument: ", e);
             continue;
-        } 
+        }
         readInstrument(&root2);
     }//for loop(i)
 
@@ -734,6 +221,14 @@ int readHud( istream &input )
 }
 
 
+// fgHUDInit
+//
+// Constructs a HUD object and then adds in instruments. At the present
+// the instruments are hard coded into the routine. Ultimately these need
+// to be defined by the aircraft's instrumentation records so that the
+// display for a Piper Cub doesn't show the speed range of a North American
+// mustange and the engine readouts of a B36!
+//
 int fgHUDInit( fgAIRCRAFT * /* current_aircraft */ )
 {
 
@@ -742,10 +237,10 @@ int fgHUDInit( fgAIRCRAFT * /* current_aircraft */ )
     SG_LOG( SG_COCKPIT, SG_INFO, "Initializing current aircraft HUD" );
 
     string hud_path =
-       fgGetString("/sim/hud/path", "Huds/Default/default.xml");
+        fgGetString("/sim/hud/path", "Huds/Default/default.xml");
     SGPath path(globals->get_fg_root());
     path.append(hud_path);
-       
+
     ifstream input(path.c_str());
     if (!input.good()) {
         SG_LOG(SG_INPUT, SG_ALERT,
@@ -755,8 +250,6 @@ int fgHUDInit( fgAIRCRAFT * /* current_aircraft */ )
         input.close();
     }
 
-    fgHUDReshape();
-
     if ( HUDtext ) {
         // this chunk of code is not necessarily thread safe if the
         // compiler optimizer reorders these statements.  Note that
@@ -768,9 +261,11 @@ int fgHUDInit( fgAIRCRAFT * /* current_aircraft */ )
     }
 
     FGFontCache *fc = globals->get_fontcache();
-    HUD_Font = fc->getTexFont(fgGetString("/sim/hud/font/name", "Helvetica.txf"));
+    const char* fileName = fgGetString("/sim/hud/font/name", "Helvetica.txf");
+    HUD_Font = fc->getTexFont(fileName);
     if (!HUD_Font)
-        throw sg_throwable(string("/sim/hud/font/name is not a texture font"));
+        throw sg_io_exception("/sim/hud/font/name is not a texture font",
+                              sg_location(fileName));
 
     HUD_TextSize = fgGetFloat("/sim/hud/font/size", 10);
 
@@ -779,11 +274,13 @@ int fgHUDInit( fgAIRCRAFT * /* current_aircraft */ )
     HUDtext->setPointSize(HUD_TextSize);
     HUD_TextList.setFont( HUDtext );
 
-    HUD = new HUD_Properties;
+    if (!HUDprop)
+        HUDprop = new HUD_Properties;
     return 0;  // For now. Later we may use this for an error code.
 
 }
 
+
 int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
 {
 
@@ -804,32 +301,12 @@ int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
         input.close();
     }
 
+    if (!HUDprop)
+        HUDprop = new HUD_Properties;
     return 0;  // For now. Later we may use this for an error code.
 
 }
-//$$$ End - added, Neetha, 28 Nov 2k  
-
-
-void fgHUDReshape(void) {
-#if 0
-    if ( HUDtext ) {
-        // this chunk of code is not necessarily thread safe if the
-        // compiler optimizer reorders these statements.  Note that
-        // "delete ptr" does not set "ptr = NULL".  We have to do that
-        // ourselves.
-        fntRenderer *tmp = HUDtext;
-        HUDtext = NULL;
-        delete tmp;
-    }
-
-    HUD_TextSize = fgGetInt("/sim/startup/xsize") / 60;
-    HUD_TextSize = 10;
-    HUDtext = new fntRenderer();
-    HUDtext -> setFont      ( guiFntHandle ) ;
-    HUDtext -> setPointSize ( HUD_TextSize ) ;
-    HUD_TextList.setFont( HUDtext );
-#endif
-}
+//$$$ End - added, Neetha, 28 Nov 2k
 
 
 // fgUpdateHUD
@@ -838,30 +315,29 @@ void fgHUDReshape(void) {
 // the HUD object with requests for redraw. Kinda. It will when this is
 // all C++.
 //
-void fgUpdateHUD( void ) {
-       
+void fgUpdateHUD( osg::State* state ) {
+
     static const SGPropertyNode *enable3d_node = fgGetNode("/sim/hud/enable3d");
-    if( HUD_style == 1 && enable3d_node->getBoolValue() )
-    {
-        fgUpdateHUDVirtual();
+    if ( HUD_style == 1 && enable3d_node->getBoolValue() ) {
+        fgUpdateHUDVirtual(state);
         return;
     }
-    
+
     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 );
+        fgUpdateHUD( state, -adjust, 0.0f, 640.0f+adjust, 480.0f );
     } else {
         float aspect_adjust = normal_aspect / current_aspect;
         float adjust = 240.0f*aspect_adjust - 240.0f;
-        fgUpdateHUD( 0.0f, -adjust, 640.0f, 480.0f+adjust );
+        fgUpdateHUD( state, 0.0f, -adjust, 640.0f, 480.0f+adjust );
     }
 }
 
-void fgUpdateHUDVirtual()
+void fgUpdateHUDVirtual(osg::State* state)
 {
     FGViewer* view = globals->get_current_view();
 
@@ -875,13 +351,14 @@ void fgUpdateHUDVirtual()
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
     glLoadIdentity();
-  
+
     // Standard fgfs view direction computation
     float lookat[3];
     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.
@@ -902,7 +379,7 @@ void fgUpdateHUDVirtual()
     glTranslatef(-320, -240, -1);
 
     // Do the deed
-    drawHUD();
+    drawHUD(state);
 
     // Clean up our mess
     glMatrixMode(GL_PROJECTION);
@@ -911,7 +388,8 @@ void fgUpdateHUDVirtual()
     glPopMatrix();
 }
 
-void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
+
+void fgUpdateHUD( osg::State* state, GLfloat x_start, GLfloat y_start,
                   GLfloat x_end, GLfloat y_end )
 {
     glMatrixMode(GL_PROJECTION);
@@ -923,7 +401,7 @@ void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
     glPushMatrix();
     glLoadIdentity();
 
-    drawHUD();
+    drawHUD(state);
 
     glMatrixMode(GL_PROJECTION);
     glPopMatrix();
@@ -931,16 +409,16 @@ void fgUpdateHUD( GLfloat x_start, GLfloat y_start,
     glPopMatrix();
 }
 
-void drawHUD()
+
+void drawHUD(osg::State* state)
 {
-    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();
     HUD_LineList.erase();
     // HUD_StippleLineList.erase();
-  
+
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_LIGHTING);
 
@@ -955,25 +433,30 @@ void drawHUD()
     static char hud_wp2_text[256];
     static char hud_alt_text[256];
 
-    if (HUD->isAntialiased()) {
+    glEnable(GL_BLEND);
+    if (HUDprop->isTransparent())
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    else
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    if (HUDprop->isAntialiased()) {
         glEnable(GL_LINE_SMOOTH);
-        //       glEnable(GL_BLEND);
-        glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
-        glHint(GL_LINE_SMOOTH_HINT,GL_DONT_CARE);
-        glLineWidth(2.0);
+        glAlphaFunc(GL_GREATER, HUDprop->alphaClamp());
+        glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);
+        //glLineWidth(1.5);
     } else {
-        glLineWidth(1.0);
+        //glLineWidth(1.0);
     }
 
-    HUD->setColor();
+    HUDprop->setColor();
     for_each(HUD_deque.begin(), HUD_deque.end(), HUDdraw());
 
-    HUD_TextList.add( fgText(40, 10, get_formated_gmt_time(), 0) );
+    //HUD_TextList.add( fgText(40, 10, get_formated_gmt_time(), 0) );
 
 
     int apY = 480 - 80;
-    
-    
+
+
     if (strcmp( heading_enabled->getStringValue(), "dg-heading-hold") == 0 ) {
         snprintf( hud_hdg_text, 256, "hdg = %.1f\n",
                   fgGetDouble("/autopilot/settings/heading-bug-deg") );
@@ -987,7 +470,7 @@ void drawHUD()
 
         string wp0_id = fgGetString( "/autopilot/route-manager/wp[0]/id" );
         if ( wp0_id.length() > 0 ) {
-            snprintf( hud_wp0_text, 256, "%5s %6.1fnm %s", wp0_id.c_str(), 
+            snprintf( hud_wp0_text, 256, "%5s %6.1fnm %s", wp0_id.c_str(),
                       fgGetDouble( "/autopilot/route-manager/wp[0]/dist" ),
                       fgGetString( "/autopilot/route-manager/wp[0]/eta" ) );
             HUD_TextList.add( fgText( 40, apY, hud_wp0_text ) );
@@ -995,7 +478,7 @@ void drawHUD()
         }
         string wp1_id = fgGetString( "/autopilot/route-manager/wp[1]/id" );
         if ( wp1_id.length() > 0 ) {
-            snprintf( hud_wp1_text, 256, "%5s %6.1fnm %s", wp1_id.c_str(), 
+            snprintf( hud_wp1_text, 256, "%5s %6.1fnm %s", wp1_id.c_str(),
                       fgGetDouble( "/autopilot/route-manager/wp[1]/dist" ),
                       fgGetString( "/autopilot/route-manager/wp[1]/eta" ) );
             HUD_TextList.add( fgText( 40, apY, hud_wp1_text ) );
@@ -1003,14 +486,14 @@ void drawHUD()
         }
         string wp2_id = fgGetString( "/autopilot/route-manager/wp-last/id" );
         if ( wp2_id.length() > 0 ) {
-            snprintf( hud_wp2_text, 256, "%5s %6.1fnm %s", wp2_id.c_str(), 
+            snprintf( hud_wp2_text, 256, "%5s %6.1fnm %s", wp2_id.c_str(),
                       fgGetDouble( "/autopilot/route-manager/wp-last/dist" ),
                       fgGetString( "/autopilot/route-manager/wp-last/eta" ) );
             HUD_TextList.add( fgText( 40, apY, hud_wp2_text ) );
             apY -= 15;
         }
     }
-  
+
     if ( strcmp( altitude_enabled->getStringValue(), "altitude-hold" ) == 0 ) {
         snprintf( hud_alt_text, 256, "alt = %.0f\n",
                   fgGetDouble("/autopilot/settings/target-altitude-ft") );
@@ -1024,7 +507,6 @@ void drawHUD()
     }
 
     HUD_TextList.draw();
-
     HUD_LineList.draw();
 
     // glEnable(GL_LINE_STIPPLE);
@@ -1032,54 +514,118 @@ void drawHUD()
     // HUD_StippleLineList.draw();
     // glDisable(GL_LINE_STIPPLE);
 
-    if (HUD->isAntialiased()) {
-        // glDisable(GL_BLEND);
+    if (HUDprop->isAntialiased()) {
+        glDisable(GL_ALPHA_TEST);
         glDisable(GL_LINE_SMOOTH);
-        glLineWidth(1.0);
+        //glLineWidth(1.0);
     }
 
+    if (HUDprop->isTransparent())
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_LIGHTING);
 }
 
 
+void fgTextList::draw()
+{
+    if (!Font)
+        return;
+
+    vector<fgText>::iterator curString = List.begin();
+    vector<fgText>::iterator lastString = List.end();
+
+    glPushAttrib(GL_COLOR_BUFFER_BIT);
+    glEnable(GL_TEXTURE_2D);
+    glEnable(GL_BLEND);
+    if (HUDprop->isTransparent())
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    else
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
+    if (HUDprop->isAntialiased()) {
+        glEnable(GL_ALPHA_TEST);
+        glAlphaFunc(GL_GREATER, HUDprop->alphaClamp());
+    }
+
+    Font->begin();
+    for (; curString != lastString; curString++)
+        curString->Draw(Font);
+    Font->end();
+
+    glDisable(GL_TEXTURE_2D);
+    glPopAttrib();
+}
 
 
 // HUD property listener class
 //
 HUD_Properties::HUD_Properties() :
-    _r(1.0),
-    _g(1.0),
-    _b(1.0)
+    _current(fgGetNode("/sim/hud/current-color", true)),
+    _visibility(fgGetNode("/sim/hud/visibility", true)),
+    _antialiasing(fgGetNode("/sim/hud/color/antialiased", true)),
+    _transparency(fgGetNode("/sim/hud/color/transparent", true)),
+    _red(fgGetNode("/sim/hud/color/red", true)),
+    _green(fgGetNode("/sim/hud/color/green", true)),
+    _blue(fgGetNode("/sim/hud/color/blue", true)),
+    _alpha(fgGetNode("/sim/hud/color/alpha", true)),
+    _alpha_clamp(fgGetNode("/sim/hud/color/alpha-clamp", true)),
+    _brightness(fgGetNode("/sim/hud/color/brightness", true)),
+    _visible(false),
+    _antialiased(false),
+    _transparent(false),
+    _a(0.67),
+    _cl(0.01)
 {
-    _colors = fgGetNode("/sim/hud/colors", true)->getChildren("color");
-    _which = fgGetNode("/sim/hud/current-color", true);
-    _brightness = fgGetNode("/sim/hud/brightness", true);
-    _alpha = fgGetNode("/sim/hud/alpha", true);
-    _visibility = fgGetNode("/sim/hud/visibility", true);
-    _antialiasing = fgGetNode("/sim/hud/antialiased", true);
-
-    _which->addChangeListener(this);
-    _brightness->addChangeListener(this);
-    _alpha->addChangeListener(this);
     _visibility->addChangeListener(this);
-    _antialiasing->addChangeListener(this, true);
+    _antialiasing->addChangeListener(this);
+    _transparency->addChangeListener(this);
+    _red->addChangeListener(this);
+    _green->addChangeListener(this);
+    _blue->addChangeListener(this);
+    _alpha->addChangeListener(this);
+    _alpha_clamp->addChangeListener(this);
+    _brightness->addChangeListener(this);
+    _current->addChangeListener(this, true);
 }
 
 
-void HUD_Properties::valueChanged(SGPropertyNode *n)
+void HUD_Properties::valueChanged(SGPropertyNode *node)
 {
+    if (!strcmp(node->getName(), "current-color")) {
+        int i = node->getIntValue();
+        if (i < 0)
+            i = 0;
+        SGPropertyNode *n = fgGetNode("/sim/hud/palette", true);
+        if ((n = n->getChild("color", i, false))) {
+            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"))
+                _alpha_clamp->setFloatValue(n->getFloatValue("alpha-clamp", 0.01));
+            if (n->hasValue("brightness"))
+                _brightness->setFloatValue(n->getFloatValue("brightness", 0.75));
+            if (n->hasValue("antialiased"))
+                _antialiasing->setBoolValue(n->getBoolValue("antialiased", false));
+            if (n->hasValue("transparent"))
+                _transparency->setBoolValue(n->getBoolValue("transparent", false));
+        }
+    }
     _visible = _visibility->getBoolValue();
+    _transparent = _transparency->getBoolValue();
     _antialiased = _antialiasing->getBoolValue();
     float brt = _brightness->getFloatValue();
-    int w = _which->getIntValue();
-    if (w >= 0 && w < int(_colors.size())) {
-        _r = clamp(brt * _colors[w]->getFloatValue("red", 1.0));
-        _g = clamp(brt * _colors[w]->getFloatValue("green", 1.0));
-        _b = clamp(brt * _colors[w]->getFloatValue("blue", 1.0));
-    }
-    _a = _alpha->getFloatValue();
+    _r = clamp(brt * _red->getFloatValue());
+    _g = clamp(brt * _green->getFloatValue());
+    _b = clamp(brt * _blue->getFloatValue());
+    _a = clamp(_alpha->getFloatValue());
+    _cl = clamp(_alpha_clamp->getFloatValue());
 }
 
 
@@ -1091,3 +637,4 @@ void HUD_Properties::setColor() const
         glColor3f(_r, _g, _b);
 }
 
+