livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-225: test with joints per mesh set to 132

meow-7.2.2
Glenn Glazer 2015-10-06 14:58:32 -07:00
parent 389a0a8e39
commit eebafb37db
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcharacter/lljoint.h
View File

@ -42,7 +42,7 @@
const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15;
// BENTO JOINT COUNT LIMIT
const U32 LL_CHARACTER_MAX_JOINTS = 152; // must be divisible by 4!
const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 112;
const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 132;
// FIXME BENTO - these should be higher than the joint_num of any
// other joint, to avoid conflicts in updateMotionsByType()

6
indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
View File

@ -27,8 +27,8 @@ ATTRIBUTE vec4 weight4;
/* BENTO JOINT COUNT LIMITS
* Note that the value in these two lines also needs to be updated to value-1 several places below.
*/
uniform mat3 matrixPalette[112];
uniform vec3 translationPalette[112];
uniform mat3 matrixPalette[132];
uniform vec3 translationPalette[132];
mat4 getObjectSkinnedTransform()
{
@ -37,7 +37,7 @@ mat4 getObjectSkinnedTransform()
vec4 w = fract(weight4);
vec4 index = floor(weight4);
index = min(index, vec4(111.0));
index = min(index, vec4(131.0));
index = max(index, vec4( 0.0));
w *= 1.0/(w.x+w.y+w.z+w.w);