asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14499 from akien-mga/glsl-bone-type

Browse source 
Fix usage of signed type in skeleton shader
This commit is contained in:
Rémi Verschelde 2017-12-13 08:37:56 +01:00 committed by GitHub
commit b110813134
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/gles3/shaders/scene.glsl
View file

@ -42,7 +42,7 @@ layout(location=5) in vec2 uv2_attrib;
uniform float normal_mult;
#ifdef USE_SKELETON
layout(location=6) in ivec4 bone_indices; // attrib:6
layout(location=6) in uvec4 bone_indices; // attrib:6
layout(location=7) in vec4 bone_weights; // attrib:7
#endif
@ -302,14 +302,16 @@ void main() {
#ifdef USE_SKELETON
{
//skeleton transform
ivec2 tex_ofs = ivec2( bone_indices.x%256, (bone_indices.x/256)*3 );
ivec4 bone_indicesi = ivec4(bone_indices); // cast to signed int
ivec2 tex_ofs = ivec2( bone_indicesi.x%256, (bone_indicesi.x/256)*3 );
highp mat3x4 m = mat3x4(
texelFetch(skeleton_texture,tex_ofs,0),
texelFetch(skeleton_texture,tex_ofs+ivec2(0,1),0),
texelFetch(skeleton_texture,tex_ofs+ivec2(0,2),0)
) * bone_weights.x;
tex_ofs = ivec2( bone_indices.y%256, (bone_indices.y/256)*3 );
tex_ofs = ivec2( bone_indicesi.y%256, (bone_indicesi.y/256)*3 );
m+= mat3x4(
texelFetch(skeleton_texture,tex_ofs,0),
@ -317,7 +319,7 @@ void main() {
texelFetch(skeleton_texture,tex_ofs+ivec2(0,2),0)
) * bone_weights.y;
tex_ofs = ivec2( bone_indices.z%256, (bone_indices.z/256)*3 );
tex_ofs = ivec2( bone_indicesi.z%256, (bone_indicesi.z/256)*3 );
m+= mat3x4(
texelFetch(skeleton_texture,tex_ofs,0),
@ -326,7 +328,7 @@ void main() {
) * bone_weights.z;
tex_ofs = ivec2( bone_indices.w%256, (bone_indices.w/256)*3 );
tex_ofs = ivec2( bone_indicesi.w%256, (bone_indicesi.w/256)*3 );
m+= mat3x4(
texelFetch(skeleton_texture,tex_ofs,0),