]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix severe animation bug with single-frame framegroups in zym models
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 2 Apr 2009 09:13:09 +0000 (09:13 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 2 Apr 2009 09:13:09 +0000 (09:13 +0000)
slight tweak to framegroup interpolation in zym models (restored some
epsilon checks)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8846 d7cf8633-e32d-0410-b094-e92efae38249

r_lerpanim.c

index f384d81af0eb39c67af64157fb3c565e70e413ed..271fc0547291e462d8fa057826620e669b3c4306 100644 (file)
@@ -58,6 +58,10 @@ void R_LerpAnimation(entity_render_t *r)
                                f = (int) floor(sublerp);
                                sublerp -= f;
                                sub2 = f + 1;
+                               if (sublerp < (1.0 / 65536.0f))
+                                       sublerp = 0;
+                               if (sublerp > (65535.0f / 65536.0f))
+                                       sublerp = 1;
                                if (nolerp)
                                        sublerp = 0;
                                if (scene->loop)
@@ -69,7 +73,7 @@ void R_LerpAnimation(entity_render_t *r)
                                sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
                                d = sublerp * lerp;
                                // two framelerps produced from one animation
-                               if (f != sub2 && d > 0)
+                               if (d > 0)
                                {
                                        for (i = 0;i < MAX_FRAMEBLENDS;i++)
                                        {