fixed stair smoothing code so it no longer jitters when riding lifts

[xonotic/darkplaces.git] / view.c

diff --git a/view.c b/view.c
index 4d0de9c8a770c55b9d158b0d5185075a96eca868..97ba0154eeb04c9d45882769807347f11da56785 100644 (file)
--- a/view.c
+++ b/view.c
@@ -313,32 +313,6 @@ extern matrix4x4_t viewmodelmatrix;
 #include "cl_collision.h"
 #include "csprogs.h"
 
-/*
-==================
-CL_StairSmoothing
-
-==================
-*/
-void CL_StairSmoothing (void)
-{
-       if (v_dmg_time > 0)
-               v_dmg_time -= bound(0, cl.time - cl.oldtime, 0.1);
-
-       // stair smoothing
-       if (cl.onground && cl.stairoffset < 0)
-       {
-               cl.stairoffset += bound(0, cl.time - cl.oldtime, 0.1) * cl_stairsmoothspeed.value;
-               cl.stairoffset = bound(-16, cl.stairoffset, 0);
-       }
-       else if (cl.onground && cl.stairoffset > 0)
-       {
-               cl.stairoffset -= bound(0, cl.time - cl.oldtime, 0.1) * cl_stairsmoothspeed.value;
-               cl.stairoffset = bound(0, cl.stairoffset, 16);
-       }
-       else
-               cl.stairoffset = 0;
-}
-
 /*
 ==================
 V_CalcRefdef
@@ -347,12 +321,9 @@ V_CalcRefdef
 */
 void V_CalcRefdef (void)
 {
-       static float oldz;
        entity_t *ent;
-       float vieworg[3], gunorg[3], viewangles[3];
+       float vieworg[3], gunorg[3], viewangles[3], smoothtime;
        trace_t trace;
-       if(csqc_loaded)
-               return;
        VectorClear(gunorg);
        viewmodelmatrix = identitymatrix;
        r_view.matrix = identitymatrix;
@@ -365,27 +336,14 @@ void V_CalcRefdef (void)
                Matrix4x4_OriginFromMatrix(&ent->render.matrix, vieworg);
                VectorCopy(cl.viewangles, viewangles);
 
-               // update the stairoffset if the player entity has gone up or down without leaving the ground
-               //Con_Printf("cl.onground %i oldz %f newz %f vel %f %f %f\n", cl.onground, oldz, vieworg[2], cl.movement_velocity[0], cl.movement_velocity[1], cl.movement_velocity[2]);
-               cl.stairoffset -= vieworg[2] - oldz;
-               oldz = vieworg[2];
-               cl.stairoffset = bound(-16, cl.stairoffset, 16);
+               // calculate how much time has passed since the last V_CalcRefdef
+               smoothtime = bound(0, cl.time - cl.stairsmoothtime, 0.1);
+               cl.stairsmoothtime = cl.time;
+
+               // fade damage flash
+               if (v_dmg_time > 0)
+                       v_dmg_time -= bound(0, smoothtime, 0.1);
 
-               // interpolate the angles if playing a demo or spectating someone
-               if (cls.demoplayback || cl.fixangle[0])
-               {
-                       int i;
-                       float frac = bound(0, (cl.time - cl.mtime[1]) / (cl.mtime[0] - cl.mtime[1]), 1);
-                       for (i = 0;i < 3;i++)
-                       {
-                               float d = cl.mviewangles[0][i] - cl.mviewangles[1][i];
-                               if (d > 180)
-                                       d -= 360;
-                               else if (d < -180)
-                                       d += 360;
-                               viewangles[i] = cl.mviewangles[1][i] + frac * d;
-                       }
-               }
                if (cl.intermission)
                {
                        // entity is a fixed camera, just copy the matrix
@@ -400,13 +358,21 @@ void V_CalcRefdef (void)
                }
                else
                {
+                       // smooth stair stepping, but only if onground and enabled
+                       if (!cl.onground || cl_stairsmoothspeed.value <= 0)
+                               cl.stairsmoothz = vieworg[2];
+                       else
+                       {
+                               if (cl.stairsmoothz < vieworg[2])
+                                       vieworg[2] = cl.stairsmoothz = bound(vieworg[2] - 16, cl.stairsmoothz + smoothtime * cl_stairsmoothspeed.value, vieworg[2]);
+                               else if (cl.stairsmoothz > vieworg[2])
+                                       vieworg[2] = cl.stairsmoothz = bound(vieworg[2], cl.stairsmoothz - smoothtime * cl_stairsmoothspeed.value, vieworg[2] + 16);
+                       }
+
                        // apply qw weapon recoil effect (this did not work in QW)
                        // TODO: add a cvar to disable this
                        viewangles[PITCH] += cl.qw_weaponkick;
 
-                       // bias by stair smoothing offset
-                       vieworg[2] += cl.stairoffset;
-
                        if (chase_active.value)
                        {
                                // observing entity from third person
@@ -435,7 +401,7 @@ void V_CalcRefdef (void)
                                chase_dest[0] = vieworg[0] + forward[0] * dist;
                                chase_dest[1] = vieworg[1] + forward[1] * dist;
                                chase_dest[2] = vieworg[2] + forward[2] * dist + camup;
-                               trace = CL_TraceBox(vieworg, vec3_origin, vec3_origin, chase_dest, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, false);
+                               trace = CL_Move(vieworg, vec3_origin, vec3_origin, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
                                VectorMAMAM(1, trace.endpos, 8, forward, 4, trace.plane.normal, vieworg);
                        }
                        else