X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fpanel.cxx;h=bee42a477766ecd75ba3cf9e3eaccf26fa62c670;hb=d982efc4c4d166e144023664b8ac1c63233f5f82;hp=95215723b88978566389a5009a70b094fd543803;hpb=af2a0da64c7665bda0ac726bd219f3d37b9f08de;p=flightgear.git

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 95215723b..bee42a477 100644
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -26,6 +26,7 @@
 #  include <windows.h>
 #endif
 
+#include <stdio.h>	// sprintf
 #include <string.h>
 
 #include <plib/ssg.h>
@@ -36,6 +37,7 @@
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <Main/viewmgr.hxx>
 #include <Objects/texload.h>
 #include <Time/light.hxx>
 
@@ -47,6 +49,13 @@
 #define WIN_W 1024
 #define WIN_H 768
 
+#if defined( NONE ) && defined( _MSC_VER )
+#  pragma message( "A sloppy coder has defined NONE as a macro!!!" )
+#  undef NONE
+#elif defined( NONE )
+#  pragma warn A sloppy coder has defined NONE as a macro!!!
+#  undef NONE
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -74,10 +83,16 @@ get_aspect_adjust (int xsize, int ysize)
 bool
 fgPanelVisible ()
 {
-  return ((current_panel != 0) &&
-	  (current_panel->getVisibility()) &&
-	  (globals->get_viewmgr()->get_current() == 0) &&
-	  (globals->get_current_view()->get_view_offset() == 0.0));
+     if(current_panel == 0)
+	return false;
+     if(current_panel->getVisibility() == 0)
+	return false;
+     if(globals->get_viewmgr()->get_current() != 0)
+	return false;
+     if(globals->get_current_view()->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS != 0 &&
+        !fgGetBool("/sim/virtual-cockpit"))
+	return false;
+     return true;
 }
 
 
@@ -154,7 +169,8 @@ FGCroppedTexture::getTexture ()
 
 FGPanel * current_panel = NULL;
 static fntRenderer text_renderer;
-
+static fntTexFont *default_font;
+static fntTexFont *led_font;
 
 /**
  * Constructor.
@@ -164,7 +180,7 @@ FGPanel::FGPanel ()
     _mouseInstrument(0),
     _width(WIN_W), _height(int(WIN_H * 0.5768 + 1)),
     _x_offset(0), _y_offset(0), _view_height(int(WIN_H * 0.4232)),
-    _bound(false),
+    _jitter(0.0),
     _xsize_node(fgGetNode("/sim/startup/xsize", true)),
     _ysize_node(fgGetNode("/sim/startup/ysize", true))
 {
@@ -177,8 +193,6 @@ FGPanel::FGPanel ()
  */
 FGPanel::~FGPanel ()
 {
-  if (_bound)
-    unbind();
   for (instrument_list_type::iterator it = _instruments.begin();
        it != _instruments.end();
        it++) {
@@ -204,7 +218,28 @@ FGPanel::addInstrument (FGPanelInstrument * instrument)
 void
 FGPanel::init ()
 {
-  // NO-OP
+    SGPath base_path;
+    char* envp = ::getenv( "FG_FONTS" );
+    if ( envp != NULL ) {
+        base_path.set( envp );
+    } else {
+        base_path.set( globals->get_fg_root() );
+	base_path.append( "Fonts" );
+    }
+
+    SGPath fntpath;
+
+    // Install the default font
+    fntpath = base_path;
+    fntpath.append( "typewriter.txf" );
+    default_font = new fntTexFont ;
+    default_font -> load ( (char *)fntpath.c_str() ) ;
+
+    // Install the LED font
+    fntpath = base_path;
+    fntpath.append( "led.txf" );
+    led_font = new fntTexFont ;
+    led_font -> load ( (char *)fntpath.c_str() ) ;
 }
 
 
@@ -214,10 +249,10 @@ FGPanel::init ()
 void
 FGPanel::bind ()
 {
-  fgTie("/sim/panel/visibility", &_visibility);
-  fgTie("/sim/panel/x-offset", &_x_offset);
-  fgTie("/sim/panel/y-offset", &_y_offset);
-  _bound = true;
+  fgSetArchivable("/sim/panel/visibility");
+  fgSetArchivable("/sim/panel/x-offset");
+  fgSetArchivable("/sim/panel/y-offset");
+  fgSetArchivable("/sim/panel/jitter");
 }
 
 
@@ -227,10 +262,6 @@ FGPanel::bind ()
 void
 FGPanel::unbind ()
 {
-  fgUntie("/sim/panel/visibility");
-  fgUntie("/sim/panel/x-offset");
-  fgUntie("/sim/panel/y-offset");
-  _bound = false;
 }
 
 
@@ -238,11 +269,18 @@ FGPanel::unbind ()
  * Update the panel.
  */
 void
-FGPanel::update ()
+FGPanel::update (double dt)
 {
+				// TODO: cache the nodes
+    _visibility = fgGetBool("/sim/panel/visibility");
+    _x_offset = fgGetInt("/sim/panel/x-offset");
+    _y_offset = fgGetInt("/sim/panel/y-offset");
+    _jitter = fgGetFloat("/sim/panel/jitter");
+
 				// Do nothing if the panel isn't visible.
-    if (!fgPanelVisible())
+    if ( !fgPanelVisible() ) {
         return;
+    }
 
 				// If the mouse is down, do something
     if (_mouseDown) {
@@ -266,18 +304,48 @@ FGPanel::update ()
 void
 FGPanel::update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
 {
-  glMatrixMode(GL_PROJECTION);
-  glPushMatrix();
-  glLoadIdentity();
-  gluOrtho2D(winx, winx + winw, winy, winy + winh);
-
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  glLoadIdentity();
-
-  glTranslated(_x_offset, _y_offset, 0);
+				// Calculate accelerations
+				// and jiggle the panel accordingly
+				// The factors and bounds are just
+				// initial guesses; using sqrt smooths
+				// out the spikes.
+  double x_offset = _x_offset;
+  double y_offset = _y_offset;
+
+  if (_jitter != 0.0) {
+    double a_x_pilot = current_aircraft.fdm_state->get_A_X_pilot();
+    double a_y_pilot = current_aircraft.fdm_state->get_A_Y_pilot();
+    double a_z_pilot = current_aircraft.fdm_state->get_A_Z_pilot();
+
+    double a_zx_pilot = a_z_pilot - a_x_pilot;
+    
+    int x_adjust = int(sqrt(fabs(a_y_pilot) * _jitter)) *
+		   (a_y_pilot < 0 ? -1 : 1);
+    int y_adjust = int(sqrt(fabs(a_zx_pilot) * _jitter)) *
+		   (a_zx_pilot < 0 ? -1 : 1);
+
+				// adjustments in screen coordinates
+    x_offset += x_adjust;
+    y_offset += y_adjust;
+  }
 
-				// Draw the background
+  if(fgGetBool("/sim/virtual-cockpit")) {
+      setupVirtualCockpit();
+  } else {
+      glMatrixMode(GL_PROJECTION);
+      glPushMatrix();
+      glLoadIdentity();
+      gluOrtho2D(winx, winx + winw, winy, winy + winh); /* right side up */
+      // gluOrtho2D(winx + winw, winx, winy + winh, winy); /* up side down */
+      
+      glMatrixMode(GL_MODELVIEW);
+      glPushMatrix();
+      glLoadIdentity();
+      
+      glTranslated(x_offset, y_offset, 0);
+  }
+  
+  // Draw the background
   glEnable(GL_TEXTURE_2D);
   glDisable(GL_LIGHTING);
   glEnable(GL_BLEND);
@@ -289,16 +357,40 @@ FGPanel::update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
   } else {
       glColor4f(0.7, 0.2, 0.2, 1.0);
   }
-  glBindTexture(GL_TEXTURE_2D, _bg->getHandle());
-  // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-  // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-  glBegin(GL_POLYGON);
-  glTexCoord2f(0.0, 0.0); glVertex3f(WIN_X, WIN_Y, 0);
-  glTexCoord2f(1.0, 0.0); glVertex3f(WIN_X + _width, WIN_Y, 0);
-  glTexCoord2f(1.0, 1.0); glVertex3f(WIN_X + _width, WIN_Y + _height, 0);
-  glTexCoord2f(0.0, 1.0); glVertex3f(WIN_X, WIN_Y + _height, 0);
-  glEnd();
+  if (_bg != 0) {
+    glBindTexture(GL_TEXTURE_2D, _bg->getHandle());
+    // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    // glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    glBegin(GL_POLYGON);
+    glTexCoord2f(0.0, 0.0); glVertex3f(WIN_X, WIN_Y, 0);
+    glTexCoord2f(1.0, 0.0); glVertex3f(WIN_X + _width, WIN_Y, 0);
+    glTexCoord2f(1.0, 1.0); glVertex3f(WIN_X + _width, WIN_Y + _height, 0);
+    glTexCoord2f(0.0, 1.0); glVertex3f(WIN_X, WIN_Y + _height, 0);
+    glEnd();
+  } else {
+    for (int i = 0; i < 4; i ++) {
+      // top row of textures...(1,3,5,7)
+      glBindTexture(GL_TEXTURE_2D, _mbg[i*2]->getHandle());
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      glBegin(GL_POLYGON);
+      glTexCoord2f(0.0, 0.0); glVertex3f(WIN_X + (_width/4) * i, WIN_Y + (_height/2), 0);
+      glTexCoord2f(1.0, 0.0); glVertex3f(WIN_X + (_width/4) * (i+1), WIN_Y + (_height/2), 0);
+      glTexCoord2f(1.0, 1.0); glVertex3f(WIN_X + (_width/4) * (i+1), WIN_Y + _height, 0);
+      glTexCoord2f(0.0, 1.0); glVertex3f(WIN_X + (_width/4) * i, WIN_Y + _height, 0);
+      glEnd();
+      // bottom row of textures...(2,4,6,8)
+      glBindTexture(GL_TEXTURE_2D, _mbg[(i*2)+1]->getHandle());
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      glBegin(GL_POLYGON);
+      glTexCoord2f(0.0, 0.0); glVertex3f(WIN_X + (_width/4) * i, WIN_Y, 0);
+      glTexCoord2f(1.0, 0.0); glVertex3f(WIN_X + (_width/4) * (i+1), WIN_Y, 0);
+      glTexCoord2f(1.0, 1.0); glVertex3f(WIN_X + (_width/4) * (i+1), WIN_Y + (_height/2), 0);
+      glTexCoord2f(0.0, 1.0); glVertex3f(WIN_X + (_width/4) * i, WIN_Y + (_height/2), 0);
+      glEnd();
+    }
+
+  }
 
 				// Draw the instruments.
   instrument_list_type::const_iterator current = _instruments.begin();
@@ -306,20 +398,112 @@ FGPanel::update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
 
   for ( ; current != end; current++) {
     FGPanelInstrument * instr = *current;
-    glLoadIdentity();
-    glTranslated(_x_offset, _y_offset, 0);
+    glPushMatrix();
     glTranslated(instr->getXPos(), instr->getYPos(), 0);
     instr->draw();
+    glPopMatrix();
+  }
+
+  if(fgGetBool("/sim/virtual-cockpit")) {
+      cleanupVirtualCockpit();
+  } else {
+      glMatrixMode(GL_PROJECTION);
+      glPopMatrix();
+      glMatrixMode(GL_MODELVIEW);
+      glPopMatrix();
   }
 
-  glMatrixMode(GL_PROJECTION);
-  glPopMatrix();
-  glMatrixMode(GL_MODELVIEW);
-  glPopMatrix();
   ssgForceBasicState();
   glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 }
 
+void
+FGPanel::setupVirtualCockpit()
+{
+    int i;
+    FGViewer* view = globals->get_current_view();
+
+    // Generate corners for the panel quad.  Put the top edge of the
+    // panel 1m in and 6 degrees down from the forward direction, and
+    // make the whole thing 60 degrees wide.  In principle, these
+    // should be settable per-panel, so that you can have lots of
+    // panel objects plastered about the cockpit in realistic
+    // positions and orientations.
+    float a[3], b[3], c[3];
+    float pw = tan(30*SGD_DEGREES_TO_RADIANS);
+    float ph = 2 * pw * (float)_height/(float)_width;
+    float ptop = -tan(6*SGD_DEGREES_TO_RADIANS);
+    a[0] = -pw; a[1] = ptop-ph; a[2] = -1; // bottom left
+    b[0] =  pw; b[1] = ptop-ph; b[2] = -1; // bottom right
+    c[0] = -pw; c[1] = ptop;    c[2] = -1; // top left
+
+    // A standard projection, in meters, with especially close clip
+    // planes.
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
+    gluPerspective(view->get_v_fov(), 1/view->get_aspect_ratio(), 
+		   0.01, 100);
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+
+    // Generate a "look at" matrix using OpenGL (!) coordinate
+    // conventions.
+    float lookat[3];
+    float pitch = view->getPitchOffset_deg() * SGD_DEGREES_TO_RADIANS;
+    float rot = view->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS;
+    lookat[0] = -sin(rot);
+    lookat[1] = sin(pitch) / cos(pitch);
+    lookat[2] = -cos(rot);
+    if(fabs(lookat[1]) > 9999) lookat[1] = 9999; // FPU sanity
+    gluLookAt(0, 0, 0, lookat[0], lookat[1], lookat[2], 0, 1, 0);
+
+    // Translate the origin to the location of the panel quad
+    glTranslatef(a[0], a[1], a[2]);
+ 
+    // Generate a matrix to translate unit square coordinates from the
+    // panel to real world coordinates.  Use a transposed basis for
+    // the panel quad.  Note: this matrix is relatively expensive to
+    // compute, and is invariant.  Consider precomputing and storing
+    // it.  Also, consider using the plib vector math routines, so the
+    // reuse junkies don't yell at me.  (Fine, I hard-coded a cross
+    // product.  Just shoot me and be done with it.)
+    float u[3], v[3], w[3], m[16];
+    for(i=0; i<3; i++) u[i] = b[i] - a[i]; // U = B - A
+    for(i=0; i<3; i++) v[i] = c[i] - a[i]; // V = C - A
+    w[0] = u[1]*v[2] - v[1]*u[2];          // W = U x V
+    w[1] = u[2]*v[0] - v[2]*u[0];
+    w[2] = u[0]*v[1] - v[0]*u[1];
+
+    m[0] = u[0]; m[4] = v[0]; m[8]  = w[0]; m[12] = 0; //     |Ux Vx Wx|
+    m[1] = u[1]; m[5] = v[1]; m[9]  = w[1]; m[13] = 0; // m = |Uy Vy Wy|
+    m[2] = u[2]; m[6] = v[2]; m[10] = w[2]; m[14] = 0; //     |Uz Vz Wz|
+    m[3] = 0;    m[7] = 0;    m[11] = 0;    m[15] = 1;
+    glMultMatrixf(m);
+
+    // Finally, a scaling factor to map the panel's width and height
+    // to the unit square.
+    glScalef(1./_width, 1./_height, 1);
+
+    // Now, turn off the Z buffer.  The panel code doesn't need
+    // it, and we're using different clip planes anyway (meaning we
+    // can't share it without glDepthRange() hackery or much
+    // framebuffer bandwidth wasteage)
+    glDisable(GL_DEPTH_TEST);
+}
+
+void
+FGPanel::cleanupVirtualCockpit()
+{
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+    glEnable(GL_DEPTH_TEST);
+}
+
 
 /**
  * Set the panel's visibility.
@@ -350,6 +534,15 @@ FGPanel::setBackground (ssgTexture * texture)
   _bg = texture;
 }
 
+/**
+ * Set the panel's multiple background textures.
+ */
+void
+FGPanel::setMultiBackground (ssgTexture * texture, int idx)
+{
+  _bg = 0;
+  _mbg[idx] = texture;
+}
 
 /**
  * Set the panel's x-offset.
@@ -389,7 +582,7 @@ FGPanel::doMouseAction (int button, int updown, int x, int y)
   if (updown == 1) {
     _mouseDown = false;
     _mouseInstrument = 0;
-    return true;
+    return false;
   }
 
 				// Scale for the real window size.
@@ -420,8 +613,7 @@ FGPanel::doMouseAction (int button, int updown, int x, int y)
       _mouseX = x - ix;
       _mouseY = y - iy;
 				// Always do the action once.
-      _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
-      return true;
+      return _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
     }
   }
   return false;
@@ -440,87 +632,29 @@ FGPanelAction::FGPanelAction ()
 FGPanelAction::FGPanelAction (int button, int x, int y, int w, int h)
   : _button(button), _x(x), _y(y), _w(w), _h(h)
 {
+  for (unsigned int i = 0; i < _bindings.size(); i++)
+    delete _bindings[i];
 }
 
 FGPanelAction::~FGPanelAction ()
 {
 }
 
-
-
-////////////////////////////////////////////////////////////////////////
-// Implementation of FGAdjustAction.
-////////////////////////////////////////////////////////////////////////
-
-FGAdjustAction::FGAdjustAction (int button, int x, int y, int w, int h,
-				SGPropertyNode * node, float increment, 
-				float min, float max, bool wrap)
-  : FGPanelAction(button, x, y, w, h),
-    _node(node), _increment(increment), _min(min), _max(max), _wrap(wrap)
-{
-}
-
-FGAdjustAction::~FGAdjustAction ()
-{
-}
-
 void
-FGAdjustAction::doAction ()
-{
-  float val = _node->getFloatValue();
-  val += _increment;
-  if (val < _min) {
-    val = (_wrap ? _max : _min);
-  } else if (val > _max) {
-    val = (_wrap ? _min : _max);
-  }
-  _node->setDoubleValue(val);
-}
-
-
-
-////////////////////////////////////////////////////////////////////////
-// Implementation of FGSwapAction.
-////////////////////////////////////////////////////////////////////////
-
-FGSwapAction::FGSwapAction (int button, int x, int y, int w, int h,
-			    SGPropertyNode * node1, SGPropertyNode * node2)
-  : FGPanelAction(button, x, y, w, h), _node1(node1), _node2(node2)
-{
-}
-
-FGSwapAction::~FGSwapAction ()
+FGPanelAction::addBinding (FGBinding * binding)
 {
+  _bindings.push_back(binding);
 }
 
 void
-FGSwapAction::doAction ()
+FGPanelAction::doAction ()
 {
-  float val = _node1->getFloatValue();
-  _node1->setDoubleValue(_node2->getFloatValue());
-  _node2->setDoubleValue(val);
-}
-
-
-
-////////////////////////////////////////////////////////////////////////
-// Implementation of FGToggleAction.
-////////////////////////////////////////////////////////////////////////
-
-FGToggleAction::FGToggleAction (int button, int x, int y, int w, int h,
-				SGPropertyNode * node)
-  : FGPanelAction(button, x, y, w, h), _node(node)
-{
-}
-
-FGToggleAction::~FGToggleAction ()
-{
-}
-
-void
-FGToggleAction::doAction ()
-{
-  _node->setBoolValue(!(_node->getBoolValue()));
+  if (test()) {
+    int nBindings = _bindings.size();
+    for (int i = 0; i < nBindings; i++) {
+      _bindings[i]->fire();
+    }
+  }
 }
 
 
@@ -536,6 +670,7 @@ FGPanelTransformation::FGPanelTransformation ()
 
 FGPanelTransformation::~FGPanelTransformation ()
 {
+  delete table;
 }
 
 
@@ -615,12 +750,14 @@ FGPanelInstrument::addAction (FGPanelAction * action)
 bool
 FGPanelInstrument::doMouseAction (int button, int x, int y)
 {
-  action_list_type::iterator it = _actions.begin();
-  action_list_type::iterator last = _actions.end();
-  for ( ; it != last; it++) {
-    if ((*it)->inArea(button, x, y)) {
-      (*it)->doAction();
-      return true;
+  if (test()) {
+    action_list_type::iterator it = _actions.begin();
+    action_list_type::iterator last = _actions.end();
+    for ( ; it != last; it++) {
+      if ((*it)->inArea(button, x, y)) {
+	(*it)->doAction();
+	return true;
+      }
     }
   }
   return false;
@@ -648,11 +785,19 @@ FGLayeredInstrument::~FGLayeredInstrument ()
 void
 FGLayeredInstrument::draw ()
 {
-  for (int i = 0; i < (int)_layers.size(); i++) {
-    glPushMatrix();
-    glTranslatef(0.0, 0.0, (i / 100.0) + 0.1);
-    _layers[i]->draw();
-    glPopMatrix();
+  if (test()) {
+    float z = 0.1f;
+    float z_inc = 0.01;
+    bool vc = fgGetBool("/sim/virtual-cockpit");
+    for (int i = 0; i < (int)_layers.size(); i++) {
+      glPushMatrix();
+      if(!vc) {
+        glTranslatef(0.0, 0.0, z);
+        z += z_inc;
+      }
+      _layers[i]->draw();
+      glPopMatrix();
+    }
   }
 }
 
@@ -713,28 +858,30 @@ FGInstrumentLayer::transform () const
   transformation_list::const_iterator last = _transformations.end();
   while (it != last) {
     FGPanelTransformation *t = *it;
-    float val = (t->node == 0 ? 0.0 : t->node->getFloatValue());
-    if (val < t->min) {
-      val = t->min;
-    } else if (val > t->max) {
-      val = t->max;
-    }
-    if(t->table==0) {
+    if (t->test()) {
+      float val = (t->node == 0 ? 0.0 : t->node->getFloatValue());
+      if (val < t->min) {
+	val = t->min;
+      } else if (val > t->max) {
+	val = t->max;
+      }
+      if(t->table==0) {
 	val = val * t->factor + t->offset;
-    } else {
+      } else {
 	val = t->table->interpolate(val) * t->factor + t->offset;
-    }
-
-    switch (t->type) {
-    case FGPanelTransformation::XSHIFT:
-      glTranslatef(val, 0.0, 0.0);
-      break;
-    case FGPanelTransformation::YSHIFT:
-      glTranslatef(0.0, val, 0.0);
-      break;
-    case FGPanelTransformation::ROTATION:
-      glRotatef(-val, 0.0, 0.0, 1.0);
-      break;
+      }
+      
+      switch (t->type) {
+      case FGPanelTransformation::XSHIFT:
+	glTranslatef(val, 0.0, 0.0);
+	break;
+      case FGPanelTransformation::YSHIFT:
+	glTranslatef(0.0, val, 0.0);
+	break;
+      case FGPanelTransformation::ROTATION:
+	glRotatef(-val, 0.0, 0.0, 1.0);
+	break;
+      }
     }
     it++;
   }
@@ -747,6 +894,38 @@ FGInstrumentLayer::addTransformation (FGPanelTransformation * transformation)
 }
 
 
+
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGGroupLayer.
+////////////////////////////////////////////////////////////////////////
+
+FGGroupLayer::FGGroupLayer ()
+{
+}
+
+FGGroupLayer::~FGGroupLayer ()
+{
+  for (unsigned int i = 0; i < _layers.size(); i++)
+    delete _layers[i];
+}
+
+void
+FGGroupLayer::draw ()
+{
+  if (test()) {
+    int nLayers = _layers.size();
+    for (int i = 0; i < nLayers; i++)
+      _layers[i]->draw();
+  }
+}
+
+void
+FGGroupLayer::addLayer (FGInstrumentLayer * layer)
+{
+  _layers.push_back(layer);
+}
+
+
 
 ////////////////////////////////////////////////////////////////////////
 // Implementation of FGTexturedLayer.
@@ -768,27 +947,29 @@ FGTexturedLayer::~FGTexturedLayer ()
 void
 FGTexturedLayer::draw ()
 {
-  int w2 = _w / 2;
-  int h2 = _h / 2;
-
-  transform();
-  glBindTexture(GL_TEXTURE_2D, _texture.getTexture()->getHandle());
-  glBegin(GL_POLYGON);
-
+  if (test()) {
+    int w2 = _w / 2;
+    int h2 = _h / 2;
+    
+    transform();
+    glBindTexture(GL_TEXTURE_2D, _texture.getTexture()->getHandle());
+    glBegin(GL_POLYGON);
+    
 				// From Curt: turn on the panel
 				// lights after sundown.
-  if ( cur_light_params.sun_angle * SGD_RADIANS_TO_DEGREES < 95.0 ) {
+    if ( cur_light_params.sun_angle * SGD_RADIANS_TO_DEGREES < 95.0 ) {
       glColor4fv( cur_light_params.scene_diffuse );
-  } else {
+    } else {
       glColor4f(0.7, 0.2, 0.2, 1.0);
-  }
+    }
 
 
-  glTexCoord2f(_texture.getMinX(), _texture.getMinY()); glVertex2f(-w2, -h2);
-  glTexCoord2f(_texture.getMaxX(), _texture.getMinY()); glVertex2f(w2, -h2);
-  glTexCoord2f(_texture.getMaxX(), _texture.getMaxY()); glVertex2f(w2, h2);
-  glTexCoord2f(_texture.getMinX(), _texture.getMaxY()); glVertex2f(-w2, h2);
-  glEnd();
+    glTexCoord2f(_texture.getMinX(), _texture.getMinY()); glVertex2f(-w2, -h2);
+    glTexCoord2f(_texture.getMaxX(), _texture.getMinY()); glVertex2f(w2, -h2);
+    glTexCoord2f(_texture.getMaxX(), _texture.getMaxY()); glVertex2f(w2, h2);
+    glTexCoord2f(_texture.getMinX(), _texture.getMaxY()); glVertex2f(-w2, h2);
+    glEnd();
+  }
 }
 
 
@@ -798,7 +979,7 @@ FGTexturedLayer::draw ()
 ////////////////////////////////////////////////////////////////////////
 
 FGTextLayer::FGTextLayer (int w, int h)
-  : FGInstrumentLayer(w, h), _pointSize(14.0)
+  : FGInstrumentLayer(w, h), _pointSize(14.0), _font_name("default")
 {
   _then.stamp();
   _color[0] = _color[1] = _color[2] = 0.0;
@@ -817,24 +998,52 @@ FGTextLayer::~FGTextLayer ()
 void
 FGTextLayer::draw ()
 {
-  glPushMatrix();
-  glColor4fv(_color);
-  transform();
-  text_renderer.setFont(guiFntHandle);
-  text_renderer.setPointSize(_pointSize);
-  text_renderer.begin();
-  text_renderer.start3f(0, 0, 0);
-
-  _now.stamp();
-  if (_now - _then > 100000) {
-    recalc_value();
-    _then = _now;
-  }
-  text_renderer.puts((char *)(_value.c_str()));
+  if (test()) {
+    glPushMatrix();
+    glColor4fv(_color);
+    transform();
+    if ( _font_name == "led" ) {
+	text_renderer.setFont(led_font);
+    } else {
+	text_renderer.setFont(guiFntHandle);
+    }
+    text_renderer.setPointSize(_pointSize);
+    text_renderer.begin();
+    text_renderer.start3f(0, 0, 0);
+
+    _now.stamp();
+    long diff = _now - _then;
+#if 0
+    // It would be nice to keep this #ifdef'd stuff for (04/18/2002 +
+    // a couple days) as I verify my solution to the panel text
+    // drawing problem is actually correct. -CLO
+    cout << "time diff = " << diff << endl;
+    if ( _now - _then < 0 ) {
+        cout << "Eeek, the past is now in the future!" << endl;
+        cout << "Now = " << _now.get_seconds() << " seconds "
+             << _now.get_usec() << "usecs" << endl;
+        cout << "Past = " << _then.get_seconds() << " seconds "
+             << _then.get_usec() << "usecs" << endl;
+        exit(-1);
+    }
+#endif
+    if (diff > 100000 || diff < 0 ) {
+      // ( diff < 0 ) is a sanity check and indicates our time stamp
+      // difference math probably overflowed.  We can handle a max
+      // difference of 35.8 minutes since the returned value is in
+      // usec.  So if the panel is left off longer than that we can
+      // over flow the math with it is turned back on.  This (diff <
+      // 0) catches that situation, get's us out of trouble, and
+      // back on track.
+      recalc_value();
+      _then = _now;
+    }
+    text_renderer.puts((char *)(_value.c_str()));
 
-  text_renderer.end();
-  glColor4f(1.0, 1.0, 1.0, 1.0);	// FIXME
-  glPopMatrix();
+    text_renderer.end();
+    glColor4f(1.0, 1.0, 1.0, 1.0);	// FIXME
+    glPopMatrix();
+  }
 }
 
 void
@@ -858,6 +1067,13 @@ FGTextLayer::setPointSize (float size)
   _pointSize = size;
 }
 
+void
+FGTextLayer::setFontName(const string &name)
+{
+  _font_name = name;
+}
+
+
 void
 FGTextLayer::setFont(fntFont * font)
 {
@@ -886,7 +1102,7 @@ FGTextLayer::Chunk::Chunk (const string &text, const string &fmt)
   : _type(FGTextLayer::TEXT), _fmt(fmt)
 {
   _text = text;
-  if (_fmt == "") 
+  if (_fmt.empty()) 
     _fmt = "%s";
 }
 
@@ -894,7 +1110,7 @@ FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
 			   const string &fmt, float mult)
   : _type(type), _fmt(fmt), _mult(mult)
 {
-  if (_fmt == "") {
+  if (_fmt.empty()) {
     if (type == TEXT_VALUE)
       _fmt = "%s";
     else
@@ -906,18 +1122,23 @@ FGTextLayer::Chunk::Chunk (ChunkType type, const SGPropertyNode * node,
 const char *
 FGTextLayer::Chunk::getValue () const
 {
-  switch (_type) {
-  case TEXT:
-    sprintf(_buf, _fmt.c_str(), _text.c_str());
+  if (test()) {
+    _buf[0] = '\0';
+    switch (_type) {
+    case TEXT:
+      sprintf(_buf, _fmt.c_str(), _text.c_str());
+      return _buf;
+    case TEXT_VALUE:
+      sprintf(_buf, _fmt.c_str(), _node->getStringValue());
+      break;
+    case DOUBLE_VALUE:
+      sprintf(_buf, _fmt.c_str(), _node->getFloatValue() * _mult);
+      break;
+    }
     return _buf;
-  case TEXT_VALUE:
-    sprintf(_buf, _fmt.c_str(), _node->getStringValue().c_str());
-    break;
-  case DOUBLE_VALUE:
-    sprintf(_buf, _fmt.c_str(), _node->getFloatValue() * _mult);
-    break;
+  } else {
+    return "";
   }
-  return _buf;
 }
 
 
@@ -942,13 +1163,18 @@ FGSwitchLayer::~FGSwitchLayer ()
 void
 FGSwitchLayer::draw ()
 {
-  transform();
-  if (_node->getBoolValue()) {
-    _layer1->draw();
-  } else {
-    _layer2->draw();
+  if (test()) {
+    transform();
+    if (_node->getBoolValue()) {
+      _layer1->draw();
+    } else {
+      _layer2->draw();
+    }
   }
 }
 
 
 // end of panel.cxx
+
+
+