X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics%2Fmovetypes%2Fmovetypes.qc;h=9ac3e4299901db21051d4ea2f206fe8636bbfa30;hb=d464b8e24227e71a33447c76220f5bf169047154;hp=f0df80cd5d52c044dd46563eb248ea976f3692ed;hpb=a394baa72a77a2db64709e44caa89a6fb4aaf5f4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc index f0df80cd5..63aa3dd95 100644 --- a/qcsrc/common/physics/movetypes/movetypes.qc +++ b/qcsrc/common/physics/movetypes/movetypes.qc @@ -1,16 +1,4 @@ #include "movetypes.qh" -#include "../player.qh" - -#if defined(CSQC) - #include - #include - #include - #include - #include -#elif defined(MENUQC) -#elif defined(SVQC) - #include -#endif #ifdef SVQC void set_movetype(entity this, int mt) @@ -19,6 +7,8 @@ void set_movetype(entity this, int mt) if (mt == MOVETYPE_PHYSICS || mt == MOVETYPE_PUSH || mt == MOVETYPE_FAKEPUSH) { this.move_qcphysics = false; } + if(!IL_CONTAINS(g_moveables, this)) + IL_PUSH(g_moveables, this); // add it to the moveable entities list (even if it doesn't move!) logic: if an object never sets its movetype, we assume it never does anything notable this.movetype = (this.move_qcphysics) ? MOVETYPE_NONE : mt; } #elif defined(CSQC) @@ -46,13 +36,19 @@ void _Movetype_WallFriction(entity this, vector stepnormal) // SV_WallFriction } vector planes[MAX_CLIP_PLANES]; -int _Movetype_FlyMove(entity this, float dt, bool applygravity, vector stepnormal, float stepheight) // SV_FlyMove +int _Movetype_FlyMove(entity this, float dt, bool applygravity, bool applystepnormal, float stepheight) // SV_FlyMove { - int blocked = 0, bumpcount; + move_stepnormal = '0 0 0'; + + if(dt <= 0) + return 0; + + int blocked = 0; int i, j, numplanes = 0; float time_left = dt, grav = 0; vector push; - vector primal_velocity, original_velocity, restore_velocity; + vector primal_velocity, original_velocity; + vector restore_velocity = this.velocity; for(i = 0; i < MAX_CLIP_PLANES; ++i) planes[i] = '0 0 0'; @@ -60,7 +56,7 @@ int _Movetype_FlyMove(entity this, float dt, bool applygravity, vector stepnorma if(applygravity) { this.move_didgravity = 1; - grav = dt * (PHYS_ENTGRAVITY(this) ? PHYS_ENTGRAVITY(this) : 1) * PHYS_GRAVITY(this); + grav = dt * (this.gravity ? this.gravity : 1) * PHYS_GRAVITY(this); if(!GAMEPLAYFIX_NOGRAVITYONGROUND || !IS_ONGROUND(this)) { @@ -71,16 +67,15 @@ int _Movetype_FlyMove(entity this, float dt, bool applygravity, vector stepnorma } } - original_velocity = primal_velocity = restore_velocity = this.velocity; + original_velocity = primal_velocity = this.velocity; - for(bumpcount = 0;bumpcount < MAX_CLIP_PLANES;bumpcount++) + for(int bumpcount = 0;bumpcount < MAX_CLIP_PLANES;bumpcount++) { if(this.velocity == '0 0 0') break; push = this.velocity * time_left; - _Movetype_PushEntity(this, push, true); - if(trace_startsolid) + if(!_Movetype_PushEntity(this, push, true, false)) { // we got teleported by a touch function // let's abort the move @@ -125,29 +120,26 @@ int _Movetype_FlyMove(entity this, float dt, bool applygravity, vector stepnorma vector org = this.origin; vector steppush = '0 0 1' * stepheight; - _Movetype_PushEntity(this, steppush, true); - if(trace_startsolid) + if(!_Movetype_PushEntity(this, steppush, true, false)) { blocked |= 8; break; } - _Movetype_PushEntity(this, push, true); - if(trace_startsolid) + if(!_Movetype_PushEntity(this, push, true, false)) { blocked |= 8; break; } float trace2_fraction = trace_fraction; - steppush = '0 0 1' * (org_z - this.origin_z); - _Movetype_PushEntity(this, steppush, true); - if(trace_startsolid) + steppush = vec3(0, 0, org.z - this.origin_z); + if(!_Movetype_PushEntity(this, steppush, true, false)) { blocked |= 8; break; } // accept the new position if it made some progress... - if(fabs(this.origin_x - org_x) >= 0.03125 || fabs(this.origin_y - org_y) >= 0.03125) + if(fabs(this.origin_x - org.x) >= 0.03125 || fabs(this.origin_y - org.y) >= 0.03125) { trace_endpos = this.origin; time_left *= 1 - trace2_fraction; @@ -162,8 +154,8 @@ int _Movetype_FlyMove(entity this, float dt, bool applygravity, vector stepnorma // step - return it to caller blocked |= 2; // save the trace for player extrafriction - if(stepnormal) - stepnormal = trace_plane_normal; + if(applystepnormal) + move_stepnormal = trace_plane_normal; } if(my_trace_fraction >= 0.001) @@ -244,6 +236,9 @@ int _Movetype_FlyMove(entity this, float dt, bool applygravity, vector stepnorma if(GAMEPLAYFIX_EASIERWATERJUMP(this) && (this.flags & FL_WATERJUMP) && !(blocked & 8)) this.velocity = primal_velocity; + if(PHYS_WALLCLIP(this) && this.pm_time && !(this.flags & FL_WATERJUMP) && !(blocked & 8)) + this.velocity = primal_velocity; + if(applygravity) { if(!GAMEPLAYFIX_NOGRAVITYONGROUND || !IS_ONGROUND(this)) @@ -331,10 +326,13 @@ void _Movetype_CheckWaterTransition(entity ent) // SV_CheckWaterTransition void _Movetype_Impact(entity this, entity oth) // SV_Impact { - if(gettouch(this)) + if(!this && !oth) + return; + + if(this.solid != SOLID_NOT && gettouch(this)) gettouch(this)(this, oth); - if(gettouch(oth)) + if(oth.solid != SOLID_NOT && gettouch(oth)) gettouch(oth)(oth, this); } @@ -357,104 +355,171 @@ void _Movetype_LinkEdict_TouchAreaGrid(entity this) // SV_LinkEdict_TouchAreaGr trace_plane_normal = '0 0 1'; trace_plane_dist = 0; trace_ent = this; + trace_dpstartcontents = 0; + trace_dphitcontents = 0; + trace_dphitq3surfaceflags = 0; + trace_dphittexturename = string_null; gettouch(it)(it, this); } }); } +bool autocvar__movetype_debug = false; void _Movetype_LinkEdict(entity this, bool touch_triggers) // SV_LinkEdict { - vector mi, ma; - if(this.solid == SOLID_BSP) - { - // TODO set the absolute bbox - mi = this.mins; - ma = this.maxs; - } - else + if(autocvar__movetype_debug) { - mi = this.mins; - ma = this.maxs; - } - mi += this.origin; - ma += this.origin; + vector mi, ma; + if(this.solid == SOLID_BSP) + { + // TODO set the absolute bbox + mi = this.mins; + ma = this.maxs; + } + else + { + mi = this.mins; + ma = this.maxs; + } + mi += this.origin; + ma += this.origin; - if(this.flags & FL_ITEM) - { - mi.x -= 15; - mi.y -= 15; - mi.z -= 1; - ma.x += 15; - ma.y += 15; - ma.z += 1; + if(this.flags & FL_ITEM) + { + mi -= '15 15 1'; + ma += '15 15 1'; + } + else + { + mi -= '1 1 1'; + ma += '1 1 1'; + } + + this.absmin = mi; + this.absmax = ma; } else { - mi.x -= 1; - mi.y -= 1; - mi.z -= 1; - ma.x += 1; - ma.y += 1; - ma.z += 1; + setorigin(this, this.origin); // calls SV_LinkEdict + #ifdef CSQC + // NOTE: CSQC's version of setorigin doesn't expand + this.absmin -= '1 1 1'; + this.absmax += '1 1 1'; + #endif } - this.absmin = mi; - this.absmax = ma; - if(touch_triggers) _Movetype_LinkEdict_TouchAreaGrid(this); } +int _Movetype_ContentsMask(entity this) // SV_GenericHitSuperContentsMask +{ + if(this) + { + if(this.dphitcontentsmask) + return this.dphitcontentsmask; + else if(this.solid == SOLID_SLIDEBOX) + { + if(this.flags & 32) // TODO: FL_MONSTER + return DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_MONSTERCLIP; + else + return DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP; + } + else if(this.solid == SOLID_CORPSE) + return DPCONTENTS_SOLID | DPCONTENTS_BODY; + else if(this.solid == SOLID_TRIGGER) + return DPCONTENTS_SOLID | DPCONTENTS_BODY; + else + return DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE; + } + else + return DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE; +} + entity _Movetype_TestEntityPosition_ent; bool _Movetype_TestEntityPosition(vector ofs) // SV_TestEntityPosition { entity this = _Movetype_TestEntityPosition_ent; -// vector org = this.origin + ofs; - - int cont = this.dphitcontentsmask; - this.dphitcontentsmask = DPCONTENTS_SOLID; - tracebox(this.origin, this.mins, this.maxs, this.origin, ((this.move_movetype == MOVETYPE_FLY_WORLDONLY) ? MOVE_WORLDONLY : MOVE_NOMONSTERS), this); - this.dphitcontentsmask = cont; + vector org = this.origin + ofs; - if(trace_startsolid) + //int cont = this.dphitcontentsmask; + //this.dphitcontentsmask = DPCONTENTS_SOLID; + tracebox(org, this.mins, this.maxs, this.origin, ((this.move_movetype == MOVETYPE_FLY_WORLDONLY) ? MOVE_WORLDONLY : MOVE_NOMONSTERS), this); + //this.dphitcontentsmask = cont; + if(trace_dpstartcontents & _Movetype_ContentsMask(this)) return true; - if(vdist(trace_endpos - this.origin, >, 0.0001)) - this.origin = trace_endpos; + if(vlen2(trace_endpos - this.origin) >= 0.0001) + { + tracebox(trace_endpos, this.mins, this.maxs, trace_endpos, MOVE_NOMONSTERS, this); + if(!trace_startsolid) + this.origin = trace_endpos; + } return false; } -bool _Movetype_UnstickEntity(entity this) // SV_UnstickEntity +bool _Movetype_TestEntityPosition_Offset(int offset) +{ + // NOTE: expects _Movetype_TestEntityPosition_ent to be set to the correct entity + // returns true if stuck + + // start at 2, since the first position has already been checked + for(int j = 2; j <= offset; ++j) + { + if(!_Movetype_TestEntityPosition('0 0 -1' * j)) + return false; + if(!_Movetype_TestEntityPosition('0 0 1' * j)) + return false; + } + + return true; +} + +int _Movetype_UnstickEntity(entity this) // SV_UnstickEntity { _Movetype_TestEntityPosition_ent = this; if (!_Movetype_TestEntityPosition(' 0 0 0')) { - return true; + return UNSTICK_FINE; } #define X(v) if (_Movetype_TestEntityPosition(v)) + X('0 0 -1') X(' 0 0 1') X('-1 0 0') X(' 1 0 0') X(' 0 -1 0') X(' 0 1 0') X('-1 -1 0') X(' 1 -1 0') X('-1 1 0') X(' 1 1 0') #undef X { - #define X(i) \ - if (_Movetype_TestEntityPosition('0 0 -1' * i)) \ - if (_Movetype_TestEntityPosition('0 0 1' * i)) - X(01) X(02) X(03) X(04) X(05) X(06) X(07) X(08) - X(09) X(10) X(11) X(12) X(13) X(14) X(15) X(16) - X(17) - #undef X + if(_Movetype_TestEntityPosition_Offset(rint((this.maxs.z - this.mins.z) * 0.36))) { LOG_DEBUGF("Can't unstick an entity (edict: %d, classname: %s, origin: %s)", etof(this), this.classname, vtos(this.origin)); - return false; + return UNSTICK_STUCK; } } LOG_DEBUGF("Sucessfully unstuck an entity (edict: %d, classname: %s, origin: %s)", etof(this), this.classname, vtos(this.origin)); - _Movetype_LinkEdict(this, true); - return true; + _Movetype_LinkEdict(this, false); + return UNSTICK_FIXED; +} + +void _Movetype_CheckStuck(entity this) // SV_CheckStuck +{ + int unstick = _Movetype_UnstickEntity(this); // sets test position entity + switch(unstick) + { + case UNSTICK_FINE: + this.oldorigin = this.origin; + break; + case UNSTICK_FIXED: + break; // already sorted + case UNSTICK_STUCK: + vector offset = this.oldorigin - this.origin; + if(!_Movetype_TestEntityPosition(offset)) + _Movetype_LinkEdict(this, false); + // couldn't unstick, should we warn about this? + break; + } } vector _Movetype_ClipVelocity(vector vel, vector norm, float f) // SV_ClipVelocity @@ -486,79 +551,36 @@ void _Movetype_PushEntityTrace(entity this, vector push) tracebox(this.origin, this.mins, this.maxs, end, type, this); } -float _Movetype_PushEntity(entity this, vector push, bool failonstartsolid) // SV_PushEntity +bool _Movetype_PushEntity(entity this, vector push, bool failonstartsolid, bool dolink) // SV_PushEntity { _Movetype_PushEntityTrace(this, push); + // NOTE: this is a workaround for the QC's lack of a worldstartsolid trace parameter if(trace_startsolid && failonstartsolid) - return trace_fraction; + { + int oldtype = this.move_nomonsters; + this.move_nomonsters = MOVE_WORLDONLY; + _Movetype_PushEntityTrace(this, push); + this.move_nomonsters = oldtype; + if(trace_startsolid) + return true; + } this.origin = trace_endpos; - if(trace_fraction < 1) - if(this.solid >= SOLID_TRIGGER && (!IS_ONGROUND(this) || (this.groundentity != trace_ent))) - _Movetype_Impact(this, trace_ent); + vector last_origin = this.origin; + + _Movetype_LinkEdict(this, dolink); - return trace_fraction; + if((this.solid >= SOLID_TRIGGER && trace_fraction < 1 && (!IS_ONGROUND(this) || this.groundentity != trace_ent))) + _Movetype_Impact(this, trace_ent); + + return (this.origin == last_origin); // false if teleported by touch } .float ltime; .void() blocked; -// matrix version of makevectors, sets v_forward, v_right and v_up -void makevectors_matrix(vector myangles) // AngleVectorsFLU -{ - v_forward = v_right = v_up = '0 0 0'; - - float yy = myangles.y * (M_PI * 2 / 360); - float sy = sin(yy); - float cy = cos(yy); - float p = myangles.x * (M_PI * 2 / 360); - float sp = sin(p); - float cp = cos(p); - if(v_forward) - { - v_forward.x = cp * cy; - v_forward.y = cp * sy; - v_forward.z = -sp; - } - if(v_right || v_up) - { - if(myangles.z) - { - float r = myangles.z * (M_PI * 2 / 360); - float sr = sin(r); - float cr = cos(r); - if(v_right) - { - v_right.x = sr * sp * cy + cr * -sy; - v_right.y = sr * sp * sy + cr * cy; - v_right.z = sr * cp; - } - if(v_up) - { - v_up.x = cr * sp * cy + -sr * -sy; - v_up.y = cr * sp * sy + -sr * cy; - v_up.z = cr * cp; - } - } - else - { - if(v_right) - { - v_right.x = -sy; - v_right.y = cy; - v_right.z = 0; - } - if(v_up) - { - v_up.x = sp * cy; - v_up.y = sp * sy; - v_up.z = cp; - } - } - } -} void _Movetype_Physics_Frame(entity this, float movedt) { @@ -567,7 +589,7 @@ void _Movetype_Physics_Frame(entity this, float movedt) { case MOVETYPE_PUSH: case MOVETYPE_FAKEPUSH: - LOG_DEBUGF("Physics: Lacking QuakeC support for Push movetype, FIX ME by using engine physics!"); + LOG_DEBUG("Physics: Lacking QuakeC support for Push movetype, FIX ME by using engine physics!"); break; case MOVETYPE_NONE: break; @@ -593,6 +615,8 @@ void _Movetype_Physics_Frame(entity this, float movedt) case MOVETYPE_FLY: case MOVETYPE_FLY_WORLDONLY: _Movetype_Physics_Toss(this, movedt); + if(wasfreed(this)) + return; _Movetype_LinkEdict(this, true); break; case MOVETYPE_PHYSICS: @@ -607,7 +631,7 @@ void _Movetype_Physics_ClientFrame(entity this, float movedt) { case MOVETYPE_PUSH: case MOVETYPE_FAKEPUSH: - LOG_DEBUGF("Physics: Lacking QuakeC support for Push movetype, FIX ME by using engine physics!"); + LOG_DEBUG("Physics: Lacking QuakeC support for Push movetype, FIX ME by using engine physics!"); break; case MOVETYPE_NONE: break; @@ -618,7 +642,6 @@ void _Movetype_Physics_ClientFrame(entity this, float movedt) _Movetype_CheckWater(this); this.origin = this.origin + movedt * this.velocity; this.angles = this.angles + movedt * this.avelocity; - _Movetype_LinkEdict(this, false); break; case MOVETYPE_STEP: _Movetype_Physics_Step(this, movedt); @@ -637,6 +660,12 @@ void _Movetype_Physics_ClientFrame(entity this, float movedt) case MOVETYPE_PHYSICS: break; } + + //_Movetype_CheckVelocity(this); + + _Movetype_LinkEdict(this, true); + + //_Movetype_CheckVelocity(this); } void Movetype_Physics_NoMatchTicrate(entity this, float movedt, bool isclient) // to be run every move frame @@ -670,12 +699,14 @@ void Movetype_Physics_MatchServer(entity this, bool sloppy) Movetype_Physics_MatchTicrate(this, TICRATE, sloppy); } +// saved .move_* .vector tic_origin; .vector tic_velocity; .int tic_flags; .vector tic_avelocity; .vector tic_angles; +// saved .* .vector tic_saved_origin; .vector tic_saved_velocity; .int tic_saved_flags; @@ -683,6 +714,8 @@ void Movetype_Physics_MatchServer(entity this, bool sloppy) .vector tic_saved_angles; void Movetype_Physics_MatchTicrate(entity this, float tr, bool sloppy) // SV_Physics_Entity { + // this hack exists to contain the physics feature + // (so entities can place themselves in the world and not need to update .tic_* themselves) #define X(s) \ if(this.(s) != this.tic_saved_##s) \ this.tic_##s = this.(s) @@ -694,25 +727,21 @@ void Movetype_Physics_MatchTicrate(entity this, float tr, bool sloppy) // SV_Ph X(angles); #undef X + this.flags = this.tic_flags; + this.velocity = this.tic_velocity; + setorigin(this, this.tic_origin); + this.avelocity = this.tic_avelocity; + this.angles = this.tic_angles; + if(tr <= 0) { - this.flags = this.tic_flags; - this.velocity = this.tic_velocity; - this.origin = this.tic_origin; - this.avelocity = this.tic_avelocity; - this.angles = this.tic_angles; Movetype_Physics_NoMatchServer(this); - this.tic_origin = this.origin; - this.tic_velocity = this.velocity; - this.tic_avelocity = this.avelocity; - this.tic_angles = this.angles; - this.tic_flags = this.flags; - - this.tic_saved_flags = this.flags; - this.tic_saved_velocity = this.velocity; - this.tic_saved_origin = this.origin; - this.tic_saved_avelocity = this.avelocity; - this.tic_saved_angles = this.angles; + + this.tic_saved_flags = this.tic_flags = this.flags; + this.tic_saved_velocity = this.tic_velocity = this.velocity; + this.tic_saved_origin = this.tic_origin = this.origin; + this.tic_saved_avelocity = this.tic_avelocity = this.avelocity; + this.tic_saved_angles = this.tic_angles = this.angles; return; } @@ -725,23 +754,27 @@ void Movetype_Physics_MatchTicrate(entity this, float tr, bool sloppy) // SV_Ph if(!this.move_didgravity) this.move_didgravity = ((this.move_movetype == MOVETYPE_BOUNCE || this.move_movetype == MOVETYPE_TOSS) && !(this.tic_flags & FL_ONGROUND)); - for (int i = 0; i < n; ++i) + for (int j = 0; j < n; ++j) { - this.flags = this.tic_flags; - this.velocity = this.tic_velocity; - setorigin(this, this.tic_origin); - this.avelocity = this.tic_avelocity; - this.angles = this.tic_angles; _Movetype_Physics_Frame(this, tr); - this.tic_origin = this.origin; - this.tic_velocity = this.velocity; - this.tic_avelocity = this.avelocity; - this.tic_angles = this.angles; - this.tic_flags = this.flags; if(wasfreed(this)) return; } + // update the physics fields + this.tic_origin = this.origin; + this.tic_velocity = this.velocity; + this.tic_avelocity = this.avelocity; + this.tic_angles = this.angles; + this.tic_flags = this.flags; + + // restore their actual values + this.flags = this.tic_saved_flags; + this.velocity = this.tic_saved_velocity; + setorigin(this, this.tic_saved_origin); + //this.avelocity = this.tic_saved_avelocity; + this.angles = this.tic_saved_angles; + this.avelocity = this.tic_avelocity; if(dt > 0 && this.move_movetype != MOVETYPE_NONE && !(this.tic_flags & FL_ONGROUND)) @@ -753,7 +786,7 @@ void Movetype_Physics_MatchTicrate(entity this, float tr, bool sloppy) // SV_Ph { this.velocity_z -= (GAMEPLAYFIX_GRAVITYUNAFFECTEDBYTICRATE ? 0.5 : 1) * dt - * (this.gravity ? this.gravity : 1) + * ((this.gravity) ? this.gravity : 1) * PHYS_GRAVITY(this); } @@ -765,16 +798,16 @@ void Movetype_Physics_MatchTicrate(entity this, float tr, bool sloppy) // SV_Ph } else { - vector oldorg = this.origin; - this.origin = this.tic_origin; + setorigin(this, this.tic_origin); _Movetype_PushEntityTrace(this, dt * this.velocity); - this.origin = oldorg; if(!trace_startsolid) setorigin(this, trace_endpos); + else + setorigin(this, this.tic_saved_origin); } if(this.move_didgravity > 0 && GAMEPLAYFIX_GRAVITYUNAFFECTEDBYTICRATE) - this.velocity_z -= 0.5 * dt * (this.gravity ? this.gravity : 1) * PHYS_GRAVITY(this); + this.velocity_z -= 0.5 * dt * ((this.gravity) ? this.gravity : 1) * PHYS_GRAVITY(this); } else { @@ -783,6 +816,8 @@ void Movetype_Physics_MatchTicrate(entity this, float tr, bool sloppy) // SV_Ph setorigin(this, this.tic_origin); } + this.flags = this.tic_flags; + this.tic_saved_flags = this.flags; this.tic_saved_velocity = this.velocity; this.tic_saved_origin = this.origin;