X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fcsqcmodel%2Fcl_player.qc;h=374dd8c1fe08ee21d5e31c9852de1ec29e4e946a;hb=962ad6a669ea307552a5992334d6d4c3a85a204f;hp=3b4c5fe69024ee713d9a8afa83c8c3a4d214213a;hpb=1237e104131b37576287fddcbee29a0fe8806f9c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc index 3b4c5fe69..374dd8c1f 100644 --- a/qcsrc/lib/csqcmodel/cl_player.qc +++ b/qcsrc/lib/csqcmodel/cl_player.qc @@ -25,14 +25,6 @@ #include "cl_model.qh" #include "common.qh" #include "interpolate.qh" -#include -#include -#include -#include -#include -#include -#include -#include float autocvar_cl_movement_errorcompensation = 0; bool autocvar_cl_movement_intermissionrunning = false; @@ -97,7 +89,7 @@ void CSQCPlayer_SetPredictionError(vector o, vector v, float onground_diff) void CSQCPlayer_Unpredict(entity this) { if (csqcplayer_status == CSQCPLAYERSTATUS_UNPREDICTED) return; - if (csqcplayer_status != CSQCPLAYERSTATUS_PREDICTED) LOG_FATALF("Cannot unpredict in current status (%d)\n", csqcplayer_status); + if (csqcplayer_status != CSQCPLAYERSTATUS_PREDICTED) LOG_FATALF("Cannot unpredict in current status (%d)", csqcplayer_status); this.origin = csqcplayer_origin; this.velocity = csqcplayer_velocity; csqcplayer_moveframe = csqcplayer_sequence + 1; // + 1 because the recieved frame has the move already done (server side) @@ -106,17 +98,17 @@ void CSQCPlayer_Unpredict(entity this) void CSQCPlayer_SetMinsMaxs(entity this) { - if ((this.flags & FL_DUCKED) || !this.isplayermodel) + if (IS_DUCKED(this) || !this.isplayermodel) { - this.mins = STAT(PL_CROUCH_MIN, NULL); - this.maxs = STAT(PL_CROUCH_MAX, NULL); - this.view_ofs = STAT(PL_CROUCH_VIEW_OFS, NULL); + this.mins = PHYS_PL_CROUCH_MIN(this); + this.maxs = PHYS_PL_CROUCH_MAX(this); + this.view_ofs = PHYS_PL_CROUCH_VIEWOFS(this); } else { - this.mins = STAT(PL_MIN, NULL); - this.maxs = STAT(PL_MAX, NULL); - this.view_ofs = STAT(PL_VIEW_OFS, NULL); + this.mins = PHYS_PL_MIN(this); + this.maxs = PHYS_PL_MAX(this); + this.view_ofs = PHYS_PL_VIEWOFS(this); } } @@ -130,72 +122,31 @@ void CSQCPlayer_SavePrediction(entity this) } void CSQC_ClientMovement_PlayerMove_Frame(entity this); -void _Movetype_Physics_ClientFrame(entity this, float movedt); - -void Movetype_Physics_Spam(entity this) // optimized -{ - _Movetype_Physics_ClientFrame(this, PHYS_INPUT_TIMELENGTH); - if(wasfreed(this)) - return; - - this.avelocity = this.move_avelocity; - this.velocity = this.move_velocity; - this.angles = this.move_angles; - this.flags = BITSET(this.flags, FL_ONGROUND, boolean(this.move_flags & FL_ONGROUND)); - this.flags = BITSET(this.flags, FL_WATERJUMP, boolean(this.move_flags & FL_WATERJUMP)); - this.waterlevel = this.move_waterlevel; - this.watertype = this.move_watertype; - setorigin(this, this.move_origin); -} - -void CSQCPlayer_CheckWater(entity this) -{ - this.move_origin = this.origin; - this.move_waterlevel = this.waterlevel; - this.move_watertype = this.watertype; - _Movetype_CheckWater(this); - this.waterlevel = this.move_waterlevel; - this.watertype = this.move_watertype; -} void CSQCPlayer_Physics(entity this) { - if(autocvar_cl_movement) - { - if(autocvar_cl_movement == 1) - CSQCPlayer_CheckWater(this); // we apparently need to check water *before* physics so it can use this for water jump + if(!autocvar_cl_movement) { return; } - vector oldv_angle = this.v_angle; - vector oldangles = this.angles; // we need to save these, as they're abused by other code - this.v_angle = PHYS_INPUT_ANGLES(this); - this.angles = PHYS_WORLD_ANGLES(this); + _Movetype_CheckWater(this); // we apparently need to check water *before* physics so it can use this for water jump - CSQC_ClientMovement_PlayerMove_Frame(this); + vector oldv_angle = this.v_angle; + vector oldangles = this.angles; // we need to save these, as they're abused by other code + this.v_angle = PHYS_INPUT_ANGLES(this); + this.angles = PHYS_WORLD_ANGLES(this); - if(autocvar_cl_movement == 1) - { - this.move_origin = this.origin; - this.move_angles = this.angles; - //this.move_movetype = MOVETYPE_WALK; // temp - this.move_velocity = this.velocity; - this.move_avelocity = this.avelocity; - this.move_flags = BITSET(this.move_flags, FL_ONGROUND, IS_ONGROUND(this)); - this.move_flags = BITSET(this.move_flags, FL_WATERJUMP, boolean(this.flags & FL_WATERJUMP)); - this.move_waterlevel = this.waterlevel; - this.move_watertype = this.watertype; - Movetype_Physics_Spam(this); - } + CSQC_ClientMovement_PlayerMove_Frame(this); - view_angles = this.v_angle; - input_angles = this.angles; - this.v_angle = oldv_angle; - this.angles = oldangles; + Movetype_Physics_NoMatchTicrate(this, PHYS_INPUT_TIMELENGTH, true); - this.pmove_flags = - ((this.flags & FL_DUCKED) ? PMF_DUCKED : 0) | - (!(this.flags & FL_JUMPRELEASED) ? PMF_JUMP_HELD : 0) | - ((IS_ONGROUND(this)) ? PMF_ONGROUND : 0); - } + view_angles = this.v_angle; + input_angles = this.angles; + this.v_angle = oldv_angle; + this.angles = oldangles; + + this.pmove_flags = + ((IS_DUCKED(this)) ? PMF_DUCKED : 0) | + ((IS_JUMP_HELD(this)) ? PMF_JUMP_HELD : 0) | + ((IS_ONGROUND(this)) ? PMF_ONGROUND : 0); } void CSQCPlayer_PredictTo(entity this, float endframe, bool apply_error) @@ -217,7 +168,7 @@ void CSQCPlayer_PredictTo(entity this, float endframe, bool apply_error) { csqcplayer_moveframe = clientcommandframe; getinputstate(csqcplayer_moveframe-1); - LOG_INFO("the Weird code path got hit\n"); + LOG_INFO("the Weird code path got hit"); return; } #endif @@ -231,6 +182,15 @@ void CSQCPlayer_PredictTo(entity this, float endframe, bool apply_error) do { if (!getinputstate(csqcplayer_moveframe)) break; + /*if (input_timelength > 0.0005) + { + if (input_timelength > 0.05) + { + input_timelength /= 2; + CSQCPlayer_Physics(this); + } + CSQCPlayer_Physics(this); + }*/ CSQCPlayer_Physics(this); CSQCPlayer_SetMinsMaxs(this); ++csqcplayer_moveframe; @@ -247,19 +207,101 @@ bool CSQCPlayer_IsLocalPlayer(entity this) return (this == csqcplayer); } -void CSQCPlayer_SetViewLocation() +float stairsmoothz; +float autocvar_cl_stairsmoothspeed; +float autocvar_cl_smoothviewheight; +float smooth_prevtime; +float viewheightavg; +float autocvar_cl_bobfall; +float autocvar_cl_bobfallcycle; +float autocvar_cl_bobfallminspeed; +float bobfall_swing; +float bobfall_speed; +vector CSQCPlayer_ApplySmoothing(entity this, vector v) +{ + if(this.csqcmodel_teleported || !IS_ONGROUND(this) || autocvar_cl_stairsmoothspeed <= 0) + stairsmoothz = v.z; + else + { + if(v.z > stairsmoothz) + v.z = stairsmoothz = bound(v.z - PHYS_STEPHEIGHT(this), stairsmoothz + frametime * autocvar_cl_stairsmoothspeed, v.z); + else if(v.z < stairsmoothz) + v.z = stairsmoothz = bound(v.z, stairsmoothz - frametime * autocvar_cl_stairsmoothspeed, v.z + PHYS_STEPHEIGHT(this)); + } + + float viewheight = bound(0, (time - smooth_prevtime) / max(0.0001, autocvar_cl_smoothviewheight), 1); + viewheightavg = viewheightavg * (1 - viewheight) + this.view_ofs.z * viewheight; + v.z += viewheightavg; + + if(autocvar_cl_bobfall && autocvar_cl_bobfallcycle) + { + if(!IS_ONGROUND(this)) + { + bobfall_speed = bound(-400, this.velocity.z, 0) * bound(0, autocvar_cl_bobfall, 0.1); + if(this.velocity.z < -autocvar_cl_bobfallminspeed) + bobfall_swing = 1; + else + bobfall_swing = 0; // really? + } + else + { + bobfall_swing = max(0, bobfall_swing - autocvar_cl_bobfallcycle * frametime); + float bobfall = sin(M_PI * bobfall_swing) * bobfall_speed; + v.z += bobfall; + } + } + + smooth_prevtime = time; + + return v; +} + +bool autocvar_v_deathtilt; +float autocvar_v_deathtiltangle; +void CSQCPlayer_ApplyDeathTilt(entity this) { - viewloc_SetViewLocation(); + if(!autocvar_v_deathtilt) + return; + view_angles.y = autocvar_v_deathtiltangle; +} + +float autocvar_v_idlescale; +float autocvar_v_ipitch_cycle; +float autocvar_v_iyaw_cycle; +float autocvar_v_iroll_cycle; +float autocvar_v_ipitch_level; +float autocvar_v_iyaw_level; +float autocvar_v_iroll_level; +void CSQCPlayer_ApplyIdleScaling(entity this) +{ + view_angles.x += autocvar_v_idlescale * sin(time * autocvar_v_ipitch_cycle) * autocvar_v_ipitch_level; + view_angles.y += autocvar_v_idlescale * sin(time * autocvar_v_iyaw_cycle) * autocvar_v_iyaw_level; + view_angles.z += autocvar_v_idlescale * sin(time * autocvar_v_iroll_cycle) * autocvar_v_iroll_level; + setproperty(VF_CL_VIEWANGLES, view_angles); // update view angles as well so we can aim +} + +float autocvar_chase_back; +float autocvar_chase_up; +vector CSQCPlayer_ApplyChase(entity this, vector v) +{ + // TODO: chase_overhead + v += this.view_ofs; + makevectors(view_angles); + tracebox(v, '-4 -4 -4', '4 4 4', v - v_forward * autocvar_chase_back, MOVE_NORMAL, this); + v = trace_endpos; + tracebox(v, '-4 -4 -4', '4 4 4', v + v_up * autocvar_chase_up, MOVE_NORMAL, this); + v = trace_endpos; + return v; } /** Called once per CSQC_UpdateView() */ void CSQCPlayer_SetCamera() { - const vector v0 = ((intermission && autocvar_cl_movement_intermissionrunning) ? '0 0 0' : pmove_vel); // TRICK: pmove_vel is set by the engine when we get here. No need to network velocity - const float vh = STAT(VIEWHEIGHT); - const vector pl_viewofs = STAT(PL_VIEW_OFS, NULL); - const vector pl_viewofs_crouch = STAT(PL_CROUCH_VIEW_OFS, NULL); - const entity e = csqcplayer; + vector v0 = ((intermission && !autocvar_cl_movement_intermissionrunning) ? '0 0 0' : pmove_vel); // TRICK: pmove_vel is set by the engine when we get here. No need to network velocity + float vh = PHYS_VIEWHEIGHT(NULL); + vector pl_viewofs = PHYS_PL_VIEWOFS(NULL); + vector pl_viewofs_crouch = PHYS_PL_CROUCH_VIEWOFS(NULL); + entity e = csqcplayer; if (e) { if (servercommandframe == 0 || clientcommandframe == 0) @@ -284,13 +326,13 @@ void CSQCPlayer_SetCamera() } else { - const int flg = e.iflags; e.iflags &= ~(IFLAG_ORIGIN | IFLAG_ANGLES); + int flg = e.iflags; e.iflags &= ~(IFLAG_ORIGIN | IFLAG_ANGLES); InterpolateOrigin_Do(e); e.iflags = flg; if (csqcplayer_status == CSQCPLAYERSTATUS_FROMSERVER) { - const vector o = e.origin; + vector o = e.origin; csqcplayer_status = CSQCPLAYERSTATUS_PREDICTED; CSQCPlayer_PredictTo(e, servercommandframe + 1, false); CSQCPlayer_SetPredictionError(e.origin - o, e.velocity - v0, pmove_onground - IS_ONGROUND(e)); @@ -330,13 +372,26 @@ void CSQCPlayer_SetCamera() InterpolateOrigin_Do(view); view.view_ofs = '0 0 1' * vh; } - int refdefflags = 0; - if (view.csqcmodel_teleported) refdefflags |= REFDEFFLAG_TELEPORTED; - if (input_buttons & BIT(1)) refdefflags |= REFDEFFLAG_JUMPING; + //int refdefflags = 0; + //if (view.csqcmodel_teleported) refdefflags |= REFDEFFLAG_TELEPORTED; + //if (input_buttons & BIT(1)) refdefflags |= REFDEFFLAG_JUMPING; // note: these two only work in WIP2, but are harmless in WIP1 - if (STAT(HEALTH) <= 0 && STAT(HEALTH) != -666 && STAT(HEALTH) != -2342) refdefflags |= REFDEFFLAG_DEAD; - if (intermission) refdefflags |= REFDEFFLAG_INTERMISSION; - V_CalcRefdef(view, refdefflags); + //if (PHYS_HEALTH(NULL) <= 0 && PHYS_HEALTH(NULL) != -666 && PHYS_HEALTH(NULL) != -2342) refdefflags |= REFDEFFLAG_DEAD; + //if (intermission) refdefflags |= REFDEFFLAG_INTERMISSION; + vector vieworg = view.origin; + if(autocvar_chase_active) + vieworg = CSQCPlayer_ApplyChase(view, vieworg); + else + { + vieworg = CSQCPlayer_ApplySmoothing(view, vieworg); + if(IS_DEAD(view)) + CSQCPlayer_ApplyDeathTilt(view); + } + if(autocvar_v_idlescale) + CSQCPlayer_ApplyIdleScaling(view); + setproperty(VF_ORIGIN, vieworg); + setproperty(VF_ANGLES, view_angles); + //V_CalcRefdef(view, refdefflags); // TODO? uses .health stat in the engine when this isn't called here, may be broken! } else {