fly/flightgear
1
0
Fork 0
Code Activity

Enable back face culling for cockpit instruments, disable depth buffer writes for 2d instruments but enable depth buffer writes for the magnetic compass. Does anyone care to create a 3d magnetic compass?

Browse source
This commit is contained in:
ehofman 2003-09-16 10:02:32 +00:00
parent a5bd132143
commit 44fda9805b
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,7 +67,11 @@ FGMagRibbon::draw ()
FGCroppedTexture &t = getTexture(); FGCroppedTexture &t = getTexture();
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);
glDepthMask(GL_TRUE);
FGTexturedLayer::draw(); FGTexturedLayer::draw();
glPopAttrib();
} }
// end of FGMagRibbon.cxx // end of FGMagRibbon.cxx

11
src/Cockpit/panel.cxx
View file

@ -346,9 +346,7 @@ FGPanel::update (GLfloat winx, GLfloat winw, GLfloat winy, GLfloat winh)
glTranslated(x_offset, y_offset, 0); glTranslated(x_offset, y_offset, 0);
glDepthMask(GL_FALSE);
draw(); draw();
glDepthMask(GL_TRUE);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPopMatrix(); glPopMatrix();
@ -370,7 +368,8 @@ FGPanel::draw()
// save some state // save some state
glPushAttrib( GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_LIGHTING_BIT glPushAttrib( GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_LIGHTING_BIT
| GL_TEXTURE_BIT | GL_PIXEL_MODE_BIT ); | GL_TEXTURE_BIT | GL_PIXEL_MODE_BIT | GL_CULL_FACE
| GL_DEPTH_BUFFER_BIT );
// Draw the background // Draw the background
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
@ -378,6 +377,8 @@ FGPanel::draw()
glEnable(GL_BLEND); glEnable(GL_BLEND);
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
glEnable(GL_COLOR_MATERIAL); glEnable(GL_COLOR_MATERIAL);
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
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 ) {
@ -424,6 +425,10 @@ 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.
glDepthMask(GL_FALSE);
for ( ; current != end; current++) { for ( ; current != end; current++) {
FGPanelInstrument * instr = *current; FGPanelInstrument * instr = *current;
glPushMatrix(); glPushMatrix();