X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=view.c;h=dc75debebe1185571ec7111ec968d049e166a2fe;hb=15b03d21a1e978b5deccc256c3f0be2fe96a3d24;hp=72806f5901428acaf07d285eb907467e0ecc3cd7;hpb=41f1138b4a171ebb11be1418ed5579a8935b5516;p=xonotic%2Fdarkplaces.git diff --git a/view.c b/view.c index 72806f59..dc75debe 100644 --- a/view.c +++ b/view.c @@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "cl_collision.h" +void CL_VM_UpdateDmgGlobals (int dmg_take, int dmg_save, vec3_t dmg_origin); + /* The view is allowed to move slightly from it's true position for bobbing, @@ -34,14 +36,16 @@ when crossing a water boudnary. cvar_t cl_rollspeed = {0, "cl_rollspeed", "200", "how much strafing is necessary to tilt the view"}; cvar_t cl_rollangle = {0, "cl_rollangle", "2.0", "how much to tilt the view when strafing"}; -cvar_t cl_bob = {0, "cl_bob","0.02", "view bobbing amount"}; -cvar_t cl_bobcycle = {0, "cl_bobcycle","0.6", "view bobbing speed"}; -cvar_t cl_bobup = {0, "cl_bobup","0.5", "view bobbing adjustment that makes the up or down swing of the bob last longer"}; +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_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_bobmodel = {0, "cl_bobmodel", "1", "enables gun bobbing"}; -cvar_t cl_bobmodel_side = {0, "cl_bobmodel_side", "0.05", "gun bobbing sideways sway amount"}; -cvar_t cl_bobmodel_up = {0, "cl_bobmodel_up", "0.02", "gun bobbing upward movement amount"}; -cvar_t cl_bobmodel_speed = {0, "cl_bobmodel_speed", "7", "gun bobbing speed"}; +cvar_t cl_viewmodel_scale = {0, "cl_viewmodel_scale", "1", "changes size of gun model, lower values prevent poking into walls but cause strange artifacts on lighting and especially r_stereo/vid_stereobuffer options where the size of the gun becomes visible"}; cvar_t v_kicktime = {0, "v_kicktime", "0.5", "how long a view kick from damage lasts"}; cvar_t v_kickroll = {0, "v_kickroll", "0.6", "how much a view kick from damage rolls your view"}; @@ -155,7 +159,7 @@ void V_DriftPitch (void) if ( fabs(cl.cmd.forwardmove) < cl_forwardspeed.value) cl.driftmove = 0; else - cl.driftmove += cl.frametime; + cl.driftmove += cl.realframetime; if ( cl.driftmove > v_centermove.value) { @@ -172,8 +176,8 @@ void V_DriftPitch (void) return; } - move = cl.frametime * cl.pitchvel; - cl.pitchvel += cl.frametime * v_centerspeed.value; + move = cl.realframetime * cl.pitchvel; + cl.pitchvel += cl.realframetime * v_centerspeed.value; if (delta > 0) { @@ -224,13 +228,16 @@ void V_ParseDamage (void) blood = MSG_ReadByte (); MSG_ReadVector(from, cls.protocol); + // Send the Dmg Globals to CSQC + CL_VM_UpdateDmgGlobals(blood, armor, from); + count = blood*0.5 + armor*0.5; if (count < 10) count = 10; cl.faceanimtime = cl.time + 0.2; // put sbar face into pain frame - cl.cshifts[CSHIFT_DAMAGE].percent += (int)(3*count); + cl.cshifts[CSHIFT_DAMAGE].percent += 3*count; if (cl.cshifts[CSHIFT_DAMAGE].percent < 0) cl.cshifts[CSHIFT_DAMAGE].percent = 0; if (cl.cshifts[CSHIFT_DAMAGE].percent > 150) @@ -276,10 +283,10 @@ V_cshift_f */ static void V_cshift_f (void) { - v_cshift.destcolor[0] = atoi(Cmd_Argv(1)); - v_cshift.destcolor[1] = atoi(Cmd_Argv(2)); - v_cshift.destcolor[2] = atoi(Cmd_Argv(3)); - v_cshift.percent = atoi(Cmd_Argv(4)); + v_cshift.destcolor[0] = atof(Cmd_Argv(1)); + v_cshift.destcolor[1] = atof(Cmd_Argv(2)); + v_cshift.destcolor[2] = atof(Cmd_Argv(3)); + v_cshift.percent = atof(Cmd_Argv(4)); } @@ -319,65 +326,58 @@ 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_refdef.viewentitymatrix = identitymatrix; + r_view.matrix = identitymatrix; if (cls.state == ca_connected && cls.signon == SIGNONS) { // ent is the view entity (visible when out of body) ent = &cl.entities[cl.viewentity]; + // player can look around, so take the origin from the entity, + // and the angles from the input system + Matrix4x4_OriginFromMatrix(&ent->render.matrix, vieworg); + VectorCopy(cl.viewangles, viewangles); + + // 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); + if (cl.intermission) { // entity is a fixed camera, just copy the matrix if (cls.protocol == PROTOCOL_QUAKEWORLD) - Matrix4x4_CreateFromQuakeEntity(&r_refdef.viewentitymatrix, cl.qw_intermission_origin[0], cl.qw_intermission_origin[1], cl.qw_intermission_origin[2], cl.qw_intermission_angles[0], cl.qw_intermission_angles[1], cl.qw_intermission_angles[2], 1); + Matrix4x4_CreateFromQuakeEntity(&r_view.matrix, cl.qw_intermission_origin[0], cl.qw_intermission_origin[1], cl.qw_intermission_origin[2], cl.qw_intermission_angles[0], cl.qw_intermission_angles[1], cl.qw_intermission_angles[2], 1); else { - r_refdef.viewentitymatrix = ent->render.matrix; - r_refdef.viewentitymatrix.m[2][3] += cl.stats[STAT_VIEWHEIGHT]; + r_view.matrix = ent->render.matrix; + Matrix4x4_AdjustOrigin(&r_view.matrix, 0, 0, cl.stats[STAT_VIEWHEIGHT]); } - viewmodelmatrix = r_refdef.viewentitymatrix; + viewmodelmatrix = r_view.matrix; } else { - // player can look around, so take the origin from the entity, - // and the angles from the input system - Matrix4x4_OriginFromMatrix(&ent->render.matrix, vieworg); - VectorCopy(cl.viewangles, viewangles); + // 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; - if (cl.onground) - { - if (!cl.oldonground) - cl.hitgroundtime = cl.time; - cl.lastongroundtime = cl.time; - } - cl.oldonground = cl.onground; - - // stair smoothing - //Con_Printf("cl.onground %i oldz %f newz %f\n", cl.onground, oldz, vieworg[2]); - if (cl.onground && oldz < vieworg[2]) - { - oldz += (cl.time - cl.oldtime) * cl_stairsmoothspeed.value; - oldz = vieworg[2] = bound(vieworg[2] - 16, oldz, vieworg[2]); - } - else if (cl.onground && oldz > vieworg[2]) - { - oldz -= (cl.time - cl.oldtime) * cl_stairsmoothspeed.value; - oldz = vieworg[2] = bound(vieworg[2], oldz, vieworg[2] + 16); - } - else - oldz = vieworg[2]; - if (chase_active.value) { // observing entity from third person @@ -406,7 +406,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 @@ -421,7 +421,6 @@ void V_CalcRefdef (void) { viewangles[ROLL] += v_dmg_time/v_kicktime.value*v_dmg_roll; viewangles[PITCH] += v_dmg_time/v_kicktime.value*v_dmg_pitch; - v_dmg_time -= cl.frametime; } // origin VectorAdd(vieworg, cl.punchvector, vieworg); @@ -453,7 +452,7 @@ void V_CalcRefdef (void) VectorCopy(vieworg, gunorg); - if (cl_bobmodel.value) + if (cl_bob.value && 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. @@ -488,34 +487,37 @@ void V_CalcRefdef (void) bspeed = bound (0, xyspeed, 400) * 0.01f; AngleVectors (viewangles, forward, right, up); - bob = bspeed * cl_bobmodel_side.value * sin (s) * t; + bob = bspeed * cl_bobmodel_side.value * cl_viewmodel_scale.value * sin (s) * t; VectorMA (gunorg, bob, right, gunorg); - bob = bspeed * cl_bobmodel_up.value * cos (s * 2) * t; + bob = bspeed * cl_bobmodel_up.value * cl_viewmodel_scale.value * cos (s * 2) * t; VectorMA (gunorg, bob, up, gunorg); } } } // calculate a view matrix for rendering the scene if (v_idlescale.value) - Matrix4x4_CreateFromQuakeEntity(&r_refdef.viewentitymatrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0] + v_idlescale.value * sin(cl.time*v_ipitch_cycle.value) * v_ipitch_level.value, viewangles[1] + v_idlescale.value * sin(cl.time*v_iyaw_cycle.value) * v_iyaw_level.value, viewangles[2] + v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value, 1); + Matrix4x4_CreateFromQuakeEntity(&r_view.matrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0] + v_idlescale.value * sin(cl.time*v_ipitch_cycle.value) * v_ipitch_level.value, viewangles[1] + v_idlescale.value * sin(cl.time*v_iyaw_cycle.value) * v_iyaw_level.value, viewangles[2] + v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value, 1); else - Matrix4x4_CreateFromQuakeEntity(&r_refdef.viewentitymatrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0], viewangles[1], viewangles[2] + v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value, 1); + Matrix4x4_CreateFromQuakeEntity(&r_view.matrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0], viewangles[1], viewangles[2] + v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value, 1); // calculate a viewmodel matrix for use in view-attached entities - Matrix4x4_CreateFromQuakeEntity(&viewmodelmatrix, gunorg[0], gunorg[1], gunorg[2], viewangles[0], viewangles[1], viewangles[2], 0.3); - VectorCopy(vieworg, csqc_origin); - VectorCopy(viewangles, csqc_angles); + Matrix4x4_CreateFromQuakeEntity(&viewmodelmatrix, gunorg[0], gunorg[1], gunorg[2], viewangles[0], viewangles[1], viewangles[2], cl_viewmodel_scale.value); + VectorCopy(vieworg, cl.csqc_origin); + VectorCopy(viewangles, cl.csqc_angles); } } } void V_FadeViewFlashs(void) { + // don't flash if time steps backwards + if (cl.time <= cl.oldtime) + return; // drop the damage value - cl.cshifts[CSHIFT_DAMAGE].percent -= (int)((cl.time - cl.oldtime)*150); + cl.cshifts[CSHIFT_DAMAGE].percent -= (cl.time - cl.oldtime)*150; if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0) cl.cshifts[CSHIFT_DAMAGE].percent = 0; // drop the bonus value - cl.cshifts[CSHIFT_BONUS].percent -= (int)((cl.time - cl.oldtime)*100); + cl.cshifts[CSHIFT_BONUS].percent -= (cl.time - cl.oldtime)*100; if (cl.cshifts[CSHIFT_BONUS].percent <= 0) cl.cshifts[CSHIFT_BONUS].percent = 0; } @@ -530,12 +532,12 @@ void V_CalcViewBlend(void) r_refdef.viewblend[3] = 0; r_refdef.frustumscale_x = 1; r_refdef.frustumscale_y = 1; - if (cls.state == ca_connected && cls.signon == SIGNONS && gl_polyblend.value > 0) + if (cls.state == ca_connected && cls.signon == SIGNONS) { // set contents color int supercontents; vec3_t vieworigin; - Matrix4x4_OriginFromMatrix(&r_refdef.viewentitymatrix, vieworigin); + Matrix4x4_OriginFromMatrix(&r_view.matrix, vieworigin); supercontents = CL_PointSuperContents(vieworigin); if (supercontents & SUPERCONTENTS_LIQUIDSMASK) { @@ -559,7 +561,7 @@ void V_CalcViewBlend(void) cl.cshifts[CSHIFT_CONTENTS].destcolor[1] = 80; cl.cshifts[CSHIFT_CONTENTS].destcolor[2] = 50; } - cl.cshifts[CSHIFT_CONTENTS].percent = 150 >> 1; + cl.cshifts[CSHIFT_CONTENTS].percent = 150 * 0.5; } else { @@ -668,6 +670,8 @@ void V_Init (void) Cvar_RegisterVariable (&cl_bobmodel_up); Cvar_RegisterVariable (&cl_bobmodel_speed); + Cvar_RegisterVariable (&cl_viewmodel_scale); + Cvar_RegisterVariable (&v_kicktime); Cvar_RegisterVariable (&v_kickroll); Cvar_RegisterVariable (&v_kickpitch);