godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51411 from clayjohn/VULKAN-blinn-phong

Browse Source 
[4.0] Make Blinn and Phong specular modes take albedo into account
This commit is contained in:
Rémi Verschelde 2021-08-10 21:11:48 +02:00 committed by GitHub
commit afb40920fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/rendering/renderer_rd/shaders/scene_forward_lights_inc.glsl
View File

@ -208,11 +208,10 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, float atte
//normalized blinn //normalized blinn
float shininess = exp2(15.0 * (1.0 - roughness) + 1.0) * 0.25; float shininess = exp2(15.0 * (1.0 - roughness) + 1.0) * 0.25;
float blinn = pow(cNdotH, shininess) * cNdotL; float blinn = pow(cNdotH, shininess);
blinn *= (shininess + 8.0) * (1.0 / (8.0 * M_PI)); blinn *= (shininess + 2.0) * (1.0 / (8.0 * M_PI));
float intensity = blinn;
specular_light += light_color * intensity * attenuation * specular_amount; specular_light += light_color * attenuation * specular_amount * blinn * albedo * unpackUnorm4x8(orms).w;
#elif defined(SPECULAR_PHONG) #elif defined(SPECULAR_PHONG)
@ -220,10 +219,9 @@ void light_compute(vec3 N, vec3 L, vec3 V, float A, vec3 light_color, float atte
float cRdotV = clamp(A + dot(R, V), 0.0, 1.0); float cRdotV = clamp(A + dot(R, V), 0.0, 1.0);
float shininess = exp2(15.0 * (1.0 - roughness) + 1.0) * 0.25; float shininess = exp2(15.0 * (1.0 - roughness) + 1.0) * 0.25;
float phong = pow(cRdotV, shininess); float phong = pow(cRdotV, shininess);
phong *= (shininess + 8.0) * (1.0 / (8.0 * M_PI)); phong *= (shininess + 1.0) * (1.0 / (8.0 * M_PI));
float intensity = (phong) / max(4.0 * cNdotV * cNdotL, 0.75);
specular_light += light_color * intensity * attenuation * specular_amount; specular_light += light_color * attenuation * specular_amount * phong * albedo * unpackUnorm4x8(orms).w;
#elif defined(SPECULAR_TOON) #elif defined(SPECULAR_TOON)