cl_followmodel and cl_leanmodel: change averaging formula to be framerate independent...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index ad0c0fb3524957d2989569b054283861fa471f34..573ff061175fdaf2c9080b583692f66dc73f320b 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -163,28 +163,20 @@ cl_bobmodel 1 // whether to have gun model move around on screen when moving (on
 cl_bobmodel_side 0.2 // amount the gun sways to the sides
 cl_bobmodel_speed 5 // rate at which the gun sways
 cl_bobmodel_up 0.1 // amount the gun sways up and down
-cl_leanmodel 1 // enables weapon leaning effect when looking around
-cl_leanmodel_side_speed 0.7 "gun leaning sideways speed"
-cl_leanmodel_side_limit 35 "gun leaning sideways limit"
-cl_leanmodel_side_highpass1 30 "gun leaning sideways pre-highpass in 1/s"
-cl_leanmodel_side_highpass 3 "gun leaning sideways highpass in 1/s"
-cl_leanmodel_side_lowpass 20 "gun leaning sideways lowpass in 1/s"
-cl_leanmodel_up_speed 0.65 "gun leaning upward speed"
-cl_leanmodel_up_limit 50 "gun leaning upward limit"
-cl_leanmodel_up_highpass1 5 "gun leaning upward pre-highpass in 1/s"
-cl_leanmodel_up_highpass 15 "gun leaning upward highpass in 1/s"
-cl_leanmodel_up_lowpass 20 "gun leaning upward lowpass in 1/s"
+
 cl_followmodel 1 // enables weapon pushing / pulling effect when walking
-cl_followmodel_side_speed 0.25 "gun following sideways speed"
-cl_followmodel_side_limit 6 "gun following sideways limit"
-cl_followmodel_side_highpass1 30 "gun following sideways pre-highpass in 1/s"
-cl_followmodel_side_highpass 5 "gun following sideways highpass in 1/s"
-cl_followmodel_side_lowpass 10 "gun following sideways lowpass in 1/s"
-cl_followmodel_up_speed 0.5 "gun following upward speed"
-cl_followmodel_up_limit 5 "gun following upward limit"
-cl_followmodel_up_highpass1 60 "gun following upward pre-highpass in 1/s"
-cl_followmodel_up_highpass 2 "gun following upward highpass in 1/s"
-cl_followmodel_up_lowpass 10 "gun following upward lowpass in 1/s"
+seta cl_followmodel_speed 0.3 "gun following sideways speed"
+seta cl_followmodel_limit 1000 "gun following sideways limit"
+seta cl_followmodel_highpass1 0.05 "gun following sideways pre-highpass averaging time"
+seta cl_followmodel_highpass 0.05 "gun following sideways highpass averaging time"
+seta cl_followmodel_lowpass 0.03 "gun following sideways lowpass averaging time"
+
+cl_leanmodel 1 // enables weapon leaning effect when looking around
+seta cl_leanmodel_speed 0.3 "gun leaning sideways speed"
+seta cl_leanmodel_limit 1000 "gun leaning sideways limit"
+seta cl_leanmodel_highpass1 0.2 "gun leaning sideways pre-highpass averaging time"
+seta cl_leanmodel_highpass 0.2 "gun leaning sideways highpass averaging time"
+seta cl_leanmodel_lowpass 0.05 "gun leaning sideways lowpass averaging time"
 
 cl_rollangle 0 // amount of view tilt when strafing, default is 2.0
 v_kicktime 0 // how long damage kicks of the view last, default is 0 seconds

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 7288f253e768207f0376705948ba8b260d1509ed..6ba4b6f568df99d48b7b05b6426161536512a198 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -39,32 +39,22 @@ float autocvar_cl_bobmodel_side;
 float autocvar_cl_bobmodel_up;
 
 float autocvar_cl_followmodel;
-float autocvar_cl_followmodel_side_speed;
-float autocvar_cl_followmodel_side_highpass;
-float autocvar_cl_followmodel_side_highpass1;
-float autocvar_cl_followmodel_side_limit;
-float autocvar_cl_followmodel_side_lowpass;
-float autocvar_cl_followmodel_up_speed;
-float autocvar_cl_followmodel_up_highpass;
-float autocvar_cl_followmodel_up_highpass1;
-float autocvar_cl_followmodel_up_limit;
-float autocvar_cl_followmodel_up_lowpass;
+float autocvar_cl_followmodel_speed = 0.3;
+float autocvar_cl_followmodel_limit = 1000;
+float autocvar_cl_followmodel_highpass1 = 0.05;
+float autocvar_cl_followmodel_highpass = 0.05;
+float autocvar_cl_followmodel_lowpass = 0.03;
 
 float autocvar_cl_leanmodel;
-float autocvar_cl_leanmodel_side_speed;
-float autocvar_cl_leanmodel_side_highpass;
-float autocvar_cl_leanmodel_side_highpass1;
-float autocvar_cl_leanmodel_side_lowpass;
-float autocvar_cl_leanmodel_side_limit;
-float autocvar_cl_leanmodel_up_speed;
-float autocvar_cl_leanmodel_up_highpass;
-float autocvar_cl_leanmodel_up_highpass1;
-float autocvar_cl_leanmodel_up_lowpass;
-float autocvar_cl_leanmodel_up_limit;
+float autocvar_cl_leanmodel_speed = 0.3;
+float autocvar_cl_leanmodel_limit = 1000;
+float autocvar_cl_leanmodel_highpass1 = 0.2;
+float autocvar_cl_leanmodel_highpass = 0.2;
+float autocvar_cl_leanmodel_lowpass = 0.05;
 
 #define lowpass(value, frac, ref_store, ret) MACRO_BEGIN \
 { \
-       float __frac = bound(0, frac, 1); \
+       float __frac = 1 - exp(-frac); \
        ret = ref_store = ref_store * (1 - __frac) + (value) * __frac; \
 } MACRO_END
 
@@ -150,9 +140,9 @@ void viewmodel_animate(entity this)
        // 2. for the gun origin, only keep the high frequency (non-DC) parts, which is "somewhat like velocity"
        gunorg_highpass += gunorg_prev;
        highpass3_limited(view_origin,
-               frametime * autocvar_cl_followmodel_side_highpass1, autocvar_cl_followmodel_side_limit,
-               frametime * autocvar_cl_followmodel_side_highpass1, autocvar_cl_followmodel_side_limit,
-               frametime * autocvar_cl_followmodel_up_highpass1, autocvar_cl_followmodel_up_limit,
+               frametime / max(0.001, autocvar_cl_followmodel_highpass1), autocvar_cl_followmodel_limit,
+               frametime / max(0.001, autocvar_cl_followmodel_highpass1), autocvar_cl_followmodel_limit,
+               frametime / max(0.001, autocvar_cl_followmodel_highpass1), autocvar_cl_followmodel_limit,
                gunorg_highpass, gunorg);
        gunorg_prev = view_origin;
        gunorg_highpass -= gunorg_prev;
@@ -165,20 +155,20 @@ void viewmodel_animate(entity this)
        YAW(gunangles_highpass) += 360 * floor((YAW(view_angles) - YAW(gunangles_highpass)) / 360 + 0.5);
        ROLL(gunangles_highpass) += 360 * floor((ROLL(view_angles) - ROLL(gunangles_highpass)) / 360 + 0.5);
        highpass3_limited(view_angles,
-               frametime * autocvar_cl_leanmodel_up_highpass1, autocvar_cl_leanmodel_up_limit,
-               frametime * autocvar_cl_leanmodel_side_highpass1, autocvar_cl_leanmodel_side_limit,
+               frametime / max(0.001, autocvar_cl_leanmodel_highpass1), autocvar_cl_leanmodel_limit,
+               frametime / max(0.001, autocvar_cl_leanmodel_highpass1), autocvar_cl_leanmodel_limit,
                0, 0,
                gunangles_highpass, gunangles);
        gunangles_prev = view_angles;
        gunangles_highpass -= gunangles_prev;
 
        // 3. calculate the RAW adjustment vectors
-       gunorg.x *= (autocvar_cl_followmodel ? -autocvar_cl_followmodel_side_speed : 0);
-       gunorg.y *= (autocvar_cl_followmodel ? -autocvar_cl_followmodel_side_speed : 0);
-       gunorg.z *= (autocvar_cl_followmodel ? -autocvar_cl_followmodel_up_speed : 0);
+       gunorg.x *= (autocvar_cl_followmodel ? -autocvar_cl_followmodel_speed : 0);
+       gunorg.y *= (autocvar_cl_followmodel ? -autocvar_cl_followmodel_speed : 0);
+       gunorg.z *= (autocvar_cl_followmodel ? -autocvar_cl_followmodel_speed : 0);
 
-       PITCH(gunangles) *= (autocvar_cl_leanmodel ? -autocvar_cl_leanmodel_up_speed : 0);
-       YAW(gunangles) *= (autocvar_cl_leanmodel ? -autocvar_cl_leanmodel_side_speed : 0);
+       PITCH(gunangles) *= (autocvar_cl_leanmodel ? -autocvar_cl_leanmodel_speed : 0);
+       YAW(gunangles) *= (autocvar_cl_leanmodel ? -autocvar_cl_leanmodel_speed : 0);
        ROLL(gunangles) = 0;
 
        static vector gunorg_adjustment_highpass;
@@ -189,26 +179,27 @@ void viewmodel_animate(entity this)
        // 4. perform highpass/lowpass on the adjustment vectors (turning velocity into acceleration!)
        //    trick: we must do the lowpass LAST, so the lowpass vector IS the final vector!
        highpass3(gunorg,
-               frametime * autocvar_cl_followmodel_side_highpass,
-               frametime * autocvar_cl_followmodel_side_highpass,
-               frametime * autocvar_cl_followmodel_up_highpass,
+               frametime / max(0.001, autocvar_cl_followmodel_highpass),
+               frametime / max(0.001, autocvar_cl_followmodel_highpass),
+               frametime / max(0.001, autocvar_cl_followmodel_highpass),
                gunorg_adjustment_highpass, gunorg);
        lowpass3(gunorg,
-               frametime * autocvar_cl_followmodel_side_lowpass,
-               frametime * autocvar_cl_followmodel_side_lowpass,
-               frametime * autocvar_cl_followmodel_up_lowpass,
+               frametime / max(0.001, autocvar_cl_followmodel_lowpass),
+               frametime / max(0.001, autocvar_cl_followmodel_lowpass),
+               frametime / max(0.001, autocvar_cl_followmodel_lowpass),
                gunorg_adjustment_lowpass, gunorg);
        // we assume here: PITCH = 0, YAW = 1, ROLL = 2
        highpass3(gunangles,
-               frametime * autocvar_cl_leanmodel_up_highpass,
-               frametime * autocvar_cl_leanmodel_side_highpass,
+               frametime / max(0.001, autocvar_cl_leanmodel_highpass),
+               frametime / max(0.001, autocvar_cl_leanmodel_highpass),
                0,
                gunangles_adjustment_highpass, gunangles);
        lowpass3(gunangles,
-               frametime * autocvar_cl_leanmodel_up_lowpass,
-               frametime * autocvar_cl_leanmodel_side_lowpass,
+               frametime / max(0.001, autocvar_cl_leanmodel_lowpass),
+               frametime / max(0.001, autocvar_cl_leanmodel_lowpass),
                0,
                gunangles_adjustment_lowpass, gunangles);
+
        float xyspeed = bound(0, vlen(vec2(view.velocity)), 400);
 
        // vertical view bobbing code