From 8c5e278bf831a04225f6dcd0f1c719fbd2283f07 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 14 May 2012 07:58:54 +0900 Subject: [PATCH] Implement frame blending for iqm. Now that I have things working... :) --- libs/video/renderer/glsl/glsl_iqm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/video/renderer/glsl/glsl_iqm.c b/libs/video/renderer/glsl/glsl_iqm.c index 8549830c9..11990e240 100644 --- a/libs/video/renderer/glsl/glsl_iqm.c +++ b/libs/video/renderer/glsl/glsl_iqm.c @@ -221,11 +221,11 @@ glsl_R_DrawIQM (void) QuatBlend (f1->scale, f2->scale, blend, frame[i].scale); } #else - blend = blend; for (i = 0; i < iqm->num_joints; i++) { - iqmframe_t *frameset = iqm->frames[ent->pose1]; + iqmframe_t *f1 = &iqm->frames[ent->pose1][i]; + iqmframe_t *f2 = &iqm->frames[ent->pose2][i]; iqmjoint *j = &iqm->joints[i]; - Mat4Copy ((float*)&frameset[i], (float*)&frame[i]); + Mat4Blend ((float *) f1, (float *) f2, blend, (float*)&frame[i]); if (j->parent >= 0) Mat4Mult ((float*)&frame[j->parent], (float*)&frame[i], (float*)&frame[i]);