better random seed ssao

thomas-deliot · Jan 10, 2018 · aeaaac7 · aeaaac7
1 parent e8ee4f0
commit aeaaac7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Camera.h b/Camera.h
@@ -41,7 +41,7 @@ class Camera : public Component
 	{
 		finalDeferred = read_program("m2tp/Shaders/finalDeferred.glsl");
 		finalDeferredSSR = read_program("m2tp/Shaders/finalDeferredSSR.glsl");
-		shaderSSAO = read_program("m2tp/Shaders/SSAO.glsl");
+		//shaderSSAO = read_program("m2tp/Shaders/SSAO.glsl");
 		SetParameters(frameWidth, frameHeight, fov, nearZ, farZ);
 	}
 

diff --git a/Engine.h b/Engine.h
@@ -111,7 +111,7 @@ class Engine : public App
 		mainCamera->FinishDeferredRendering(mainLight, ambientLight, true);
 
 		// Draw post effects
-		mainCamera->DrawPostEffects();
+		//mainCamera->DrawPostEffects();
 
 		// Blit to screen
 		glBindFramebuffer(GL_READ_FRAMEBUFFER, mainCamera->GetFrameBuffer());

diff --git a/Shaders/SSAO.glsl b/Shaders/SSAO.glsl
@@ -50,14 +50,18 @@ void main()
 	vec3 vsNormal = mat3(viewMatrix) * worldNormal;
 	float z = texture(depthBuffer, vtexcoord).x;
 	if(z >= 0.9999f)
-		return temp;
+	{
+		finalColor = temp;
+		return;
+	}
 
 	vec4 clipSpacePosition = vec4(vtexcoord.xy * 2.0 - 1.0, z * 2.0 - 1.0, 1);
 	vec4 viewSpacePosition = invProj * clipSpacePosition;
 	viewSpacePosition /= viewSpacePosition.w;
 	vec3 vsPos = viewSpacePosition.xyz;
 
-	finalColor = vec4(temp.rgb * ComputeSSAOAtten(vsPos, vsNormal), temp.a);
+	//finalColor = vec4(temp.rgb * ComputeSSAOAtten(vsPos, vsNormal), temp.a);
+	finalColor = vec4(worldNormal.xyz, 1);
 }
 
 

diff --git a/Shaders/finalDeferredSSR.glsl b/Shaders/finalDeferredSSR.glsl
@@ -172,7 +172,8 @@ float ComputeSSAOAtten(vec3 vsPos, vec3 vsNormal)
 			vec3 sampleTangent = vec3(sin(angleTheta) * cos(anglePhi),  sin(angleTheta) * sin(anglePhi), cos(angleTheta));
 			vec3 sampleVector = sampleTangent.x * rightDir + sampleTangent.y * upDir + sampleTangent.z * vsNormal;
 
-			vec2 seed = vec2(sampleVector.x + sampleTangent.z + vsNormal.y, sampleVector.z + sampleTangent.y + vsNormal.x);
+			vec2 seed = vec2(vsPos.y * vsPos.x + sampleVector.x + sampleTangent.z + vsNormal.y,
+				vsPos.z * vsPos.y + sampleVector.z + sampleTangent.y + vsNormal.x);
 			vec3 samplePos = vsPos + sampleVector * GetRandomNumberBetween(seed, 1.0, ssaoDist);
 			vec4 temp = projToPixel * vec4(samplePos, 1);
 			temp.xyz /= temp.w;