Skip to content
Snippets Groups Projects
Commit eebafb37 authored by Glenn Glazer's avatar Glenn Glazer
Browse files

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

parent 389a0a8e
No related branches found
No related tags found
No related merge requests found
......@@ -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()
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment