spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug 1855894, that caused planets to show up black when: 

- scattering atmospheres were enabled, and
- a mesh was used, and
- the planet texture had an atmosphere
The fix is to not disable z writes when atmospheric scattering is enabled. This
prevents the atmosphere shell from occluding the planet itself.
ver1_5_1
Chris Laurel 2008-01-02 23:52:30 +00:00
parent 51e226c547
commit f48a5b8566
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/celengine/rendcontext.cpp
View File

@ -647,9 +647,18 @@ GLSL_RenderContext::makeCurrent(const Mesh::Material& m)
prog->lunarLambert = lunarLambert;
}
// Generally, we want to disable depth writes for blend because it
// makes translucent objects look a bit better (though there are
// still problems when rendering them without sorting.) However,
// when scattering atmospheres are enabled, we need to render with
// depth writes on, otherwise the atmosphere will be drawn over
// a planet mesh. See SourceForge bug #1855894 for more details.
bool disableDepthWriteOnBlend = true;
if (shaderProps.hasScattering())
{
prog->setAtmosphereParameters(*atmosphere, objRadius, objRadius);
disableDepthWriteOnBlend = false;
}
if ((shaderProps.texUsage & ShaderProperties::PointSprite) != 0)
@ -673,12 +682,12 @@ GLSL_RenderContext::makeCurrent(const Mesh::Material& m)
case Mesh::NormalBlend:
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glDepthMask(GL_FALSE);
glDepthMask(disableDepthWriteOnBlend ? GL_FALSE : GL_TRUE);
break;
case Mesh::AdditiveBlend:
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
glDepthMask(GL_FALSE);
glDepthMask(disableDepthWriteOnBlend ? GL_FALSE : GL_TRUE);
break;
default:
glDisable(GL_BLEND);