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 92

master
Glenn Glazer 2015-10-06 07:20:56 -07:00
parent 34e48fb2f2
commit 3cc99a66e4
2 changed files with 6 additions and 6 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 = 72;
const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 92;
// FIXME BENTO - these should be higher than the joint_num of any
// other joint, to avoid conflicts in updateMotionsByType()

10
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[72];
uniform vec3 translationPalette[72];
uniform mat3 matrixPalette[92];
uniform vec3 translationPalette[92];
mat4 getObjectSkinnedTransform()
{
@ -37,7 +37,7 @@ mat4 getObjectSkinnedTransform()
vec4 w = fract(weight4);
vec4 index = floor(weight4);
index = min(index, vec4(71.0));
index = min(index, vec4(91.0));
index = max(index, vec4( 0.0));
w *= 1.0/(w.x+w.y+w.z+w.w);
@ -70,8 +70,8 @@ mat4 getObjectSkinnedTransform()
// If it's AMD make sure the GLSL compiler sees the arrays referenced once by static index. Otherwise it seems to optimise the storage awawy which leads to unfun crashes and artifacts.
mat3 dummy1 = matrixPalette[0];
vec3 dummy2 = translationPalette[0];
mat3 dummy3 = matrixPalette[71];
vec3 dummy4 = translationPalette[71];
mat3 dummy3 = matrixPalette[91];
vec3 dummy4 = translationPalette[91];
#endif
}