fixed constant resetting of animation interpolation on entities that just spawned...

changed movement interpolation to better handle every-other-frame updates which tend to happen with rate limiting

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

diff --git a/cl_main.c b/cl_main.c
index 59f7437d61fffef3c868b4090fb68f9d65cd3410..1fef3ceab0b38eac23c5aa85fe9dd0147d52c38c 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -568,61 +568,26 @@ void CL_LinkNetworkEntity(entity_t *e)
                                matrix = &tempmatrix;
                        }
                }
-               // set up the render matrix
-               if (e->state_previous.active && e->state_current.modelindex == e->state_previous.modelindex)
+
+               // movement lerp
+               if (e->persistent.lerpdeltatime > 0 && (lerp = (cl.time - e->persistent.lerpstarttime) / e->persistent.lerpdeltatime) < 1)
                {
-                       // movement lerp
-                       if (e->persistent.lerpdeltatime > 0 && (lerp = (cl.time - e->persistent.lerpstarttime) / e->persistent.lerpdeltatime) < 1)
-                       {
-                               // interpolate the origin and angles
-                               VectorLerp(e->persistent.oldorigin, lerp, e->persistent.neworigin, origin);
-                               VectorSubtract(e->persistent.newangles, e->persistent.oldangles, delta);
-                               if (delta[0] < -180) delta[0] += 360;else if (delta[0] >= 180) delta[0] -= 360;
-                               if (delta[1] < -180) delta[1] += 360;else if (delta[1] >= 180) delta[1] -= 360;
-                               if (delta[2] < -180) delta[2] += 360;else if (delta[2] >= 180) delta[2] -= 360;
-                               VectorMA(e->persistent.oldangles, lerp, delta, angles);
-                       }
-                       else
-                       {
-                               // no interpolation
-                               VectorCopy(e->persistent.neworigin, origin);
-                               VectorCopy(e->persistent.newangles, angles);
-                       }
-                       // animation lerp
-                       if (e->render.frame2 == e->state_current.frame)
-                       {
-                               // update frame lerp fraction
-                               e->render.framelerp = 1;
-                               if (e->render.frame2time > e->render.frame1time)
-                               {
-                                       e->render.framelerp = (cl.time - e->render.frame2time) / (e->render.frame2time - e->render.frame1time);
-                                       e->render.framelerp = bound(0, e->render.framelerp, 1);
-                               }
-                       }
-                       else
-                       {
-                               // begin a new frame lerp
-                               e->render.frame1 = e->render.frame2;
-                               e->render.frame1time = e->render.frame2time;
-                               e->render.frame = e->render.frame2 = e->state_current.frame;
-                               e->render.frame2time = cl.time;
-                               e->render.framelerp = 0;
-                               // make sure frame lerp won't last longer than 100ms
-                               // (this mainly helps with models that use framegroups and
-                               // switch between them infrequently)
-                               e->render.frame1time = max(e->render.frame1time, e->render.frame2time - 0.1f);
-                       }
+                       // interpolate the origin and angles
+                       VectorLerp(e->persistent.oldorigin, lerp, e->persistent.neworigin, origin);
+                       VectorSubtract(e->persistent.newangles, e->persistent.oldangles, delta);
+                       if (delta[0] < -180) delta[0] += 360;else if (delta[0] >= 180) delta[0] -= 360;
+                       if (delta[1] < -180) delta[1] += 360;else if (delta[1] >= 180) delta[1] -= 360;
+                       if (delta[2] < -180) delta[2] += 360;else if (delta[2] >= 180) delta[2] -= 360;
+                       VectorMA(e->persistent.oldangles, lerp, delta, angles);
                }
                else
                {
                        // no interpolation
                        VectorCopy(e->persistent.neworigin, origin);
                        VectorCopy(e->persistent.newangles, angles);
-                       e->render.frame = e->render.frame1 = e->render.frame2 = e->state_current.frame;
-                       e->render.frame1time = e->render.frame2time = cl.time;
-                       e->render.framelerp = 1;
                }
 
+               // model setup and some modelflags
                e->render.model = cl.model_precache[e->state_current.modelindex];
                if (e->render.model)
                {
@@ -641,8 +606,33 @@ void CL_LinkNetworkEntity(entity_t *e)
                                e->render.effects |= EF_FULLBRIGHT;
                }
 
+               // animation lerp
+               if (e->render.frame2 == e->state_current.frame)
+               {
+                       // update frame lerp fraction
+                       e->render.framelerp = 1;
+                       if (e->render.frame2time > e->render.frame1time)
+                       {
+                               e->render.framelerp = (cl.time - e->render.frame2time) / (e->render.frame2time - e->render.frame1time);
+                               e->render.framelerp = bound(0, e->render.framelerp, 1);
+                       }
+               }
+               else
+               {
+                       // begin a new frame lerp
+                       e->render.frame1 = e->render.frame2;
+                       e->render.frame1time = e->render.frame2time;
+                       e->render.frame = e->render.frame2 = e->state_current.frame;
+                       e->render.frame2time = cl.time;
+                       e->render.framelerp = 0;
+                       // make sure frame lerp won't last longer than 100ms
+                       // (this mainly helps with models that use framegroups and
+                       // switch between them infrequently)
+                       e->render.frame1time = max(e->render.frame1time, e->render.frame2time - 0.1f);
+               }
                R_LerpAnimation(&e->render);
 
+               // set up the render matrix
                // FIXME: e->render.scale should go away
                Matrix4x4_CreateFromQuakeEntity(&matrix2, origin[0], origin[1], origin[2], angles[0], angles[1], angles[2], e->render.scale);
                // concat the matrices to make the entity relative to its tag
@@ -837,14 +827,11 @@ void CL_LinkNetworkEntity(entity_t *e)
                                light[3] = 350;
                        CL_AllocDlight(&e->render, &e->render.matrix, light[3], light[0], light[1], light[2], 0, 0, e->state_current.skin, e->state_current.lightstyle, !(e->state_current.lightpflags & PFLAGS_NOSHADOW), (e->state_current.lightpflags & PFLAGS_CORONA) != 0);
                }
-               // trails need the previous frame
-               if (e->state_previous.active && e->state_previous.modelindex == e->state_current.modelindex)
-               {
-                       if (e->render.flags & RENDER_GLOWTRAIL)
-                               trailtype = 9;
-                       if (trailtype >= 0)
-                               CL_RocketTrail(e->persistent.trail_origin, origin, trailtype, e->state_current.glowcolor, e);
-               }
+               // do trails
+               if (e->render.flags & RENDER_GLOWTRAIL)
+                       trailtype = 9;
+               if (trailtype >= 0)
+                       CL_RocketTrail(e->persistent.trail_origin, origin, trailtype, e->state_current.glowcolor, e);
                VectorCopy(origin, e->persistent.trail_origin);
                // tenebrae's sprites are all additive mode (weird)
                if (gamemode == GAME_TENEBRAE && e->render.model && e->render.model->type == mod_sprite)
@@ -888,6 +875,7 @@ void CL_RelinkWorld(void)
        // FIXME: this should be done at load
        Matrix4x4_CreateIdentity(&ent->render.matrix);
        Matrix4x4_CreateIdentity(&ent->render.inversematrix);
+       R_LerpAnimation(&ent->render);
        CL_BoundingBoxForEntity(&ent->render);
        ent->render.flags = RENDER_SHADOW;
        if (!r_fullbright.integer)
@@ -911,6 +899,7 @@ static void CL_RelinkStaticEntities(void)
                // hide player shadow during intermission or nehahra movie
                if (!(e->render.effects & EF_NOSHADOW) && !(e->render.flags & RENDER_TRANSPARENT))
                        e->render.flags |= RENDER_SHADOW;
+               R_LerpAnimation(&e->render);
                r_refdef.entities[r_refdef.numentities++] = &e->render;
        }
 }
@@ -1006,6 +995,7 @@ static void CL_RelinkEffects(void)
 
                                Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, e->origin[0], e->origin[1], e->origin[2], 0, 0, 0, 1);
                                Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
+                               R_LerpAnimation(&ent->render);
                                CL_BoundingBoxForEntity(&ent->render);
                        }
                }
@@ -1117,6 +1107,7 @@ void CL_RelinkBeams(void)
                        //ent->render.angles[2] = rand()%360;
                        Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, org[0], org[1], org[2], -pitch, yaw, lhrandom(0, 360), 1);
                        Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
+                       R_LerpAnimation(&ent->render);
                        CL_BoundingBoxForEntity(&ent->render);
                        VectorMA(org, 30, dist, org);
                        d -= 30;

diff --git a/cl_parse.c b/cl_parse.c
index c67225d03e813ca94cd5737455b296c3452999a9..33dfa29b0bef40cf2b994eb995ccb211b308aed9 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -499,9 +499,26 @@ void CL_MoveLerpEntityStates(entity_t *ent)
        CL_ValidateState(&ent->state_current);
        VectorSubtract(ent->state_current.origin, ent->persistent.neworigin, odelta);
        VectorSubtract(ent->state_current.angles, ent->persistent.newangles, adelta);
-       if (!ent->state_previous.active || cls.timedemo || DotProduct(odelta, odelta) > 1000*1000 || cl_nolerp.integer)
+       if (!ent->state_previous.active || ent->state_previous.modelindex != ent->state_current.modelindex)
        {
-               // we definitely shouldn't lerp
+               // reset all persistent stuff if this is a new entity
+               ent->persistent.lerpdeltatime = 0;
+               ent->persistent.lerpstarttime = cl.mtime[1];
+               VectorCopy(ent->state_current.origin, ent->persistent.oldorigin);
+               VectorCopy(ent->state_current.angles, ent->persistent.oldangles);
+               VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
+               VectorCopy(ent->state_current.angles, ent->persistent.newangles);
+               // reset animation interpolation as well
+               ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame;
+               ent->render.frame1time = ent->render.frame2time = cl.time;
+               ent->render.framelerp = 1;
+               // reset various persistent stuff
+               ent->persistent.muzzleflash = 0;
+               VectorCopy(ent->state_current.origin, ent->persistent.trail_origin);
+       }
+       else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000)
+       {
+               // don't interpolate the move
                ent->persistent.lerpdeltatime = 0;
                ent->persistent.lerpstarttime = cl.mtime[1];
                VectorCopy(ent->state_current.origin, ent->persistent.oldorigin);
@@ -525,12 +542,12 @@ void CL_MoveLerpEntityStates(entity_t *ent)
        else
        {
                // not a monster
-               ent->persistent.lerpstarttime = cl.mtime[1];
+               ent->persistent.lerpstarttime = ent->state_previous.time;
                // no lerp if it's singleplayer
                if (cl.islocalgame)
                        ent->persistent.lerpdeltatime = 0;
                else
-                       ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1];
+                       ent->persistent.lerpdeltatime = bound(0, ent->state_current.time - ent->state_previous.time, 0.1);
                VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
                VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
                VectorCopy(ent->state_current.origin, ent->persistent.neworigin);

diff --git a/gl_rmain.c b/gl_rmain.c
index fc97f4856a840e5f67cb8ee2a942c4a565a39018..0ef0a383c380553b5eba8510f26359e2691372e6 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -450,7 +450,6 @@ static void R_MarkEntities (void)
                Matrix4x4_OriginFromMatrix(&ent->matrix, ent->origin);
                // some of the renderer still relies on scale...
                ent->scale = Matrix4x4_ScaleFromMatrix(&ent->matrix);
-               R_LerpAnimation(ent);
                R_UpdateEntLights(ent);
                if ((chase_active.integer || !(ent->flags & RENDER_EXTERIORMODEL))
                 && (!VIS_CullBox(ent->mins, ent->maxs) || (ent->effects & EF_NODEPTHTEST))