X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=view.c;h=0cd7b478b4ccc5b27bb9ddde494ba4911f8f4bee;hb=64832afd3bbc0e242cc37c6f65c6413da73a0bb9;hp=26f7364469c2c678e2d5442e1f6016873a39349c;hpb=91d848f0a2225b47721e2f0f55f1b2c57c5fbfed;p=xonotic%2Fdarkplaces.git diff --git a/view.c b/view.c index 26f73644..0cd7b478 100644 --- a/view.c +++ b/view.c @@ -39,14 +39,13 @@ cvar_t cl_rollangle = {0, "cl_rollangle", "2.0", "how much to tilt the view when cvar_t cl_bob = {CVAR_SAVE, "cl_bob","0.02", "view bobbing amount"}; cvar_t cl_bobcycle = {CVAR_SAVE, "cl_bobcycle","0.6", "view bobbing speed"}; cvar_t cl_bobup = {CVAR_SAVE, "cl_bobup","0.5", "view bobbing adjustment that makes the up or down swing of the bob last longer"}; -cvar_t cl_bobroll = {CVAR_SAVE, "cl_bobroll","0.02", "view rolling amount"}; -cvar_t cl_bobrollcycle = {CVAR_SAVE, "cl_bobrollcycle","0.5", "view rolling speed"}; -cvar_t cl_bobrollup = {CVAR_SAVE, "cl_bobrollup","0.5", "view bobbing adjustment that makes the up or down swing of the roll last longer"}; +cvar_t cl_bob2 = {CVAR_SAVE, "cl_bob2","0", "sideways view bobbing amount"}; +cvar_t cl_bob2cycle = {CVAR_SAVE, "cl_bob2cycle","0.6", "sideways view bobbing speed"}; +cvar_t cl_bob2smooth = {CVAR_SAVE, "cl_bob2smooth","0.05", "how fast the view goes back when you stop touching the ground"}; cvar_t cl_bobmodel = {CVAR_SAVE, "cl_bobmodel", "1", "enables gun bobbing"}; cvar_t cl_bobmodel_side = {CVAR_SAVE, "cl_bobmodel_side", "0.15", "gun bobbing sideways sway amount"}; 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 = {CVAR_SAVE, "cl_leanmodel", "0", "enables gun leaning"}; cvar_t cl_leanmodel_side_speed = {CVAR_SAVE, "cl_leanmodel_side_speed", "0.7", "gun leaning sideways speed"}; cvar_t cl_leanmodel_side_limit = {CVAR_SAVE, "cl_leanmodel_side_limit", "35", "gun leaning sideways limit"}; @@ -588,8 +587,8 @@ void V_CalcRefdef (void) VectorAdd(vieworg, cl.punchvector, vieworg); if (cl.stats[STAT_HEALTH] > 0) { - double xyspeed, bob, bobroll; - float cycle, cycle2; + double xyspeed, bob; + float cycle; vec_t frametime; frametime = cl.realframetime * cl.movevars_timescale; @@ -639,8 +638,10 @@ void V_CalcRefdef (void) VectorAdd(vieworg, gunorg, gunorg); VectorAdd(viewangles, gunangles, gunangles); - // view bobbing code - xyspeed = sqrt(cl.velocity[0]*cl.velocity[0] + cl.velocity[1]*cl.velocity[1]); + // bounded XY speed, used by several effects below + xyspeed = bound (0, sqrt(cl.velocity[0]*cl.velocity[0] + cl.velocity[1]*cl.velocity[1]), 400); + + // vertical view bobbing code if (cl_bob.value && cl_bobcycle.value) { // LordHavoc: this code is *weird*, but not replacable (I think it @@ -655,36 +656,90 @@ void V_CalcRefdef (void) cycle = sin(M_PI + M_PI * (cycle-cl_bobup.value)/(1.0 - cl_bobup.value)); // bob is proportional to velocity in the xy plane // (don't count Z, or jumping messes it up) - bob = xyspeed * cl_bob.value; + bob = xyspeed * bound(0, cl_bob.value, 0.05); bob = bob*0.3 + bob*0.7*cycle; - vieworg[2] += bound(-7, bob, 4); + vieworg[2] += bob; // we also need to adjust gunorg, or this appears like pushing the gun! // In the old code, this was applied to vieworg BEFORE copying to gunorg, // but this is not viable with the new followmodel code as that would mean // that followmodel would work on the munged-by-bob vieworg and do feedback - gunorg[2] += bound(-7, bob, 4); + gunorg[2] += bob; } - // view rolling code - // TODO 1 (DONE): Make it work around the center rather than the left side - // TODO 2: Make the roll smoothly return to 0 when you stop touching the ground, rather than instantly - // TODO 3: Write cvars to darkplaces.txt, set better defaults and possibly disable by default once the first TODOs are ready - if (cl_bobroll.value && cl_bobrollcycle.value) - if (cl.onground) + // horizontal view bobbing code + if (cl_bob2.value && cl_bob2cycle.value) { - cycle2 = cl.time / cl_bobrollcycle.value; - cycle2 -= (int) cycle2; - if (cycle2 < 0.5) - cycle2 = sin(M_PI * cycle2 / 0.5); + vec3_t bob2vel; + vec3_t forward, right, up; + float side, front; + + cycle = cl.time / cl_bob2cycle.value; + cycle -= (int) cycle; + if (cycle < 0.5) + cycle = sin(M_PI * cycle / 0.5); else - cycle2 = sin(M_PI + M_PI * (cycle2-0.5)/0.5); - cycle2 *= cl_bobrollup.value; - bobroll = xyspeed * cl_bobroll.value * cycle2; - viewangles[2] = bound(-45, bobroll, 45); + cycle = sin(M_PI + M_PI * (cycle-0.5)/0.5); + bob = bound(0, cl_bob2.value, 0.05) * cycle; + + // this value slowly decreases from 1 to 0 when we stop touching the ground. + // The cycle is later multiplied with it so the view smooths back to normal + if (cl.onground && !cl.cmd.jump) // also block the effect while the jump button is pressed, to avoid twitches when bunny-hopping + cl.bob2_smooth = 1; + else + { + if(cl.bob2_smooth > 0) + cl.bob2_smooth -= bound(0, cl_bob2smooth.value, 1); + else + cl.bob2_smooth = 0; + } + + // calculate the front and side of the player between the X and Y axes + AngleVectors(viewangles, forward, right, up); + // now get the speed based on those angles. The bounds should match the same value as xyspeed's + side = bound(-400, DotProduct (cl.velocity, right) * cl.bob2_smooth, 400); + front = bound(-400, DotProduct (cl.velocity, forward) * cl.bob2_smooth, 400); + VectorScale(forward, bob, forward); + VectorScale(right, bob, right); + // we use side with forward and front with right, so the bobbing goes + // to the side when we walk forward and to the front when we strafe + VectorMAMAM(side, forward, front, right, 0, up, bob2vel); + vieworg[0] += bob2vel[0]; + vieworg[1] += bob2vel[1]; + // we also need to adjust gunorg, or this appears like pushing the gun! + // In the old code, this was applied to vieworg BEFORE copying to gunorg, + // but this is not viable with the new followmodel code as that would mean + // that followmodel would work on the munged-by-bob vieworg and do feedback + gunorg[0] += bob2vel[0]; + gunorg[1] += bob2vel[1]; } + + + // TEST!!! + + // get the speed while in the air, apply it while we're not + if (!cl.onground) + { + cl.ground_hit_speed = 0; + cl.ground_hit_target = cl.velocity[2] * 0.1; // replace 0.1 with cvar + } + else + { + if(cl.ground_hit_speed > cl.ground_hit_target) + cl.ground_hit_speed -= 0.1; // replace 0.1 with cvar + if(cl.ground_hit_speed < cl.ground_hit_target) + cl.ground_hit_speed += 0.1; // replace 0.1 with cvar + + vieworg[2] += cl.ground_hit_speed; + gunorg[2] += cl.ground_hit_speed; + } + + // End of TEST!!! + + // gun model bobbing code - if (cl_bob.value && cl_bobmodel.value) + if (cl_bob.value || cl_bob2.value) + if (cl_bobmodel.value) { // calculate for swinging gun model // the gun bobs when running on the ground, but doesn't bob when you're in the air. @@ -717,7 +772,7 @@ void V_CalcRefdef (void) t *= 5; } - bspeed = bound (0, xyspeed, 400) * 0.01f; + bspeed = xyspeed * 0.01f; AngleVectors (gunangles, forward, right, up); bob = bspeed * cl_bobmodel_side.value * cl_viewmodel_scale.value * sin (s) * t; VectorMA (gunorg, bob, right, gunorg); @@ -917,9 +972,9 @@ void V_Init (void) Cvar_RegisterVariable (&cl_bob); Cvar_RegisterVariable (&cl_bobcycle); Cvar_RegisterVariable (&cl_bobup); - Cvar_RegisterVariable (&cl_bobroll); - Cvar_RegisterVariable (&cl_bobrollcycle); - Cvar_RegisterVariable (&cl_bobrollup); + Cvar_RegisterVariable (&cl_bob2); + Cvar_RegisterVariable (&cl_bob2cycle); + Cvar_RegisterVariable (&cl_bob2smooth); Cvar_RegisterVariable (&cl_bobmodel); Cvar_RegisterVariable (&cl_bobmodel_side); Cvar_RegisterVariable (&cl_bobmodel_up);