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

Reduced shadow aliasing in cmodview by using 4-sample percentage closer filtering.

sensor-dev
Chris Laurel 2010-03-10 01:04:26 +00:00
parent 8fb1e59159
commit a452539e60
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/cmod/glframebuffer.cpp
View File

@ -88,13 +88,20 @@ GLFrameBufferObject::generateDepthTexture()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// Set up the depth texture for shadow mapping
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
glTexParameteri(GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY);
// Clamp to edge
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
// Set the texture dimensions
// Do we need to set GL_DEPTH_COMPONENT24 here?
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, m_width, m_height, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, m_width, m_height, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0);
// Unbind the texture
glBindTexture(GL_TEXTURE_2D, 0);

20
src/tools/cmod/modelviewwidget.cpp
View File

@ -19,6 +19,8 @@ using namespace cmod;
using namespace Eigen;
#define DEBUG_SHADOWS 0
static const float VIEWPORT_FOV = 45.0;
static const double PI = 3.1415926535897932;
@ -1358,7 +1360,7 @@ ModelViewWidget::createShader(const ShaderKey& shaderKey)
for (unsigned int i = 0; i < shaderKey.shadowCount(); ++i)
{
fout << "uniform sampler2D shadowTexture" << i << ";\n";
fout << "uniform sampler2DShadow shadowTexture" << i << ";\n";
}
fout << "void main(void)\n";
@ -1435,8 +1437,20 @@ ModelViewWidget::createShader(const ShaderKey& shaderKey)
if (shaderKey.shadowCount() > 0)
{
fout << " float lightDistance = texture2D(shadowTexture" << lightIndex << ", shadowCoord[" << lightIndex << "].xy).z;\n";
fout << " if (lightDistance < shadowCoord[" << lightIndex << "].z + 0.0005) selfShadow = 0.0;\n";
// Normal 2D texture
//fout << " float lightDistance = texture2D(shadowTexture" << lightIndex << ", shadowCoord[" << lightIndex << "].xy).z;\n";
//fout << " if (lightDistance < shadowCoord[" << lightIndex << "].z + 0.0005) selfShadow = 0.0;\n";
// Depth texture
// fout << " selfShadow = shadow2D(shadowTexture" << lightIndex << ", shadowCoord[" << lightIndex << "].xyz + vec3(0.0, 0.0, 0.0005)).z;\n";
// Four-sample PCF with depth texture
fout << " float texelSize = 1.0 / 1024.0;\n";
fout << " float s = 0.0;\n";
fout << " for (float y = -0.5; y <= 0.5; y += 1.0)";
fout << " for (float x = -0.5; x <= 0.5; x += 1.0)";
fout << " s += shadow2D(shadowTexture" << lightIndex << ", shadowCoord[" << lightIndex << "].xyz + vec3(x * texelSize, y * texelSize, 0.0005)).z;\n";
fout << " selfShadow *= s * 0.25;\n";
}
fout << " light += lightColor[" << lightIndex << "] * (d * selfShadow);\n";