fly/flightgear
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
ehofman 2003-09-16 16:27:01 +00:00
parent 174852f01e
commit 0f6e4e1c74
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Cockpit/built_in/FGMagRibbon.cxx
View file

@ -69,7 +69,7 @@ FGMagRibbon::draw ()
t.setCrop(xoffset, yoffset, xoffset + 0.5, yoffset + 0.25); t.setCrop(xoffset, yoffset, xoffset + 0.5, yoffset + 0.25);
glPushAttrib(GL_DEPTH_BUFFER_BIT); glPushAttrib(GL_DEPTH_BUFFER_BIT);
glDepthMask(GL_TRUE); glEnable(GL_DEPTH_TEST);
FGTexturedLayer::draw(); FGTexturedLayer::draw();
glPopAttrib(); glPopAttrib();
} }

11
src/Cockpit/panel.cxx
View file

@ -379,7 +379,7 @@ FGPanel::draw()
glEnable(GL_COLOR_MATERIAL); glEnable(GL_COLOR_MATERIAL);
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
glCullFace(GL_BACK); glCullFace(GL_BACK);
glDepthMask(GL_FALSE); glDisable(GL_DEPTH_TEST);
sgVec4 panel_color; sgVec4 panel_color;
sgCopyVec4( panel_color, cur_light_params.scene_diffuse ); sgCopyVec4( panel_color, cur_light_params.scene_diffuse );
if ( fgGetDouble("/systems/electrical/outputs/instrument-lights") > 1.0 ) { 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 current = _instruments.begin();
instrument_list_type::const_iterator end = _instruments.end(); 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++) { for ( ; current != end; current++) {
FGPanelInstrument * instr = *current; FGPanelInstrument * instr = *current;
glPushMatrix(); glPushMatrix();
@ -441,15 +437,11 @@ FGPanel::draw()
// Draw yellow "hotspots" if directed to. This is a panel authoring // Draw yellow "hotspots" if directed to. This is a panel authoring
// feature; not intended to be high performance or to look good. // feature; not intended to be high performance or to look good.
if ( fgGetBool("/sim/panel-hotspots") ) { if ( fgGetBool("/sim/panel-hotspots") ) {
glPushAttrib(GL_ALL_ATTRIB_BITS);
glDisable(GL_DEPTH_TEST);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glColor3f(1, 1, 0); glColor3f(1, 1, 0);
for ( unsigned int i = 0; i < _instruments.size(); i++ ) for ( unsigned int i = 0; i < _instruments.size(); i++ )
_instruments[i]->drawHotspots(); _instruments[i]->drawHotspots();
glPopAttrib();
} }
@ -784,7 +776,6 @@ FGLayeredInstrument::draw ()
for (int i = 0; i < (int)_layers.size(); i++) { for (int i = 0; i < (int)_layers.size(); i++) {
glPushMatrix(); glPushMatrix();
// glPolygonOffset(-1, -POFF_UNITS*(i+2));
_layers[i]->draw(); _layers[i]->draw();
glPopMatrix(); glPopMatrix();
} }