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

Merge pull request #100859 from StaydMcMuffin/scene-shaders-user-normal-fix

Browse Source 
Fix User-supplied Normals Being Ignored
This commit is contained in:
Thaddeus Crews
2024-12-30 08:58:47 -06:00
parent df2b117ec2 40f17127ef
commit 58b48a934e
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gles3/shaders/scene.glsl
View File

@ -1816,7 +1816,6 @@ void main() {
normal = -normal;
}
#endif // DO_SIDE_CHECK
vec3 geo_normal = normalize(normal);
#endif // NORMAL_USED
#ifdef UV_USED
@ -1882,6 +1881,10 @@ void main() {
#endif //USE_MULTIVIEW
#endif //LIGHT_VERTEX_USED
#ifdef NORMAL_USED
vec3 geo_normal = normalize(normal);
#endif // NORMAL_USED
#ifndef USE_SHADOW_TO_OPACITY
#if defined(ALPHA_SCISSOR_USED)

5
servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
View File

@ -1174,7 +1174,6 @@ void fragment_shader(in SceneData scene_data) {
normal = -normal;
}
#endif // DO_SIDE_CHECK
vec3 geo_normal = normalize(normal);
#endif // NORMAL_USED
#ifdef UV_USED
@ -1254,6 +1253,10 @@ void fragment_shader(in SceneData scene_data) {
#endif //USE_MULTIVIEW
#endif //LIGHT_VERTEX_USED
#ifdef NORMAL_USED
vec3 geo_normal = normalize(normal);
#endif // NORMAL_USED
#ifndef USE_SHADOW_TO_OPACITY
#ifdef ALPHA_SCISSOR_USED

5
servers/rendering/renderer_rd/shaders/forward_mobile/scene_forward_mobile.glsl
View File

@ -898,7 +898,6 @@ void main() {
normal = -normal;
}
#endif // DO_SIDE_CHECK
vec3 geo_normal = normalize(normal);
#endif // NORMAL_USED
#ifdef UV_USED
@ -975,6 +974,10 @@ void main() {
#endif //USE_MULTIVIEW
#endif //LIGHT_VERTEX_USED
#ifdef NORMAL_USED
vec3 geo_normal = normalize(normal);
#endif // NORMAL_USED
#ifdef LIGHT_TRANSMITTANCE_USED
#ifdef SSS_MODE_SKIN
transmittance_color.a = sss_strength;