TD3 - ex3

Author: CHAMPETIER CLEMENT

TD2/002/002_deferred.cpp

@@ -606,7 +606,7 @@ int main( int argc, char **argv )
         glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
         /////////////////////////////////////////////////////////////////
-        // Compute all light and render the merge into the main window //
+        // Compute all lights and render the merge into the main window //
         /////////////////////////////////////////////////////////////////
 
         // Reset Viewport

TD3/003/003.cpp

@@ -280,6 +280,9 @@ int main( int argc, char **argv )
     GLuint lighting_lightColorLocation = glGetUniformLocation(lighting_shader.program, "LightColor");
     GLuint lighting_lightIntensityLocation = glGetUniformLocation(lighting_shader.program, "LightIntensity");
     GLuint lighting_shadowBiasLocation = glGetUniformLocation(lighting_shader.program, "ShadowBias");
+    GLuint lighting_shadowSamplesLocation = glGetUniformLocation(lighting_shader.program, "ShadowSamples");
+    GLuint lighting_shadowSpreadLocation = glGetUniformLocation(lighting_shader.program, "ShadowSpread");
+
 
 
     /* --------------------------------------------------------------------------------------------- */
@@ -546,9 +549,6 @@ int main( int argc, char **argv )
 
             // Compute light positions
             // TO DO : several lights, each sent to the shadow shader
-            //for(unsigned int i = 0; i < numLights; ++i){
-            //
-            //}
             glm::vec3 lightPosition(5.f, 5.f, 5.f);
             glm::vec3 lightTarget(0.f, 0.f, 0.f);
             glm::vec3 lightUp(0.f, 1.f, 0.f);
@@ -573,14 +573,11 @@ int main( int argc, char **argv )
         // Unbind framebuffer
         glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
-
-
         /* --------------------------------------------------------------------------------------------- */
         /* ------------------------------ Remplissage du Shadow Frame Buffer --------------------------- */
         /* --------------------------------------------------------------------------------------------- */
 
         glBindFramebuffer(GL_FRAMEBUFFER, gbufferFbo[1]);
-
             // Viewport 
             glViewport(0, 0, width, height);
 
@@ -603,8 +600,6 @@ int main( int argc, char **argv )
             glDrawElementsInstanced(GL_TRIANGLES, cube_triangleCount * 3, GL_UNSIGNED_INT, (void*)0, 4);
             glBindVertexArray(vao[1]);
             glDrawElements(GL_TRIANGLES, plane_triangleCount * 3, GL_UNSIGNED_INT, (void*)0);
-
-
         glBindFramebuffer(GL_FRAMEBUFFER, 0);
 
         /* --------------------------------------------------------------------------------------------- */
@@ -655,6 +650,8 @@ int main( int argc, char **argv )
         glUniform3fv(lighting_lightColorLocation, 1, lightColor);
         glUniform1f(lighting_lightIntensityLocation, lightIntensity);
         glUniform1f(lighting_shadowBiasLocation, shadowBias);
+        glUniform1f(lighting_shadowSamplesLocation, shadowSamples);
+        glUniform1f(lighting_shadowSpreadLocation, shadowSampleSpread);
 
         // Draw quad
         glBindVertexArray(vao[2]);

TD3/003/light.glsl

@@ -30,6 +30,8 @@ uniform mat4  InverseViewProjection;
 uniform mat4  LigthToShadowMap;
 uniform float Time;
 uniform float ShadowBias;
+uniform float ShadowSamples;
+uniform float ShadowSpread;
 
 out vec4 Color;
 
@@ -76,29 +78,48 @@ void main(void)
 
 	vec3 cspotlight1 = spotLight(LightColor, LightIntensity, LightDirection, LightPosition, n, position, diffuse, spec, CameraPosition );
 
-	//Color = vec4(cspotlight1, 1.0);
+	// Poisson disk
+	vec2 poissonDisk[16] = vec2[](
+        vec2( -0.94201624, -0.39906216 ),
+        vec2( 0.94558609, -0.76890725 ),
+        vec2( -0.094184101, -0.92938870 ),
+        vec2( 0.34495938, 0.29387760 ),
+        vec2( -0.91588581, 0.45771432 ),
+        vec2( -0.81544232, -0.87912464 ),
+        vec2( -0.38277543, 0.27676845 ),
+        vec2( 0.97484398, 0.75648379 ),
+        vec2( 0.44323325, -0.97511554 ),
+        vec2( 0.53742981, -0.47373420 ),
+        vec2( -0.26496911, -0.41893023 ),
+        vec2( 0.79197514, 0.19090188 ),
+        vec2( -0.24188840, 0.99706507 ),
+        vec2( -0.81409955, 0.91437590 ),
+        vec2( 0.19984126, 0.78641367 ),
+        vec2( 0.14383161, -0.14100790 )
+	);
+
+	float visibility = 1.0;
+	float visibilityOffset = 1.0 / ShadowSamples;
 
-	//Color = vec4(lightSpacePosition.z, 0, 0, 1);
-	//Color = lightDepth;
-
+	for(int i = 0; i < 16; i++) {
+	  	if(texture(ShadowMap, lightSpacePosition.xy + poissonDisk[i]/ShadowSpread).r  + ShadowBias < lightSpacePosition.z) {
+		    visibility-=visibilityOffset;
+		}
+	}
+		
 	Color = vec4(0, 0, 0, 0);
 	if(lightSpacePosition.z < shadowPixel.x + ShadowBias) {
-		if (wlightSpacePosition.w > 0.0  && 
+		// En dehors du champs de la lumière
+		if(wlightSpacePosition.w > 0.0  && 
 			lightSpacePosition.x > 0.0 && 
 			lightSpacePosition.x < 1.0 && 
 			lightSpacePosition.y > 0.0 && 
 			lightSpacePosition.y < 1.0 )
 		{
-			Color = vec4(cspotlight1, 1.0);
-		}
-		else{
-			Color = vec4(1, 0, 0, 1);
+			Color = vec4(cspotlight1 * visibility, 1.0);
 		}
 	}
 
-
-	//Color = vec4(lightSpacePosition.z, 0, 0, 1) - lightDepth;
-
 }
 
 #endif