Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

introducing PBR shading

Browse source
This commit is contained in:
Sam Gateau 2015-02-08 23:22:14 -08:00
parent 469ee29f0b
commit 48fca4c11d
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/render-utils/src/DeferredGlobalLight.slh
View file

@ -79,12 +79,18 @@ vec3 evalAmbienSphereGlobalColor(float shadowAttenuation, vec3 position, vec3 no
vec4 fragEyeVector = invViewMat * vec4(-position, 0.0); vec4 fragEyeVector = invViewMat * vec4(-position, 0.0);
vec3 fragEyeDir = normalize(fragEyeVector.xyz); vec3 fragEyeDir = normalize(fragEyeVector.xyz);
vec3 color = diffuse.rgb * 0.5 * evalSphericalLight(ambientSphere, fragNormal).xyz; vec3 ambientNormal = normal;
vec3 color = diffuse.rgb * 0.5 * evalSphericalLight(ambientSphere, ambientNormal).xyz;
vec4 shading = evalFragShading(fragNormal, -getLightDirection(light), fragEyeDir, specular, gloss); vec4 shading = evalFragShading(fragNormal, -getLightDirection(light), fragEyeDir, specular, gloss);
color += vec3(diffuse + shading.rgb) * shading.w * shadowAttenuation * getLightColor(light) * getLightIntensity(light); color += vec3(diffuse + shading.rgb) * shading.w * shadowAttenuation * getLightColor(light) * getLightIntensity(light);
if (gl_FragCoord.x > 1000) {
return vec3(shading.rgb);
}
return color; return color;
} }

11
libraries/render-utils/src/DeferredLighting.slh
View file

@ -21,8 +21,15 @@ vec4 evalFragShading(vec3 fragNormal, vec3 fragLightDir, vec3 fragEyeDir, vec3 s
// Specular Lighting depends on the half vector and the gloss // Specular Lighting depends on the half vector and the gloss
vec3 halfDir = normalize(fragEyeDir + fragLightDir); vec3 halfDir = normalize(fragEyeDir + fragLightDir);
float specularPower = facingLight * max(0.0, dot(fragEyeDir, halfDir)); float specularPower = pow(facingLight * max(0.0, dot(halfDir, fragNormal)), gloss * 128.0);
vec3 reflect = pow(specularPower, gloss * 128.0) * specular; specularPower *= (gloss * 128.0 * 0.125 + 0.25);
float shlickPower = (1.0 - dot(fragLightDir,halfDir));
float shlickPower2 = shlickPower * shlickPower;
float shlickPower5 = shlickPower2 * shlickPower2 * shlickPower;
// vec3 schlick = specular * (1.0 - shlickPower5) + vec3(shlickPower5);
vec3 schlick = vec3(0.21) * (1.0 - shlickPower5) + vec3(shlickPower5);
vec3 reflect = specularPower * schlick;
return vec4(reflect, diffuse); return vec4(reflect, diffuse);
} }

2
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -425,7 +425,7 @@ void DeferredLightingEffect::render() {
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
freeFBO->release(); freeFBO->release();
// glDisable(GL_FRAMEBUFFER_SRGB); // glDisable(GL_FRAMEBUFFER_SRGB);
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);