Added static port system and a new altimeter model connected to it.

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

diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index 336a4497bb4866dc989534e338a593fff7e65a5a..2ddfb3a55c21f74b7111598f7d86bd28a570faec 100644 (file)
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -87,44 +87,19 @@ enum VIEW_MODES{ HUD_VIEW, PANEL_VIEW, CHASE_VIEW, TOWER_VIEW };
 // controls can be used to set intensity and appropriate color. This will
 // be moved.
 // Hud general constants
-#define DAY                1
-#define NIGHT              2
-#define BRT_BLACK          3
-#define BRT_DARK           4
-#define BRT_MEDIUM         5
-#define BRT_LIGHT          6
-#define SIZE_SMALL         7
-#define SIZE_LARGE         8
+#define HUD_DAY                1
+#define HUD_NIGHT              2
+#define HUD_BRT_BLACK          3
+#define HUD_BRT_DARK           4
+#define HUD_BRT_MEDIUM         5
+#define HUD_BRT_LIGHT          6
 
 // Label constants
-#define SMALL              1
-#define LARGE              2
-
-#define BLINK              3
-#define NOBLINK            4
+#define HUD_FONT_SMALL     1
+#define HUD_FONT_LARGE     2
 
 enum fgLabelJust{ LEFT_JUST, CENTER_JUST, RIGHT_JUST } ;
 
-// Ladder constants
-#define NONE               1
-#define UPPER_LEFT         2
-#define UPPER_CENTER       3
-#define UPPER_RIGHT        4
-#define CENTER_RIGHT       5
-#define LOWER_RIGHT        6
-#define LOWER_CENTER       7
-#define LOWER_LEFT         8
-#define CENTER_LEFT        9
-#define SOLID_LINES       10
-#define DASHED_LINES      11
-#define DASHED_NEG_LINES  12
-
-
-#define HORIZON_FIXED   1
-#define HORIZON_MOVING  2
-#define LABEL_COUNTER   1
-#define LABEL_WARNING   2
-
 #define HUDS_AUTOTICKS           0x0001
 #define HUDS_VERT                0x0002
 #define HUDS_HORZ                0x0000
@@ -172,6 +147,7 @@ extern float get_elev_trimval( void );
 extern float get_rudderval   ( void );
 extern float get_speed       ( void );
 extern float get_aoa         ( void );
+extern float get_nlf         ( void );
 extern float get_roll        ( void );
 extern float get_pitch       ( void );
 extern float get_heading     ( void );
@@ -358,7 +334,7 @@ public:
                 fnt->puts(tmp1);
 
                 fnt->setPointSize(12);
-                char tmp2[p1+1];
+                char tmp2[64];
                 strncpy(tmp2,msg,p1);
                 tmp2[p1]='\0';
                         
@@ -380,7 +356,7 @@ public:
 
     void Draw()
     {
-        puDrawString ( guiFnt, msg, FloatToInt(x), FloatToInt(y) );
+        guiFnt.drawString( msg, FloatToInt(x), FloatToInt(y) );
     }
 };
 
@@ -566,8 +542,8 @@ public:
     {
         glBegin(GL_LINE_LOOP);  // Use polygon to approximate a circle 
         for(int count=0; count<25; count++) {             
-            float cosine = r * cos(count * 2 * M_PI/10.0); 
-            float sine =   r * sin(count * 2 * M_PI/10.0); 
+            float cosine = r * cos(count * 2 * SG_PI/10.0); 
+            float sine =   r * sin(count * 2 * SG_PI/10.0); 
             glVertex2f(cosine+x1, sine+y1);
         }     
         glEnd();