Set the key SGModelLib callback to make aircraft-dir OSG loading work.

[flightgear.git] / src / Cockpit / hud.hxx

diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index 8c7d1632813282697f8639bbfa8f49e939ce7b25..bec30f5539a6c570ca185b1c4efc3906bc3e3eb1 100644 (file)
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -54,16 +54,14 @@ namespace osg {
 #include <simgear/constants.h>
 
 #include <Include/fg_typedefs.h>
-#include <Aircraft/aircraft.hxx>
 #include <Aircraft/controls.hxx>
 #include <FDM/flight.hxx>
 #include <GUI/gui.h>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include <Main/viewmgr.hxx>
-#include <Airports/runways.hxx>
 
-#include <plib/sg.h>
+class FGRunway;
 
 using std::deque;
 using std::vector;
@@ -135,46 +133,6 @@ extern float get_mach( void );
 extern char *coord_format_lat(float);
 extern char *coord_format_lon(float);
 
-// $$$ begin - added, VS Renganathan, 13 Oct 2K
-extern float get_anzg (void);
-extern float get_Vx (void);
-extern float get_Vy (void);
-extern float get_Vz (void);
-extern float get_Ax (void);
-extern float get_Ay (void);
-extern float get_Az (void);
-extern int get_iaux1 (void);
-extern int get_iaux2 (void);
-extern int get_iaux3 (void);
-extern int get_iaux4 (void);
-extern int get_iaux5 (void);
-extern int get_iaux6 (void);
-extern int get_iaux7 (void);
-extern int get_iaux8 (void);
-extern int get_iaux9 (void);
-extern int get_iaux10 (void);
-extern int get_iaux11 (void);
-extern int get_iaux12 (void);
-extern float get_aux1(void);
-extern float get_aux2(void);
-extern float get_aux3(void);
-extern float get_aux4(void);
-extern float get_aux5 (void);
-extern float get_aux6 (void);
-extern float get_aux7 (void);
-extern float get_aux8(void);
-extern float get_aux9(void);
-extern float get_aux10(void);
-extern float get_aux11(void);
-extern float get_aux12(void);
-extern float get_aux13(void);
-extern float get_aux14(void);
-extern float get_aux15(void);
-extern float get_aux16(void);
-extern float get_aux17(void);
-extern float get_aux18(void);
-// $$$ end - added, VS Renganathan, 13 Oct 2K
-
 extern char *get_formated_gmt_time( void );
 
 enum  hudinstype{ HUDno_instr,
@@ -275,7 +233,7 @@ public:
 
     void Draw(fntRenderer *fnt) {
         if (digit) {
-            int c=0,i=0;
+            int c=0;
             
             int p=4;
 
@@ -509,7 +467,7 @@ private:
         bool drawLine(const sgdVec3& a1, const sgdVec3& a2,
                 const sgdVec3& p1, const sgdVec3& p2);
         void drawArrow();
-        bool get_active_runway(FGRunway& rwy);
+        FGRunway* get_active_runway();
         void get_rwy_points(sgdVec3 *points);
         void setLineWidth(void);
 
@@ -517,7 +475,7 @@ private:
         double mm[16],pm[16], arrowScale, arrowRad, lnScale;
         double scaleDist, default_pitch, default_heading;
         GLint view[4];
-        FGRunway runway;
+        FGRunway* runway;
         FGViewer* cockpit_view;
         unsigned short stippleOut, stippleCen;
         bool drawIA, drawIAAlways;
@@ -735,8 +693,8 @@ public:
 };
 
 
-extern int  fgHUDInit( fgAIRCRAFT * /* current_aircraft */ );
-extern int  fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ );
+extern int  fgHUDInit();
+extern int  fgHUDInit2();
 extern void fgUpdateHUD( osg::State* );
 extern void fgUpdateHUD( osg::State*, GLfloat x_start, GLfloat y_start,
                          GLfloat x_end, GLfloat y_end );