Skip to content
Snippets Groups Projects
Commit 0d0a8d84 authored by simon's avatar simon
Browse files

Merge

parents 8eb56668 437efd9b
No related branches found
No related tags found
No related merge requests found
...@@ -31,11 +31,9 @@ uniform vec4 matrixPalette[45]; ...@@ -31,11 +31,9 @@ uniform vec4 matrixPalette[45];
mat4 getSkinnedTransform() mat4 getSkinnedTransform()
{ {
mat4 ret; mat4 ret;
float x = fract(weight.x);
int i = int(floor(weight.x)); int i = int(floor(weight.x));
i = min(i, 15); float x = fract(weight.x);
i = max(i, 0);
ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1], x); ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1], x);
ret[1] = mix(matrixPalette[i+15],matrixPalette[i+16], x); ret[1] = mix(matrixPalette[i+15],matrixPalette[i+16], x);
ret[2] = mix(matrixPalette[i+30],matrixPalette[i+31], x); ret[2] = mix(matrixPalette[i+30],matrixPalette[i+31], x);
......
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