Don't just disable depth buffer writes but instead disable the depth test all together

diff --git a/src/Cockpit/built_in/FGMagRibbon.cxx b/src/Cockpit/built_in/FGMagRibbon.cxx
index 76e9483dd395f2abfa230a60a6f161044b1e67e2..30c35d49aeec801f4faac5139aa38d41fece4c24 100644 (file)
--- a/src/Cockpit/built_in/FGMagRibbon.cxx
+++ b/src/Cockpit/built_in/FGMagRibbon.cxx
@@ -69,7 +69,7 @@ FGMagRibbon::draw ()
   t.setCrop(xoffset, yoffset, xoffset + 0.5, yoffset + 0.25);
 
   glPushAttrib(GL_DEPTH_BUFFER_BIT);
-  glDepthMask(GL_TRUE);
+  glEnable(GL_DEPTH_TEST);
   FGTexturedLayer::draw();
   glPopAttrib();
 }

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index af851a1f19761b442858b4ab50d8e0b2e447d99f..7706583499f92792e9ac046f3ea58c1c6a4bbff2 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -379,7 +379,7 @@ FGPanel::draw()
   glEnable(GL_COLOR_MATERIAL);
   glEnable(GL_CULL_FACE);
   glCullFace(GL_BACK);
-  glDepthMask(GL_FALSE);
+  glDisable(GL_DEPTH_TEST);
   sgVec4 panel_color;
   sgCopyVec4( panel_color, cur_light_params.scene_diffuse );
   if ( fgGetDouble("/systems/electrical/outputs/instrument-lights") > 1.0 ) {
@@ -426,10 +426,6 @@ FGPanel::draw()
   instrument_list_type::const_iterator current = _instruments.begin();
   instrument_list_type::const_iterator end = _instruments.end();
 
-  // Don't let the instruments be visible trhought the roof of the c310-3d
-  // This does hurt the magnetic compass in the default c172-3d,
-  //  but we need a real 3d compass anyway.
-  glPolygonOffset(-1, -5*POFF_UNITS);
   for ( ; current != end; current++) {
     FGPanelInstrument * instr = *current;
     glPushMatrix();
@@ -441,15 +437,11 @@ FGPanel::draw()
   // Draw yellow "hotspots" if directed to.  This is a panel authoring
   // feature; not intended to be high performance or to look good.
   if ( fgGetBool("/sim/panel-hotspots") ) {
-    glPushAttrib(GL_ALL_ATTRIB_BITS);
-    glDisable(GL_DEPTH_TEST);
     glDisable(GL_TEXTURE_2D);
     glColor3f(1, 1, 0);
     
     for ( unsigned int i = 0; i < _instruments.size(); i++ )
       _instruments[i]->drawHotspots();
-
-    glPopAttrib();
   }
 
 
@@ -784,7 +776,6 @@ FGLayeredInstrument::draw ()
   
   for (int i = 0; i < (int)_layers.size(); i++) {
     glPushMatrix();
-    // glPolygonOffset(-1, -POFF_UNITS*(i+2));
     _layers[i]->draw();
     glPopMatrix();
   }