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

Fix precision issue with skeletons, closes #26057, closes #26062

Browse Source
This commit is contained in:
Juan Linietsky
2019-02-22 13:26:05 -03:00
parent 513b7ddab6
commit 95e34967d8
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ layout(location = 5) in vec2 uv2_attrib;
#ifdef USE_SKELETON #ifdef USE_SKELETON
layout(location = 6) in uvec4 bone_indices; // attrib:6 layout(location = 6) in uvec4 bone_indices; // attrib:6
layout(location = 7) in vec4 bone_weights; // attrib:7 layout(location = 7) in highp vec4 bone_weights; // attrib:7
#endif #endif
#ifdef USE_INSTANCING #ifdef USE_INSTANCING
@ -314,7 +314,7 @@ void main() {
highp vec4 vertex = vertex_attrib; // vec4(vertex_attrib.xyz * data_attrib.x,1.0); highp vec4 vertex = vertex_attrib; // vec4(vertex_attrib.xyz * data_attrib.x,1.0);
mat4 world_matrix = world_transform; highp mat4 world_matrix = world_transform;
#ifdef USE_INSTANCING #ifdef USE_INSTANCING
@ -395,44 +395,46 @@ void main() {
ivec4 bone_indicesi = ivec4(bone_indices); // cast to signed int ivec4 bone_indicesi = ivec4(bone_indices); // cast to signed int
ivec2 tex_ofs = ivec2(bone_indicesi.x % 256, (bone_indicesi.x / 256) * 3); ivec2 tex_ofs = ivec2(bone_indicesi.x % 256, (bone_indicesi.x / 256) * 3);
highp mat3x4 m; highp mat4 m;
m = mat3x4( m = mat4(
texelFetch(skeleton_texture, tex_ofs, 0), texelFetch(skeleton_texture, tex_ofs, 0),
texelFetch(skeleton_texture, tex_ofs + ivec2(0, 1), 0), texelFetch(skeleton_texture, tex_ofs + ivec2(0, 1), 0),
texelFetch(skeleton_texture, tex_ofs + ivec2(0, 2), 0)) * texelFetch(skeleton_texture, tex_ofs + ivec2(0, 2), 0),
vec4(0.0,0.0,0.0,1.0)) *
bone_weights.x; bone_weights.x;
tex_ofs = ivec2(bone_indicesi.y % 256, (bone_indicesi.y / 256) * 3); tex_ofs = ivec2(bone_indicesi.y % 256, (bone_indicesi.y / 256) * 3);
m += mat3x4( m += mat4(
texelFetch(skeleton_texture, tex_ofs, 0), texelFetch(skeleton_texture, tex_ofs, 0),
texelFetch(skeleton_texture, tex_ofs + ivec2(0, 1), 0), texelFetch(skeleton_texture, tex_ofs + ivec2(0, 1), 0),
texelFetch(skeleton_texture, tex_ofs + ivec2(0, 2), 0)) * texelFetch(skeleton_texture, tex_ofs + ivec2(0, 2), 0),
vec4(0.0,0.0,0.0,1.0)) *
bone_weights.y; bone_weights.y;
tex_ofs = ivec2(bone_indicesi.z % 256, (bone_indicesi.z / 256) * 3); tex_ofs = ivec2(bone_indicesi.z % 256, (bone_indicesi.z / 256) * 3);
m += mat3x4( m += mat4(
texelFetch(skeleton_texture, tex_ofs, 0), texelFetch(skeleton_texture, tex_ofs, 0),
texelFetch(skeleton_texture, tex_ofs + ivec2(0, 1), 0), texelFetch(skeleton_texture, tex_ofs + ivec2(0, 1), 0),
texelFetch(skeleton_texture, tex_ofs + ivec2(0, 2), 0)) * texelFetch(skeleton_texture, tex_ofs + ivec2(0, 2), 0),
vec4(0.0,0.0,0.0,1.0)) *
bone_weights.z; bone_weights.z;
tex_ofs = ivec2(bone_indicesi.w % 256, (bone_indicesi.w / 256) * 3); tex_ofs = ivec2(bone_indicesi.w % 256, (bone_indicesi.w / 256) * 3);
m += mat3x4( m += mat4(
texelFetch(skeleton_texture, tex_ofs, 0), texelFetch(skeleton_texture, tex_ofs, 0),
texelFetch(skeleton_texture, tex_ofs + ivec2(0, 1), 0), texelFetch(skeleton_texture, tex_ofs + ivec2(0, 1), 0),
texelFetch(skeleton_texture, tex_ofs + ivec2(0, 2), 0)) * texelFetch(skeleton_texture, tex_ofs + ivec2(0, 2), 0),
vec4(0.0,0.0,0.0,1.0)) *
bone_weights.w; bone_weights.w;
mat4 bone_matrix = transpose(mat4(m[0], m[1], m[2], vec4(0.0, 0.0, 0.0, 1.0))); world_matrix = transpose(m) * world_matrix;
world_matrix = bone_matrix * world_matrix;
} }
#endif #endif
mat4 modelview = camera_inverse_matrix * world_matrix; highp mat4 modelview = camera_inverse_matrix * world_matrix;
{ {
/* clang-format off */ /* clang-format off */