godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix `world_vertex_coords` render mode usage in the shaders

This commit is contained in:
Yuri Roubinsky 2022-01-04 17:06:12 +03:00
parent b74968c2ca
commit 5123ffe4a7
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl
View File

@ -251,7 +251,9 @@ void main() {
vertex = (world_matrix * vec4(vertex, 1.0)).xyz; vertex = (world_matrix * vec4(vertex, 1.0)).xyz;
#ifdef NORMAL_USED
normal = world_normal_matrix * normal; normal = world_normal_matrix * normal;
#endif
#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED) #if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
@ -290,12 +292,13 @@ void main() {
#if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED) #if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED)
vertex = (scene_data.inv_camera_matrix * vec4(vertex, 1.0)).xyz; vertex = (scene_data.inv_camera_matrix * vec4(vertex, 1.0)).xyz;
normal = mat3(scene_data.inverse_normal_matrix) * normal; #ifdef NORMAL_USED
normal = (scene_data.inv_camera_matrix * vec4(normal, 0.0)).xyz;
#endif
#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED) #if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
binormal = (scene_data.inv_camera_matrix * vec4(binormal, 0.0)).xyz;
binormal = mat3(scene_data.camera_inverse_binormal_matrix) * binormal; tangent = (scene_data.inv_camera_matrix * vec4(tangent, 0.0)).xyz;
tangent = mat3(scene_data.camera_inverse_tangent_matrix) * tangent;
#endif #endif
#endif #endif

11
servers/rendering/renderer_rd/shaders/scene_forward_mobile.glsl
View File

@ -261,7 +261,9 @@ void main() {
vertex = (world_matrix * vec4(vertex, 1.0)).xyz; vertex = (world_matrix * vec4(vertex, 1.0)).xyz;
#ifdef NORMAL_USED
normal = world_normal_matrix * normal; normal = world_normal_matrix * normal;
#endif
#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED) #if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
@ -302,12 +304,13 @@ void main() {
#if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED) #if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED)
vertex = (scene_data.inv_camera_matrix * vec4(vertex, 1.0)).xyz; vertex = (scene_data.inv_camera_matrix * vec4(vertex, 1.0)).xyz;
normal = mat3(scene_data.inverse_normal_matrix) * normal; #ifdef NORMAL_USED
normal = (scene_data.inv_camera_matrix * vec4(normal, 0.0)).xyz;
#endif
#if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED) #if defined(TANGENT_USED) || defined(NORMAL_MAP_USED) || defined(LIGHT_ANISOTROPY_USED)
binormal = (scene_data.inv_camera_matrix * vec4(binormal, 0.0)).xyz;
binormal = mat3(scene_data.camera_inverse_binormal_matrix) * binormal; tangent = (scene_data.inv_camera_matrix * vec4(tangent, 0.0)).xyz;
tangent = mat3(scene_data.camera_inverse_tangent_matrix) * tangent;
#endif #endif
#endif #endif