mgs/gedeng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug in VSM texture

Browse Source
This commit is contained in:
karl 2021-05-23 20:09:21 +02:00
parent 8c5b04ad97
commit da460af0b1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shader/bump.fs
View File

@ -82,6 +82,7 @@ float get_shadow(vec4 fragPosLightSpace, vec3 normal) {
mediump float currentDepth = projCoords.z; mediump float currentDepth = projCoords.z;
// check whether current frag pos is in shadow // check whether current frag pos is in shadow
float p = step(projCoords.z, moments.x); float p = step(projCoords.z, moments.x);
// We divide by this later, so make sure it's not exactly 0 // We divide by this later, so make sure it's not exactly 0
// It seems like it should always be 0.0, but due to interpolation it's not -- it increases with the deviation! // It seems like it should always be 0.0, but due to interpolation it's not -- it increases with the deviation!
// A larger second parameter to max() means more blur (but also more light bleeding) // A larger second parameter to max() means more blur (but also more light bleeding)

4
Shader/shadow.fs
View File

@ -1,7 +1,9 @@
#version 430 #version 430
out vec4 FragColor;
void main() void main()
{ {
// The mean and the mean squared, which we need to calculate the variance // The mean and the mean squared, which we need to calculate the variance
gl_FragColor = vec4(gl_FragCoord.z, gl_FragCoord.z * gl_FragCoord.z, 0.0, 0.0); FragColor = vec4(gl_FragCoord.z, gl_FragCoord.z * gl_FragCoord.z, 0.0, 0.0);
} }

7
include/Gedeng/DirectionalLight.h
View File

@ -19,8 +19,7 @@ class DirectionalLight {
// Create depth texture // Create depth texture
glGenTextures(1, &depth_map); glGenTextures(1, &depth_map);
glBindTexture(GL_TEXTURE_2D, depth_map); glBindTexture(GL_TEXTURE_2D, depth_map);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, SHADOW_WIDTH, SHADOW_HEIGHT, 0, GL_DEPTH_COMPONENT, GL_FLOAT, glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32F, SHADOW_WIDTH, SHADOW_HEIGHT, 0, GL_RGB, GL_FLOAT, NULL);
NULL);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); 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_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@ -28,9 +27,7 @@ class DirectionalLight {
// Attach depth texture as FBO's depth buffer // Attach depth texture as FBO's depth buffer
glBindFramebuffer(GL_FRAMEBUFFER, depth_map_fbo); glBindFramebuffer(GL_FRAMEBUFFER, depth_map_fbo);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, depth_map, 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, depth_map, 0);
glDrawBuffer(GL_NONE);
glReadBuffer(GL_NONE);
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
} }

2
test/shadow-demo/main.cpp
View File

@ -92,10 +92,10 @@ class ShadowDemo : public Gedeng::Application {
void dynamic_update(double delta) override { void dynamic_update(double delta) override {
// Shadows // Shadows
light.clear_shadows(); light.clear_shadows();
light.render_shadow(quad_mesh);
light.render_shadow(mesh1); light.render_shadow(mesh1);
light.render_shadow(mesh2); light.render_shadow(mesh2);
light.render_shadow(mesh3); light.render_shadow(mesh3);
light.render_shadow(quad_mesh);
glViewport(0, 0, 1920, 1080); glViewport(0, 0, 1920, 1080);
glClearColor(0.1, 0.1f, 0.1, 1.0f); glClearColor(0.1, 0.1f, 0.1, 1.0f);