maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix lighting of rotated particles in 2D

Browse source 
Custom instance transform was not taken into account for normal map
calculation. Also renamed `extra_matrix2` to `extra_matrix_instance` for
more clarity.
This commit is contained in:
JFonS 2018-09-18 22:54:03 +02:00
parent f148e8eede
commit 8f4f79c767
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gles3/shaders/canvas.glsl
View file

@ -120,12 +120,12 @@ void main() {
vec4 color = color_attrib; vec4 color = color_attrib;
#ifdef USE_INSTANCING #ifdef USE_INSTANCING
mat4 extra_matrix2 = extra_matrix * transpose(mat4(instance_xform0, instance_xform1, instance_xform2, vec4(0.0, 0.0, 0.0, 1.0))); mat4 extra_matrix_instance = extra_matrix * transpose(mat4(instance_xform0, instance_xform1, instance_xform2, vec4(0.0, 0.0, 0.0, 1.0)));
color *= instance_color; color *= instance_color;
vec4 instance_custom = instance_custom_data; vec4 instance_custom = instance_custom_data;
#else #else
mat4 extra_matrix2 = extra_matrix; mat4 extra_matrix_instance = extra_matrix;
vec4 instance_custom = vec4(0.0); vec4 instance_custom = vec4(0.0);
#endif #endif
@ -157,7 +157,7 @@ void main() {
#endif #endif
#define extra_matrix extra_matrix2 #define extra_matrix extra_matrix_instance
{ {
/* clang-format off */ /* clang-format off */
@ -246,8 +246,8 @@ VERTEX_SHADER_CODE
pos = outvec.xy; pos = outvec.xy;
#endif #endif
local_rot.xy = normalize((modelview_matrix * (extra_matrix * vec4(1.0, 0.0, 0.0, 0.0))).xy); local_rot.xy = normalize((modelview_matrix * (extra_matrix_instance * vec4(1.0, 0.0, 0.0, 0.0))).xy);
local_rot.zw = normalize((modelview_matrix * (extra_matrix * vec4(0.0, 1.0, 0.0, 0.0))).xy); local_rot.zw = normalize((modelview_matrix * (extra_matrix_instance * vec4(0.0, 1.0, 0.0, 0.0))).xy);
#ifdef USE_TEXTURE_RECT #ifdef USE_TEXTURE_RECT
local_rot.xy *= sign(src_rect.z); local_rot.xy *= sign(src_rect.z);
local_rot.zw *= sign(src_rect.w); local_rot.zw *= sign(src_rect.w);