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

Only perform modelview transform on tangent and binormal when vertex shader is in local space

Browse Source
This commit is contained in:
clayjohn 2023-10-05 22:05:44 -06:00
parent f2ba8ec6ca
commit af1d81d95a
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,13 +417,12 @@ void main() {
normal = modelview_normal * normal; normal = modelview_normal * normal;
#endif #endif
#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 = modelview_normal * binormal; binormal = modelview_normal * binormal;
tangent = modelview_normal * tangent; tangent = modelview_normal * tangent;
#endif #endif
#endif // !defined(SKIP_TRANSFORM_USED) && !defined(VERTEX_WORLD_COORDS_USED)
// Using world coordinates // Using world coordinates
#if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED) #if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED)

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

@ -411,13 +411,12 @@ void vertex_shader(vec3 vertex_input,
normal = modelview_normal * normal; normal = modelview_normal * normal;
#endif #endif
#endif
#ifdef TANGENT_USED #ifdef TANGENT_USED
binormal = modelview_normal * binormal; binormal = modelview_normal * binormal;
tangent = modelview_normal * tangent; tangent = modelview_normal * tangent;
#endif #endif
#endif // !defined(SKIP_TRANSFORM_USED) && !defined(VERTEX_WORLD_COORDS_USED)
//using world coordinates //using world coordinates
#if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED) #if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED)

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

@ -408,13 +408,12 @@ void main() {
normal = modelview_normal * normal; normal = modelview_normal * normal;
#endif #endif
#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 = modelview_normal * binormal; binormal = modelview_normal * binormal;
tangent = modelview_normal * tangent; tangent = modelview_normal * tangent;
#endif #endif
#endif // !defined(SKIP_TRANSFORM_USED) && !defined(VERTEX_WORLD_COORDS_USED)
//using world coordinates //using world coordinates
#if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED) #if !defined(SKIP_TRANSFORM_USED) && defined(VERTEX_WORLD_COORDS_USED)