]> git.mxchange.org Git - flightgear.git/blobdiff - src/Cockpit/panel.cxx
Panel code reorganization contributed by David Megginson:
[flightgear.git] / src / Cockpit / panel.cxx
index d1a4382c0938e8b75849ccafa5ae3794d0f40b84..23a29540f06c9ffeaf52fea60a8f4ad40cc54b73 100644 (file)
@@ -2,6 +2,8 @@
 //
 // Written by Friedemann Reinhard, started June 1998.
 //
+//  Major code reorganization by David Megginson, November 1999.
+// 
 // Copyright(C)1998 Friedemann Reinhard-reinhard@theorie2.physik.uni-erlangen.de
 //
 // This program is free software; you can redistribute it and/or
 #include "cockpit.hxx"
 #include "hud.hxx"
 
-GLubyte *imag;
-int imag_width, imag_height;
-
-GLubyte *img;
-int img_width, img_height;
-
-static float value[4];
-static GLuint panel_tex_id[2];
-static GLubyte tex[32][128][3];
-static float alphahist;
-static float Xzoom, Yzoom;
-static Pointer pointer[20];
-static int NumPoint = 4;
-static int i = 0;
-static GLdouble mvmatrix[16];
-static GLdouble matrix[16];
-static double var[20];
-static double offset;
-static float alpha;
-static int n1;
-static int n2;
-
-static GLfloat Wings[] = {
-    -1.25, -28.125, 1.255, -28.125, 1.255, 28.125, -1.25, 28.125};
-    
-static GLfloat Elevator[] = {
-    3.0, -10.9375, 4.5, -10.9375, 4.5, 10.9375, 3.0, 10.9375};
-    
-static GLfloat Rudder[] = {
-    2.0, -0.45, 10.625, -0.45, 10.625, 0.55, 2.0, 0.55};
 
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGPanel.
+////////////////////////////////////////////////////////////////////////
+
+
+// Global panel.
 FGPanel* FGPanel::OurPanel = 0;
 
-// FGPanel::FGPanel() - constructor to initialize the panel.                 
-FGPanel::FGPanel(void){
+
+// Constructor (ensures that the panel is a singleton).
+FGPanel::FGPanel(void) {
     int x, y;
     FILE *f;
     char line[256];
     GLint test;
     GLubyte *tex = new GLubyte[262144];
+    float Xzoom, Yzoom;
     
     if(OurPanel) {
         FG_LOG( FG_GENERAL, FG_ALERT, "Error: only one Panel allowed" );
@@ -102,23 +83,15 @@ FGPanel::FGPanel(void){
     Xzoom = (float)((float)(current_view.get_winWidth())/1024);
     Yzoom = (float)((float)(current_view.get_winHeight())/768);
     
-    test_instr[3] = new FGTexInstrument(144.375, 166.875, 4, 32, 3, 30, 15.0,
-                                        260.0, -20.0, 360, 65, 193, 0);
-    test_instr[4] = new FGTexInstrument(358, 52, 4, 30, 3, 30, -3.0, 3.0, 100,
-                                        440, 66.15, 66, 2);
-    test_instr[5] = new FGTexInstrument(357.5, 167, 5, 25, 4, 30, 0, 10000, 0,
-                                        360, 194, 191, 1);
-    test_instr[6] = new FGTexInstrument(357.5, 167, 5, 32, 3, 30, 0, 3000, 0,
-                                        1080, 194, 191, 1);
-    test_instr[0] = new FGHorizon(251, 166.75);
-    test_instr[1] = new FGTurnCoordinator(143.75, 51.75);
-    //test_instr[2] = new FGRpmGauge(462.5, 133);
-    test_instr[2] = new FGTexInstrument(462.5, 133, 10, 20, 5.5, 60, 0.0, 1.0,
-                                        -67, 180, 174, 83, 3); 
-    
-    // FontList = glGenLists (256);
-    // glListBase(FontList);
-    // InitLists();
+    airspeedIndicator = new FGAirspeedIndicator(144.375, 166.875);
+    verticalSpeedIndicator = new FGVerticalSpeedIndicator(358, 52);
+                               // Each hand of the altimeter is a
+                               // separate instrument for now...
+    altimeter = new FGAltimeter(357.5, 167);
+    altimeter2 = new FGAltimeter2(357.5, 167);
+    horizonIndicator = new FGHorizon(251, 166.75);
+    turnCoordinator = new FGTurnCoordinator(143.75, 51.75);
+    rpmIndicator = new FGRPMIndicator(462.5, 133);
     
 #ifdef GL_VERSION_1_1
     xglGenTextures(2, panel_tex_id);
@@ -165,22 +138,6 @@ FGPanel::FGPanel(void){
     if ((background = read_rgb_texture( (char *)tpath.c_str(), &width,                         &height ))==NULL ){
     }
     
-    //    for(y=0;y<256;y++){
-    //      for(x=0;x<256;x++){
-    //      tex[(y+x*256)*3] = imag[(y+x*256)*3];
-    //      tex[(y+x*256)*3 + 1] = imag[(y+x*256)*3 + 1];
-    //      tex[(y+x*256)*3 + 2] = imag[(y+x*256)*3 + 2];
-    //      tex[(y+x*256)*3 + 3] = (imag[(y+x*256)*3 + 1] + imag[(y+x*256)*3 + 2]   //                               + imag[(y+x*256)*3 + 0])/3;
-    //      
-    //  if((imag[(y+x*256)*3] < 150) && (imag[(y+x*256)*3 +1] < 150) &&         //             (imag[(y+x*256)*3 + 2] < 150) ){
-    //              tex[(y+x*256)*3 + 3] = 0x0;
-    //               }
-    //           else{
-    //             tex[(y+x*256)*3 + 3] = 0xff;
-    //             }
-    //       }
-    // }
-    
     xglPixelZoom(Xzoom, Yzoom);
     xglPixelStorei(GL_UNPACK_ALIGNMENT, 1);
     xglPixelStorei(GL_UNPACK_ROW_LENGTH, 1024);
@@ -206,13 +163,25 @@ FGPanel::FGPanel(void){
     xglPopMatrix();
 }
 
+
+// Destructor.
+FGPanel::~FGPanel ()
+{
+    delete airspeedIndicator;
+    delete verticalSpeedIndicator;
+    delete altimeter;
+    delete altimeter2;
+    delete horizonIndicator;
+    delete turnCoordinator;
+    delete rpmIndicator;
+    OurPanel = 0;
+}
+
+
+// Reinitialize the panel.
 void FGPanel::ReInit( int x, int y, int finx, int finy){
-    fgOPTIONS *o;
-    FGView *v = &current_view;
-    int i;
     GLint buffer;
-    
-    o = &current_options;
+    float Xzoom, Yzoom;
     
     xglDisable(GL_DEPTH_TEST);
     
@@ -249,24 +218,9 @@ void FGPanel::ReInit( int x, int y, int finx, int finy){
     xglEnable(GL_DEPTH_TEST);
 }
 
+
+// Update the panel.
 void FGPanel::Update ( void ) {
-    
-    float alpha;
-    double pitch;
-    double roll;
-    float alpharad;
-    double speed;
-    int i;
-    
-    //    static bool beech_drawn = false;
-    //    char *test = "ALM 100";
-    
-    var[0] = get_speed() /* * 1.4 */; // We have to multiply the airspeed by a 
-    // factor, to simulate flying a Bonanza 
-    var[1] = get_altitude();
-    var[2] = get_climb_rate() / 1000.0; 
-    var[3] = get_throttleval();
-    
     xglMatrixMode(GL_PROJECTION);
     xglPushMatrix();
     xglLoadIdentity();
@@ -284,22 +238,20 @@ void FGPanel::Update ( void ) {
     xglPushMatrix();
     
     xglDisable(GL_LIGHTING);
-    test_instr[3]->Render();
-    test_instr[4]->Render();
-    test_instr[5]->Render();
-    test_instr[6]->Render();
+    airspeedIndicator->Render();
+    verticalSpeedIndicator->Render();
+    altimeter->Render();
+    altimeter2->Render();
+
     xglPopMatrix();
     xglPushMatrix();
     
-    test_instr[1]->Render();
-    test_instr[2]->Render();
-    
-    //   DrawBeechcraftLogo(230, 235, 30, 10);
-    //   DrawScale(144.375, 166.875, 38, 41.0, 18, 340, 44, 2.0, 1.0, 1.0, 1.0);
+    turnCoordinator->Render();
+    rpmIndicator->Render();
     
     xglEnable(GL_LIGHTING);
     
-    test_instr[0]->Render();
+    horizonIndicator->Render();
     
     
     xglDisable(GL_TEXTURE_2D);
@@ -314,8 +266,75 @@ void FGPanel::Update ( void ) {
     xglPopMatrix();
 }
 
-// horizon - Let's draw an artificial horizon using both texture mapping and 
-//           primitive drawing
+
+// fgEraseArea - 'Erases' a drawn Polygon by overlaying it with a textured 
+//                 area. Shall be a method of a panel class once.
+// This should migrate into FGPanel somehow.
+void fgEraseArea(GLfloat *array, int NumVerti, GLfloat texXPos,                                  GLfloat texYPos, GLfloat XPos, GLfloat YPos,                                    int Texid, float ScaleFactor){
+    int i, j;
+    int n;
+    float a;
+    float ififth;
+    
+    xglEnable(GL_TEXTURE_2D);
+    xglEnable(GL_TEXTURE_GEN_S);
+    xglEnable(GL_TEXTURE_GEN_T);
+    glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
+    glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
+    xglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    xglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    xglTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+    xglMatrixMode(GL_TEXTURE);
+    xglLoadIdentity();
+    
+#ifdef GL_VERSION_1_1
+    xglBindTexture(GL_TEXTURE_2D, FGPanel::OurPanel->panel_tex_id[Texid]);
+#elif GL_EXT_texture_object
+    xglBindTextureEXT(GL_TEXTURE_2D, FGPanel::OurPanel->panel_tex_id[Texid]);
+#else
+#  error port me
+#endif
+    
+    xglMatrixMode(GL_TEXTURE);
+    xglLoadIdentity();
+    xglTranslatef(-((float)((XPos/0.625)/256)),                                                   -((float)((YPos/0.625)/256)), 0.0);
+    xglTranslatef(texXPos/256 , texYPos/256, 0.0);
+    xglScalef(0.00625, 0.00625, 1.0);
+    
+    xglBegin(GL_POLYGON);
+    for(n=0;n<NumVerti;n += 2){ 
+        xglVertex2f(array[n] * ScaleFactor, array[n + 1] * ScaleFactor);
+    } 
+    xglEnd();
+    
+    xglLoadIdentity();
+    xglMatrixMode(GL_MODELVIEW);
+    xglPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+    xglPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+    xglDisable(GL_TEXTURE_2D);
+    xglDisable(GL_TEXTURE_GEN_S);
+    xglDisable(GL_TEXTURE_GEN_T);
+}
+
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGHorizon instrument.
+////////////////////////////////////////////////////////////////////////
+
+
+FGHorizon::FGHorizon (float inXPos, float inYPos)
+{
+  XPos = inXPos;
+  YPos = inYPos;
+  Init();
+}
+
+
+FGHorizon::~FGHorizon ()
+{
+}
+
 
 void FGHorizon::Render(void){ 
     double pitch;
@@ -325,7 +344,7 @@ void FGHorizon::Render(void){
     GLboolean Light;
     GLfloat normal[2];
     
-    static int n, dn, rot, tmp1, tmp2;
+    int n1, n2, n, dn, rot, tmp1, tmp2;
     float a;
     
     GLfloat material[] = { 0.714844, 0.265625, 0.056875 ,1.0};
@@ -402,9 +421,11 @@ void FGHorizon::Render(void){
     xglLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction);
     
 #ifdef GL_VERSION_1_1
-    xglBindTexture(GL_TEXTURE_2D, panel_tex_id[1]);
+                               // FIXME!!
+    xglBindTexture(GL_TEXTURE_2D, FGPanel::OurPanel->panel_tex_id[1]);
 #elif GL_EXT_texture_object
-    xglBindTextureEXT(GL_TEXTURE_2D, panel_tex_id[1]);
+                               // FIXME!!
+    xglBindTextureEXT(GL_TEXTURE_2D, FGPanel::OurPanel->panel_tex_id[1]);
 #else
 #  error port me
 #endif
@@ -425,7 +446,9 @@ void FGHorizon::Render(void){
     
     xglMatrixMode(GL_MODELVIEW);
     xglBegin(GL_TRIANGLES);
-    for(i=45;i<225;i++){
+
+    int i;
+    for(i=45; i < 225; i++){
         xglTexCoord2f(0.0, 0.0);
         xglNormal3f(0.0, 0.0, 0.6);
         xglVertex3f(0.0, 0.0, 0.0);
@@ -566,122 +589,37 @@ void FGHorizon::Init(void){
     }
 }
 
-void FGTexInstrument::UpdatePointer(void){
-    double pitch;
-    double roll;
-    float alpharad;
-    double speed;    
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glVertexPointer(2, GL_FLOAT, 0, vertices);
-    
-    alpha=((((float)((var[variable]) - (value1))) /
-            (value2 - value1))* (alpha2 - alpha1) + alpha1);
-    
-    if (alpha < alpha1)
-        alpha = alpha1;
-    if (alpha > alpha2)
-        alpha = alpha2;
-    xglMatrixMode(GL_MODELVIEW);  
-    xglPushMatrix();
-    xglLoadIdentity();
-    xglDisable(GL_TEXTURE_2D);
-    xglTranslatef(XPos, YPos, 0);
-    xglRotatef(-alpha, 0.0, 0.0, 1.0);
-    xglColor4f(1.0, 1.0, 1.0, 1.0);
-    glDrawArrays(GL_POLYGON, 0, 10);
-    tape[0] = tape[1];
-    tape[1] = alpha;
-    xglEnable(GL_TEXTURE_2D);
-    glDisableClientState(GL_VERTEX_ARRAY);
-}
 
-// fgEraseArea - 'Erases' a drawn Polygon by overlaying it with a textured 
-//                 area. Shall be a method of a panel class once.
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGTurnCoordinator.
+////////////////////////////////////////////////////////////////////////
 
-void fgEraseArea(GLfloat *array, int NumVerti, GLfloat texXPos,                                  GLfloat texYPos, GLfloat XPos, GLfloat YPos,                                    int Texid, float ScaleFactor){
-    int i, j;
-    int n;
-    float a;
-    float ififth;
-    
-    xglEnable(GL_TEXTURE_2D);
-    xglEnable(GL_TEXTURE_GEN_S);
-    xglEnable(GL_TEXTURE_GEN_T);
-    glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-    glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR);
-    xglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    xglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    xglTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
-    xglMatrixMode(GL_TEXTURE);
-    xglLoadIdentity();
-    
-#ifdef GL_VERSION_1_1
-    xglBindTexture(GL_TEXTURE_2D, panel_tex_id[Texid]);
-#elif GL_EXT_texture_object
-    xglBindTextureEXT(GL_TEXTURE_2D, panel_tex_id[Texid]);
-#else
-#  error port me
-#endif
-    
-    xglMatrixMode(GL_TEXTURE);
-    xglLoadIdentity();
-    xglTranslatef(-((float)((XPos/0.625)/256)),                                                   -((float)((YPos/0.625)/256)), 0.0);
-    xglTranslatef(texXPos/256 , texYPos/256, 0.0);
-    xglScalef(0.00625, 0.00625, 1.0);
-    
-    xglBegin(GL_POLYGON);
-    for(n=0;n<NumVerti;n += 2){ 
-        xglVertex2f(array[n] * ScaleFactor, array[n + 1] * ScaleFactor);
-    } 
-    xglEnd();
-    
-    xglLoadIdentity();
-    xglMatrixMode(GL_MODELVIEW);
-    xglPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-    xglPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-    xglDisable(GL_TEXTURE_2D);
-    xglDisable(GL_TEXTURE_GEN_S);
-    xglDisable(GL_TEXTURE_GEN_T);
-    
-}
 
-// CreatePointer - calculate the vertices of a pointer 
+// Static constants
 
-void FGTexInstrument::CreatePointer(void){
-    int i;
-    float alpha;
-    float alphastep;
-    float r = radius;
-    
-    vertices[0] = 0;
-    vertices[1] = length;
-    vertices[2] = -(width/2);
-    vertices[3] = length - ((width/2)/(tan(angle*DEG_TO_RAD/2)));
-    vertices[4] = -(width/2);
-    vertices[5] = cos(asin((width/2)/r))*r;
-    
-    alphastep = (asin((width/2)/r)+asin((width/2)/r))/5;
-    alpha = asin(-(width/2)/r);
-    
-    for(i=0;i<5;i++){
-        alpha += alphastep;
-        vertices[(i*2)+6] = sin(alpha)*r;
-    }
-    
-    alpha = asin(-(width/2)/r);
-    
-    for(i=0;i<5;i++){
-        alpha +=alphastep;
-        vertices[(i*2)+7]= cos(alpha)*r;
-    }
-    
-    vertices[16] = - vertices[4];
-    vertices[17] = vertices[5];
-    vertices[18] = - vertices[2];
-    vertices[19] = vertices[3];
+GLfloat FGTurnCoordinator::wingArea[] = {
+  -1.25, -28.125, 1.255, -28.125, 1.255, 28.125, -1.25, 28.125 };
+
+GLfloat FGTurnCoordinator::elevatorArea[] = {
+  3.0, -10.9375, 4.5, -10.9375, 4.5, 10.9375, 3.0, 10.9375 };
     
+GLfloat FGTurnCoordinator::rudderArea[] = {
+  2.0, -0.45, 10.625, -0.45, 10.625, 0.55, 2.0, 0.55};
+
+
+FGTurnCoordinator::FGTurnCoordinator (float inXPos, float inYPos)
+{
+  XPos = inXPos;
+  YPos = inYPos;
+  Init();
 }
 
+FGTurnCoordinator::~FGTurnCoordinator ()
+{
+}
+
+
 // fgUpdateTurnCoordinator - draws turn coordinator related stuff
 
 void FGTurnCoordinator::Render(void){
@@ -719,6 +657,8 @@ void FGTurnCoordinator::Render(void){
     xglTranslatef(0.75 * sin(alpha * DEG_TO_RAD) * 31,                                            0.3 * (39 - (cos(alpha * DEG_TO_RAD) * 39)), 0.0);
     xglBegin(GL_POLYGON);
     xglColor3f(0.8, 0.8, 0.8);
+
+    int i;
     for(i=0;i<36;i++){
         xglVertex2f(vertices[2 * i],                                                                vertices[(2 * i) + 1]);
     }
@@ -732,9 +672,9 @@ void FGTurnCoordinator::Render(void){
     xglTranslatef(XPos, YPos, 0.0);
     xglRotatef(rollhist[0] * RAD_TO_DEG + 90, 0.0, 0.0, 1.0);
     
-    fgEraseArea(Wings, 8, PlaneTexXPos, PlaneTexYPos,                                                     XPos, YPos, 1, 1); 
-    fgEraseArea(Elevator, 8, PlaneTexXPos, PlaneTexYPos,                                                     XPos, YPos, 1, 1); 
-    fgEraseArea(Rudder, 8, PlaneTexXPos, PlaneTexYPos,                                                     XPos, YPos, 1, 1); 
+    fgEraseArea(wingArea, 8, PlaneTexXPos, PlaneTexYPos,                                                     XPos, YPos, 1, 1); 
+    fgEraseArea(elevatorArea, 8, PlaneTexXPos, PlaneTexYPos,                                                     XPos, YPos, 1, 1); 
+    fgEraseArea(rudderArea, 8, PlaneTexXPos, PlaneTexYPos,                                                     XPos, YPos, 1, 1); 
     
     xglLoadIdentity();
     xglTranslatef(XPos, YPos, 0.0);
@@ -748,27 +688,27 @@ void FGTurnCoordinator::Render(void){
     xglEnd();
     
     xglBegin(GL_POLYGON);
-    xglVertex2f(Wings[0], Wings[1]);
-    xglVertex2f(Wings[2], Wings[3]);
-    xglVertex2f(Wings[4], Wings[5]);
-    xglVertex2f(Wings[6], Wings[7]);
-    xglVertex2f(Wings[0], Wings[1]);
+    xglVertex2f(wingArea[0], wingArea[1]);
+    xglVertex2f(wingArea[2], wingArea[3]);
+    xglVertex2f(wingArea[4], wingArea[5]);
+    xglVertex2f(wingArea[6], wingArea[7]);
+    xglVertex2f(wingArea[0], wingArea[1]);
     xglEnd();
     
     xglBegin(GL_POLYGON);
-    xglVertex2f(Elevator[0], Elevator[1]);
-    xglVertex2f(Elevator[2], Elevator[3]);
-    xglVertex2f(Elevator[4], Elevator[5]);
-    xglVertex2f(Elevator[6], Elevator[7]);
-    xglVertex2f(Elevator[0], Elevator[1]);
+    xglVertex2f(elevatorArea[0], elevatorArea[1]);
+    xglVertex2f(elevatorArea[2], elevatorArea[3]);
+    xglVertex2f(elevatorArea[4], elevatorArea[5]);
+    xglVertex2f(elevatorArea[6], elevatorArea[7]);
+    xglVertex2f(elevatorArea[0], elevatorArea[1]);
     xglEnd();
     
     xglBegin(GL_POLYGON);
-    xglVertex2f(Rudder[0], Rudder[1]);
-    xglVertex2f(Rudder[2], Rudder[3]);
-    xglVertex2f(Rudder[4], Rudder[5]);
-    xglVertex2f(Rudder[6], Rudder[7]);
-    xglVertex2f(Rudder[0], Rudder[1]);
+    xglVertex2f(rudderArea[0], rudderArea[1]);
+    xglVertex2f(rudderArea[2], rudderArea[3]);
+    xglVertex2f(rudderArea[4], rudderArea[5]);
+    xglVertex2f(rudderArea[6], rudderArea[7]);
+    xglVertex2f(rudderArea[0], rudderArea[1]);
     xglEnd();
     
     
@@ -796,291 +736,276 @@ void FGTurnCoordinator::Init(void){
     }   
 }
 
-void DrawScale(float XPos, float YPos, float InnerRadius, float OuterRadius,                   float alpha1, float alpha2, int steps, float LineWidth,
-               float red, float green, float blue, bool filled){
-    int i;
-    float diff = (alpha2 - alpha1) / (float)(steps - 1);
-    
-#define ANTIALIASED_INSTRUMENTS
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGTexInstrument base class.
+////////////////////////////////////////////////////////////////////////
+
+FGTexInstrument::FGTexInstrument (void)
+{
+}
+
+FGTexInstrument::~FGTexInstrument (void)
+{
+}
+
+void FGTexInstrument::UpdatePointer(void){
+    float alpha;
+
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glVertexPointer(2, GL_FLOAT, 0, vertices);
     
-#ifdef ANTIALIASED_INSTRUMENTS
-    xglEnable(GL_LINE_SMOOTH);
-    xglEnable(GL_BLEND);
-    xglHint(GL_LINE_SMOOTH_HINT, GL_FASTEST);
-#endif
+    alpha=((((float)(getValue() - (value1))) /
+            (value2 - value1))* (alpha2 - alpha1) + alpha1);
     
-    xglMatrixMode(GL_MODELVIEW);
+    if (alpha < alpha1)
+        alpha = alpha1;
+    if (alpha > alpha2)
+        alpha -= alpha2;
+    xglMatrixMode(GL_MODELVIEW);  
+    xglPushMatrix();
     xglLoadIdentity();
+    xglDisable(GL_TEXTURE_2D);
+    xglTranslatef(XPos, YPos, 0);
+    xglRotatef(-alpha, 0.0, 0.0, 1.0);
+    xglColor4f(1.0, 1.0, 1.0, 1.0);
+    glDrawArrays(GL_POLYGON, 0, 10);
+    tape[0] = tape[1];
+    tape[1] = alpha;
+    xglEnable(GL_TEXTURE_2D);
+    glDisableClientState(GL_VERTEX_ARRAY);
+}
+
+// CreatePointer - calculate the vertices of a pointer 
+
+void FGTexInstrument::CreatePointer(void){
+    int i;
+    float alpha;
+    float alphastep;
+    float r = radius;
     
-    xglTranslatef(XPos, YPos, 0.0);
-    xglRotatef(-alpha1, 0.0, 0.0, 1.0);
+    vertices[0] = 0;
+    vertices[1] = length;
+    vertices[2] = -(width/2);
+    vertices[3] = length - ((width/2)/(tan(angle*DEG_TO_RAD/2)));
+    vertices[4] = -(width/2);
+    vertices[5] = cos(asin((width/2)/r))*r;
     
-    xglLineWidth(LineWidth);
-    xglColor3f(red, green, blue);
+    alphastep = (asin((width/2)/r)+asin((width/2)/r))/5;
+    alpha = asin(-(width/2)/r);
     
-    if(!filled){
-        xglBegin(GL_LINES);
-    }
-    else{
-        xglBegin(GL_QUAD_STRIP);
+    for(i=0;i<5;i++){
+        alpha += alphastep;
+        vertices[(i*2)+6] = sin(alpha)*r;
     }
     
-    for(i=0;i < steps; i++){
-        xglVertex3f(sin(i * diff * DEG_TO_RAD) * OuterRadius,
-                    cos(i * diff * DEG_TO_RAD) * OuterRadius,
-                    0.0);
-        xglVertex3f(sin(i * diff * DEG_TO_RAD) * InnerRadius,
-                    cos(i * diff * DEG_TO_RAD) * InnerRadius,
-                    0.0);
+    alpha = asin(-(width/2)/r);
+    
+    for(i=0;i<5;i++){
+        alpha +=alphastep;
+        vertices[(i*2)+7]= cos(alpha)*r;
     }
-    xglEnd();
     
-    xglLoadIdentity();
-    xglDisable(GL_LINE_SMOOTH);
-    xglDisable(GL_BLEND);
+    vertices[16] = - vertices[4];
+    vertices[17] = vertices[5];
+    vertices[18] = - vertices[2];
+    vertices[19] = vertices[3];
+    
 }
 
-void DrawBeechcraftLogo(float XPos, float YPos, float width, float height){
-    xglMatrixMode(GL_MODELVIEW);
+void FGTexInstrument::Init(void){
+    CreatePointer();
+}
+
+void FGTexInstrument::Render(void){
+    xglEnable(GL_TEXTURE_2D);
     xglLoadIdentity();
     xglTranslatef(XPos, YPos, 0.0);
-    xglEnable(GL_BLEND);
-    xglEnable(GL_TEXTURE_2D);
-    //   xglTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND);
-    //   xglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    
-#ifdef GL_VERSION_1_1
-    xglBindTexture(GL_TEXTURE_2D, panel_tex_id[1]);
-#elif GL_EXT_texture_object
-    xglBindTextureEXT(GL_TEXTURE_2D, panel_tex_id[1]);
-#else
-#  error port me
-#endif
-    
-    xglBegin(GL_POLYGON);
-    
-    xglTexCoord2f(.39844, .01953);
-    xglVertex2f(0.0, 0.0);
-    xglTexCoord2f(.58594, .01953);
-    xglVertex2f(width, 0.0);
-    xglTexCoord2f(.58594, .074219);
-    xglVertex2f(width, height);
-    xglTexCoord2f(.39844, .074219);
-    xglVertex2f(0.0, height);
+    xglRotatef(-tape[0], 0.0, 0.0, 1.0);
+    fgEraseArea(vertices, 20, (GLfloat)(textureXPos),                                               (GLfloat)(textureYPos), (GLfloat)(XPos),                                            (GLfloat)(YPos), 0, 1);
     
-    xglEnd();
+    UpdatePointer();
     
-    xglDisable(GL_BLEND);
     xglDisable(GL_TEXTURE_2D);
 }
 
 
-// PrintMatrix - routine to print the current modelview matrix.                 
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGAirspeedIndicator.
+////////////////////////////////////////////////////////////////////////
+
+
+FGAirspeedIndicator::FGAirspeedIndicator (int x, int y)
+{
+  XPos = x;
+  YPos = y;
+  radius = 4;
+  length = 32;
+  width = 3;
+  angle = 30;
+  value1 = 15.0;
+  value2 = 260.0;
+  alpha1 = -20.0;
+  alpha2 = 360;
+  textureXPos = 65;
+  textureYPos = 193;
+  Init();
+}
+
 
-void PrintMatrix( void){
-    xglGetDoublev(GL_MODELVIEW_MATRIX, mvmatrix);
-    printf("matrix2 = %f %f %f %f \n",
-           mvmatrix[0], mvmatrix[1], mvmatrix[2], mvmatrix[3]);
-    printf("         %f %f %f %f \n",
-           mvmatrix[4], mvmatrix[5], mvmatrix[6], mvmatrix[7]);
-    printf("         %f %f %f %f \n",
-           mvmatrix[8], mvmatrix[9], mvmatrix[10], mvmatrix[11]);
-    printf("         %f %f %f %f \n",
-           mvmatrix[12], mvmatrix[13], mvmatrix[14], mvmatrix[15]);
+FGAirspeedIndicator::~FGAirspeedIndicator ()
+{
 }
 
-void FGRpmGauge::Init(void){
-    list = xglGenLists (1);
-    int n;
-    
-    xglNewList(list, GL_COMPILE);
-    
-    xglColor3f(.26, .289, .3281);
-    xglBegin(GL_POLYGON);
-    for(n = 0; n < 180; n++){
-        xglVertex2f(cos(n * 0.0349066) * 24.5, sin(n * 0.0349066) * 24.5);
-    }
-    xglEnd();
-    
-    DrawScale(XPos, YPos, 22.5, 25.625, 50, 135, 10, 1.0, 0.0, 0.7, 0.0,FILLED);
-    DrawScale(XPos, YPos, 21.0, 25.625, -70, 180, 8, 1.8, 0.88, 0.88, 0.88, false);
-    DrawScale(XPos, YPos, 22.5, 25.0, -70, 180, 40, 0.6, 0.5, 0.5, 0.5, false);
-    
-    xglEndList();
+
+double
+FGAirspeedIndicator::getValue () const
+{
+  return get_speed();
 }
 
-void FGRpmGauge::Render(void){
-    xglMatrixMode(GL_MODELVIEW);
-    xglLoadIdentity();
-    xglTranslatef(XPos, YPos, 0.0);
-    
-    xglCallList(list);
-    
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGVerticalSpeedIndicator.
+////////////////////////////////////////////////////////////////////////
+
+
+FGVerticalSpeedIndicator::FGVerticalSpeedIndicator (int x, int y)
+{
+  XPos = x;
+  YPos = y;
+  radius = 4;
+  length = 30;
+  width = 3;
+  angle = 30;
+  value1 = -3.0;
+  value2 = 3.0;
+  alpha1 = 100;
+  alpha2 = 440;
+  textureXPos = 66.15;
+  textureYPos = 66;
+  Init();
 }
 
-void FGPanel::DrawTestLetter(float X, float Y){
-    xglEnable(GL_TEXTURE_2D);
-    xglEnable(GL_BLEND);
-    
-    xglMatrixMode(GL_TEXTURE);
-    xglLoadIdentity();
-    xglTranslatef(X, Y, 0.0);
-    
-    DrawLetter();
-    
-    xglMatrixMode(GL_MODELVIEW); 
-    xglTranslatef(6.0, 0.0, 0.0);
-    xglDisable(GL_TEXTURE_2D);
-    xglDisable(GL_BLEND);
+
+FGVerticalSpeedIndicator::~FGVerticalSpeedIndicator ()
+{
 }
 
-void FGPanel::InitLists(void){
-    xglNewList(FontList + 'A', GL_COMPILE);
-    DrawTestLetter(0.391625, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'B', GL_COMPILE);
-    DrawTestLetter(0.391625 + 1 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'C', GL_COMPILE);
-    DrawTestLetter(0.391625 + 2 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'D', GL_COMPILE);
-    DrawTestLetter(0.391625 + 3 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'E', GL_COMPILE);
-    DrawTestLetter(0.391625 + 4 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'F', GL_COMPILE);
-    DrawTestLetter(0.391625 + 5 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'G', GL_COMPILE);
-    DrawTestLetter(0.391625 + 6 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'H', GL_COMPILE);
-    DrawTestLetter(0.391625 + 7 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'I', GL_COMPILE);
-    DrawTestLetter(0.391625 + 8 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'J', GL_COMPILE);
-    DrawTestLetter(0.391625 + 9 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'K', GL_COMPILE);
-    DrawTestLetter(0.391625 + 9.7 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'L', GL_COMPILE);
-    DrawTestLetter(0.399625 + 10.6 * LETTER_OFFSET, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'M', GL_COMPILE);
-    DrawTestLetter(0.80459375, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'N', GL_COMPILE);
-    DrawTestLetter(0.83975, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'O', GL_COMPILE);
-    DrawTestLetter(0.871, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'P', GL_COMPILE);
-    DrawTestLetter(0.90715625, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + 'Q', GL_COMPILE);
-    DrawTestLetter(0.9413125, 0.29296875);
-    xglEndList();
-    
-    xglNewList(FontList + '1', GL_COMPILE);
-    DrawTestLetter(0.390625, 0.35546875);
-    xglEndList();
-    
-    xglNewList(FontList + '2', GL_COMPILE);
-    DrawTestLetter(0.390625 + 1*LETTER_OFFSET, 0.3515625); 
-    xglEndList();
-    
-    xglNewList(FontList + '3', GL_COMPILE);
-    DrawTestLetter(0.390625 + 2*LETTER_OFFSET, 0.3515625); 
-    xglEndList();
-    
-    xglNewList(FontList + '4', GL_COMPILE);
-    DrawTestLetter(0.390625 + 3*LETTER_OFFSET, 0.3515625); 
-    xglEndList();
-    
-    xglNewList(FontList + '5', GL_COMPILE);
-    DrawTestLetter(0.390625 + 4*LETTER_OFFSET, 0.3515625); 
-    xglEndList();
-    
-    xglNewList(FontList + '6', GL_COMPILE);
-    DrawTestLetter(0.390625 + 5*LETTER_OFFSET, 0.3515625); 
-    xglEndList();
-    
-    xglNewList(FontList + '7', GL_COMPILE);
-    DrawTestLetter(0.390625 + 6*LETTER_OFFSET, 0.3515625); 
-    xglEndList();
-    
-    xglNewList(FontList + '8', GL_COMPILE);
-    DrawTestLetter(0.390625 + 7*LETTER_OFFSET, 0.3515625); 
-    xglEndList();
-    
-    xglNewList(FontList + '9', GL_COMPILE);
-    DrawTestLetter(0.390625 + 8*LETTER_OFFSET, 0.3515625); 
-    xglEndList();
-    
-    xglNewList(FontList + '0', GL_COMPILE);
-    DrawTestLetter(0.383625 + 9*LETTER_OFFSET, 0.3515625); 
-    xglEndList();
-    
-    xglNewList(FontList + ' ', GL_COMPILE);
-    xglTranslatef(8.0, 0.0, 0.0);
-    xglEndList();
+
+double
+FGVerticalSpeedIndicator::getValue () const
+{
+  return get_climb_rate() / 1000.0;
 }
 
-void FGPanel::TexString(char *s, float XPos, float YPos, float size){
-    xglMatrixMode(GL_MODELVIEW);
-    xglLoadIdentity();
-    xglTranslatef(XPos, YPos, 0.0);
-    xglScalef(size, size, 1.0);
-    
-#ifdef GL_VERSION_1_1
-    xglBindTexture(GL_TEXTURE_2D, panel_tex_id[1]);
-#elif GL_EXT_texture_object
-    xglBindTextureEXT(GL_TEXTURE_2D, panel_tex_id[1]);
-#else
-#  error port me
-#endif
-    
-    while((*s) != '\0'){
-        xglCallList(FontList + (*s));
-        s++;
-    }
-    xglLoadIdentity();
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGAltimeter.
+////////////////////////////////////////////////////////////////////////
+
+
+FGAltimeter::FGAltimeter (int x, int y)
+{
+  XPos = x;
+  YPos = y;
+  radius = 5;
+  length = 25;
+  width = 4;
+  angle = 30;
+  value1 = 0;
+  value2 = 10000;
+  alpha1 = 0;
+  alpha2 = 360;
+  textureXPos = 194;
+  textureYPos = 191;
+  Init();
 }
 
-void FGTexInstrument::Init(void){
-    CreatePointer();
+
+FGAltimeter::~FGAltimeter ()
+{
 }
 
-void FGTexInstrument::Render(void){
-    xglEnable(GL_TEXTURE_2D);
-    xglLoadIdentity();
-    xglTranslatef(XPos, YPos, 0.0);
-    xglRotatef(-tape[0], 0.0, 0.0, 1.0);
-    fgEraseArea(vertices, 20, (GLfloat)(teXpos),                                               (GLfloat)(texYpos), (GLfloat)(XPos),                                            (GLfloat)(YPos), 0, 1);
-    
-    UpdatePointer();
-    
-    xglDisable(GL_TEXTURE_2D);
+
+double
+FGAltimeter::getValue () const
+{
+  return get_altitude();
+}
+
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGAltimeter2.
+////////////////////////////////////////////////////////////////////////
+
+
+FGAltimeter2::FGAltimeter2 (int x, int y)
+{
+  XPos = x;
+  YPos = y;
+  radius = 5;
+  length = 32;
+  width = 3;
+  angle = 30;
+  value1 = 0;
+  value2 = 3000;
+  alpha1 = 0;
+  alpha2 = 1080;
+  textureXPos = 194;
+  textureYPos = 191;
+  Init();
+}
+
+
+FGAltimeter2::~FGAltimeter2 ()
+{
+}
+
+
+double
+FGAltimeter2::getValue () const
+{
+  return get_altitude();
+}
+
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGRPMIndicator.
+////////////////////////////////////////////////////////////////////////
+
+
+FGRPMIndicator::FGRPMIndicator (int x, int y)
+{
+  XPos = x;
+  YPos = y;
+  radius = 10;
+  length = 20;
+  width = 5.5;
+  angle = 60;
+  value1 = 0.0;
+  value2 = 1.0;
+  alpha1 = -67;
+  alpha2 = 180;
+  textureXPos = 174;
+  textureYPos = 83;
+  Init();
+}
+
+
+FGRPMIndicator::~FGRPMIndicator ()
+{
+}
+
+
+double
+FGRPMIndicator::getValue () const 
+{
+  return get_throttleval();
 }