X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=view.c;h=580851e4ad0a9241c6d90e074ea451dbf0e936c0;hb=008f11380ef268efce8b7694c6cc9973f895231e;hp=3279e512ba578fb5bbe675c7a536dd379cc275ad;hpb=dddde1a5188cee0ec7d60acc39877ec6bc8ac8f6;p=xonotic%2Fdarkplaces.git diff --git a/view.c b/view.c index 3279e512..580851e4 100644 --- a/view.c +++ b/view.c @@ -45,28 +45,26 @@ cvar_t cl_bobmodel_side = {CVAR_SAVE, "cl_bobmodel_side", "0.15", "gun bobbing s cvar_t cl_bobmodel_up = {CVAR_SAVE, "cl_bobmodel_up", "0.06", "gun bobbing upward movement amount"}; cvar_t cl_bobmodel_speed = {CVAR_SAVE, "cl_bobmodel_speed", "7", "gun bobbing speed"}; -cvar_t cl_leanmodel_side = {CVAR_SAVE, "cl_leanmodel_side", "1", "enables gun leaning sideways"}; +cvar_t cl_leanmodel = {CVAR_SAVE, "cl_leanmodel", "1", "enables gun leaning"}; cvar_t cl_leanmodel_side_speed = {CVAR_SAVE, "cl_leanmodel_side_speed", "1", "gun leaning sideways speed"}; cvar_t cl_leanmodel_side_limit = {CVAR_SAVE, "cl_leanmodel_side_limit", "35", "gun leaning sideways limit"}; cvar_t cl_leanmodel_side_highpass1 = {CVAR_SAVE, "cl_leanmodel_side_highpass1", "5", "gun leaning sideways pre-highpass in 1/s"}; cvar_t cl_leanmodel_side_highpass = {CVAR_SAVE, "cl_leanmodel_side_highpass", "15", "gun leaning sideways highpass in 1/s"}; cvar_t cl_leanmodel_side_lowpass = {CVAR_SAVE, "cl_leanmodel_side_lowpass", "30", "gun leaning sideways lowpass in 1/s"}; -cvar_t cl_leanmodel_up = {CVAR_SAVE, "cl_leanmodel_up", "1", "enables gun leaning upward"}; cvar_t cl_leanmodel_up_speed = {CVAR_SAVE, "cl_leanmodel_up_speed", "1", "gun leaning upward speed"}; cvar_t cl_leanmodel_up_limit = {CVAR_SAVE, "cl_leanmodel_up_limit", "25", "gun leaning upward limit"}; cvar_t cl_leanmodel_up_highpass1 = {CVAR_SAVE, "cl_leanmodel_up_highpass1", "5", "gun leaning upward pre-highpass in 1/s"}; cvar_t cl_leanmodel_up_highpass = {CVAR_SAVE, "cl_leanmodel_up_highpass", "15", "gun leaning upward highpass in 1/s"}; cvar_t cl_leanmodel_up_lowpass = {CVAR_SAVE, "cl_leanmodel_up_lowpass", "30", "gun leaning upward lowpass in 1/s"}; -cvar_t cl_followmodel_side = {CVAR_SAVE, "cl_followmodel_side", "1", "enables gun following sideways"}; +cvar_t cl_followmodel = {CVAR_SAVE, "cl_followmodel", "1", "enables gun following"}; cvar_t cl_followmodel_side_speed = {CVAR_SAVE, "cl_followmodel_side_speed", "1", "gun following sideways speed"}; -cvar_t cl_followmodel_side_limit = {CVAR_SAVE, "cl_followmodel_side_limit", "10", "gun following sideways limit"}; +cvar_t cl_followmodel_side_limit = {CVAR_SAVE, "cl_followmodel_side_limit", "4", "gun following sideways limit"}; cvar_t cl_followmodel_side_highpass1 = {CVAR_SAVE, "cl_followmodel_side_highpass1", "5", "gun following sideways pre-highpass in 1/s"}; cvar_t cl_followmodel_side_highpass = {CVAR_SAVE, "cl_followmodel_side_highpass", "15", "gun following sideways highpass in 1/s"}; cvar_t cl_followmodel_side_lowpass = {CVAR_SAVE, "cl_followmodel_side_lowpass", "30", "gun following sideways lowpass in 1/s"}; -cvar_t cl_followmodel_up = {CVAR_SAVE, "cl_followmodel_up", "1", "enables gun following upward"}; cvar_t cl_followmodel_up_speed = {CVAR_SAVE, "cl_followmodel_up_speed", "1", "gun following upward speed"}; -cvar_t cl_followmodel_up_limit = {CVAR_SAVE, "cl_followmodel_up_limit", "10", "gun following upward limit"}; +cvar_t cl_followmodel_up_limit = {CVAR_SAVE, "cl_followmodel_up_limit", "2", "gun following upward limit"}; cvar_t cl_followmodel_up_highpass1 = {CVAR_SAVE, "cl_followmodel_up_highpass1", "5", "gun following upward pre-highpass in 1/s"}; cvar_t cl_followmodel_up_highpass = {CVAR_SAVE, "cl_followmodel_up_highpass", "15", "gun following upward highpass in 1/s"}; cvar_t cl_followmodel_up_lowpass = {CVAR_SAVE, "cl_followmodel_up_lowpass", "30", "gun following upward lowpass in 1/s"}; @@ -595,23 +593,36 @@ void V_CalcRefdef (void) // 1. if we teleported, clear the frametime... the lowpass will recover the previous value then if(!ent->persistent.trail_allowed) // FIXME improve this check - frametime = 0; + { + // try to fix the first highpass; result is NOT + // perfect! TODO find a better fix + VectorCopy(cl.viewangles, cl.gunangles_prev); + VectorCopy(cl.movement_origin, cl.gunorg_prev); + } // 2. for the gun origin, only keep the high frequency (non-DC) parts, which is "somewhat like velocity" + VectorAdd(cl.gunorg_highpass, cl.gunorg_prev, cl.gunorg_highpass); highpass3_limited(cl.movement_origin, frametime*cl_followmodel_side_highpass1.value, cl_followmodel_side_limit.value, frametime*cl_followmodel_side_highpass1.value, cl_followmodel_side_limit.value, frametime*cl_followmodel_up_highpass1.value, cl_followmodel_up_limit.value, cl.gunorg_highpass, gunorg); + VectorCopy(cl.movement_origin, cl.gunorg_prev); + VectorSubtract(cl.gunorg_highpass, cl.gunorg_prev, cl.gunorg_highpass); + + // in the highpass, we _store_ the DIFFERENCE to the actual view angles... + VectorAdd(cl.gunangles_highpass, cl.gunangles_prev, cl.gunangles_highpass); cl.gunangles_highpass[PITCH] += 360 * floor((cl.viewangles[PITCH] - cl.gunangles_highpass[PITCH]) / 360 + 0.5); cl.gunangles_highpass[YAW] += 360 * floor((cl.viewangles[YAW] - cl.gunangles_highpass[YAW]) / 360 + 0.5); cl.gunangles_highpass[ROLL] += 360 * floor((cl.viewangles[ROLL] - cl.gunangles_highpass[ROLL]) / 360 + 0.5); highpass3_limited(cl.viewangles, frametime*cl_leanmodel_up_highpass1.value, cl_leanmodel_up_limit.value, frametime*cl_leanmodel_side_highpass1.value, cl_leanmodel_side_limit.value, 0, 0, cl.gunangles_highpass, gunangles); + VectorCopy(cl.viewangles, cl.gunangles_prev); + VectorSubtract(cl.gunangles_highpass, cl.gunangles_prev, cl.gunangles_highpass); // 3. calculate the RAW adjustment vectors - gunorg[0] *= (cl_followmodel_side.value ? -cl_followmodel_side_speed.value : 0); - gunorg[1] *= (cl_followmodel_side.value ? -cl_followmodel_side_speed.value : 0); - gunorg[2] *= (cl_followmodel_up.value ? -cl_followmodel_up_speed.value : 0); + gunorg[0] *= (cl_followmodel.value ? -cl_followmodel_side_speed.value : 0); + gunorg[1] *= (cl_followmodel.value ? -cl_followmodel_side_speed.value : 0); + gunorg[2] *= (cl_followmodel.value ? -cl_followmodel_up_speed.value : 0); - gunangles[PITCH] *= (cl_leanmodel_up.value ? -cl_leanmodel_up_speed.value : 0); - gunangles[YAW] *= (cl_leanmodel_side.value ? -cl_leanmodel_side_speed.value : 0); - gunangles[ROLL] = 0; + gunangles[PITCH] *= (cl_leanmodel.value ? -cl_leanmodel_up_speed.value : 0); + gunangles[YAW] *= (cl_leanmodel.value ? -cl_leanmodel_side_speed.value : 0); + gunangles[ROLL] = cl.viewangles[ROLL]; // 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! @@ -891,26 +902,24 @@ void V_Init (void) Cvar_RegisterVariable (&cl_bobmodel_up); Cvar_RegisterVariable (&cl_bobmodel_speed); - Cvar_RegisterVariable (&cl_leanmodel_side); + Cvar_RegisterVariable (&cl_leanmodel); Cvar_RegisterVariable (&cl_leanmodel_side_speed); Cvar_RegisterVariable (&cl_leanmodel_side_limit); Cvar_RegisterVariable (&cl_leanmodel_side_highpass1); Cvar_RegisterVariable (&cl_leanmodel_side_lowpass); Cvar_RegisterVariable (&cl_leanmodel_side_highpass); - Cvar_RegisterVariable (&cl_leanmodel_up); Cvar_RegisterVariable (&cl_leanmodel_up_speed); Cvar_RegisterVariable (&cl_leanmodel_up_limit); Cvar_RegisterVariable (&cl_leanmodel_up_highpass1); Cvar_RegisterVariable (&cl_leanmodel_up_lowpass); Cvar_RegisterVariable (&cl_leanmodel_up_highpass); - Cvar_RegisterVariable (&cl_followmodel_side); + Cvar_RegisterVariable (&cl_followmodel); Cvar_RegisterVariable (&cl_followmodel_side_speed); Cvar_RegisterVariable (&cl_followmodel_side_limit); Cvar_RegisterVariable (&cl_followmodel_side_highpass1); Cvar_RegisterVariable (&cl_followmodel_side_lowpass); Cvar_RegisterVariable (&cl_followmodel_side_highpass); - Cvar_RegisterVariable (&cl_followmodel_up); Cvar_RegisterVariable (&cl_followmodel_up_speed); Cvar_RegisterVariable (&cl_followmodel_up_limit); Cvar_RegisterVariable (&cl_followmodel_up_highpass1);