X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_phys.c;h=b26ebe225e90f6020e8411a7d6491565605a320b;hp=1a7742167ecfb03cd93c7d6fdcdb52cc11d14a05;hb=7ea07939bef0cbe85c54d9f68cb924198b0b1f64;hpb=9ac8b0985a2fdd3839886ec5a435d59165899522 diff --git a/sv_phys.c b/sv_phys.c index 1a774216..b26ebe22 100644 --- a/sv_phys.c +++ b/sv_phys.c @@ -46,7 +46,7 @@ void SV_Physics_Toss (prvm_edict_t *ent); int SV_GetPitchSign(prvm_prog_t *prog, prvm_edict_t *ent) { - dp_model_t *model; + model_t *model; if ( (model = SV_GetModelFromEdict(ent)) ? @@ -122,10 +122,11 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int // matrices to transform into/out of other entity's space matrix4x4_t matrix, imatrix; // model of other entity - dp_model_t *model; + model_t *model; // list of entities to test for collisions int numtouchedicts; static prvm_edict_t *touchedicts[MAX_EDICTS]; + int clipgroup; //return SV_TraceBox(start, vec3_origin, vec3_origin, end, type, passedict, hitsupercontentsmask, skipsupercontentsmask, skipmaterialflagsmask); @@ -164,8 +165,8 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int // debug override to test against everything if (sv_debugmove.integer) { - clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999; - clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] = 999999999; + clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999; + clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] = (vec_t)999999999; } // if the passedict is world, make it NULL (to avoid two checks each time) @@ -176,6 +177,8 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int // precalculate passedict's owner edict pointer for comparisons traceowner = passedict ? PRVM_PROG_TO_EDICT(PRVM_serveredictedict(passedict, owner)) : 0; + clipgroup = passedict ? (int)PRVM_serveredictfloat(passedict, clipgroup) : 0; + // clip to entities // because this uses World_EntitiestoBox, we know all entity boxes overlap // the clip region, so we can skip culling checks in the loop below @@ -206,6 +209,9 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int // don't clip owner against owned entities if (passedictprog == PRVM_serveredictedict(touch, owner)) continue; + // don't clip against any entities in the same clipgroup (DP_RM_CLIPGROUP) + if (clipgroup && clipgroup == (int)PRVM_serveredictfloat(touch, clipgroup)) + continue; // don't clip points against points (they can't collide) if (VectorCompare(PRVM_serveredictvector(touch, mins), PRVM_serveredictvector(touch, maxs)) && (type != MOVE_MISSILE || !((int)PRVM_serveredictfloat(touch, flags) & FL_MONSTER))) continue; @@ -268,10 +274,11 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ // matrices to transform into/out of other entity's space matrix4x4_t matrix, imatrix; // model of other entity - dp_model_t *model; + model_t *model; // list of entities to test for collisions int numtouchedicts; static prvm_edict_t *touchedicts[MAX_EDICTS]; + int clipgroup; if (VectorCompare(start, end)) return SV_TracePoint(start, type, passedict, hitsupercontentsmask, skipsupercontentsmask, skipmaterialflagsmask); @@ -313,8 +320,8 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ // debug override to test against everything if (sv_debugmove.integer) { - clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999; - clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] = 999999999; + clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999; + clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] = (vec_t)999999999; } // if the passedict is world, make it NULL (to avoid two checks each time) @@ -325,6 +332,8 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ // precalculate passedict's owner edict pointer for comparisons traceowner = passedict ? PRVM_PROG_TO_EDICT(PRVM_serveredictedict(passedict, owner)) : 0; + clipgroup = passedict ? (int)PRVM_serveredictfloat(passedict, clipgroup) : 0; + // clip to entities // because this uses World_EntitiestoBox, we know all entity boxes overlap // the clip region, so we can skip culling checks in the loop below @@ -355,6 +364,9 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_ // don't clip owner against owned entities if (passedictprog == PRVM_serveredictedict(touch, owner)) continue; + // don't clip against any entities in the same clipgroup (DP_RM_CLIPGROUP) + if (clipgroup && clipgroup == (int)PRVM_serveredictfloat(touch, clipgroup)) + continue; // don't clip points against points (they can't collide) if (VectorCompare(PRVM_serveredictvector(touch, mins), PRVM_serveredictvector(touch, maxs)) && (type != MOVE_MISSILE || !((int)PRVM_serveredictfloat(touch, flags) & FL_MONSTER))) continue; @@ -407,7 +419,7 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co int i, bodysupercontents; int passedictprog; float pitchsign = 1; - qboolean pointtrace; + qbool pointtrace; prvm_edict_t *traceowner, *touch; trace_t trace; // temporary storage because prvm_vec_t may differ from vec_t @@ -425,10 +437,11 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co // matrices to transform into/out of other entity's space matrix4x4_t matrix, imatrix; // model of other entity - dp_model_t *model; + model_t *model; // list of entities to test for collisions int numtouchedicts; static prvm_edict_t *touchedicts[MAX_EDICTS]; + int clipgroup; if (VectorCompare(mins, maxs)) { vec3_t shiftstart, shiftend; @@ -489,8 +502,8 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co // debug override to test against everything if (sv_debugmove.integer) { - clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999; - clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] = 999999999; + clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999; + clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] = (vec_t)999999999; } // if the passedict is world, make it NULL (to avoid two checks each time) @@ -503,6 +516,8 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co // precalculate passedict's owner edict pointer for comparisons traceowner = passedict ? PRVM_PROG_TO_EDICT(PRVM_serveredictedict(passedict, owner)) : 0; + clipgroup = passedict ? (int)PRVM_serveredictfloat(passedict, clipgroup) : 0; + // clip to entities // because this uses World_EntitiestoBox, we know all entity boxes overlap // the clip region, so we can skip culling checks in the loop below @@ -533,6 +548,9 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co // don't clip owner against owned entities if (passedictprog == PRVM_serveredictedict(touch, owner)) continue; + // don't clip against any entities in the same clipgroup (DP_RM_CLIPGROUP) + if (clipgroup && clipgroup == (int)PRVM_serveredictfloat(touch, clipgroup)) + continue; // don't clip points against points (they can't collide) if (pointtrace && VectorCompare(PRVM_serveredictvector(touch, mins), PRVM_serveredictvector(touch, maxs)) && (type != MOVE_MISSILE || !((int)PRVM_serveredictfloat(touch, flags) & FL_MONSTER))) continue; @@ -600,7 +618,7 @@ int SV_PointSuperContents(const vec3_t point) // matrices to transform into/out of other entity's space matrix4x4_t matrix, imatrix; // model of other entity - dp_model_t *model; + model_t *model; int frame; // list of entities to test for collisions int numtouchedicts; @@ -671,7 +689,7 @@ int SV_EntitiesInBox(const vec3_t mins, const vec3_t maxs, int maxedicts, prvm_e for (edictindex = 1;edictindex < prog->num_edicts;edictindex++) { ed = PRVM_EDICT_NUM(edictindex); - if (!ed->priv.required->free && BoxesOverlap(PRVM_serveredictvector(ed, absmin), PRVM_serveredictvector(ed, absmax), paddedmins, paddedmaxs)) + if (!ed->free && BoxesOverlap(PRVM_serveredictvector(ed, absmin), PRVM_serveredictvector(ed, absmax), paddedmins, paddedmaxs)) { resultedicts[numresultedicts++] = ed; if (numresultedicts == maxedicts) @@ -716,7 +734,7 @@ void SV_LinkEdict_TouchAreaGrid(prvm_edict_t *ent) if (ent == prog->edicts) return; // don't add the world - if (ent->priv.server->free) + if (ent->free) return; if (PRVM_serveredictfloat(ent, solid) == SOLID_NOT) @@ -786,14 +804,14 @@ SV_LinkEdict void SV_LinkEdict (prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; - dp_model_t *model; + model_t *model; vec3_t mins, maxs, entmins, entmaxs, entangles; int modelindex; if (ent == prog->edicts) return; // don't add the world - if (ent->priv.server->free) + if (ent->free) return; modelindex = (int)PRVM_serveredictfloat(ent, modelindex); @@ -1061,7 +1079,7 @@ in a frame. Not used for pushmove objects, because they must be exact. Returns false if the entity removed itself. ============= */ -static qboolean SV_RunThink (prvm_edict_t *ent) +static qbool SV_RunThink (prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; int iterations; @@ -1071,7 +1089,7 @@ static qboolean SV_RunThink (prvm_edict_t *ent) if (PRVM_serveredictfloat(ent, nextthink) <= 0 || PRVM_serveredictfloat(ent, nextthink) > sv.time + sv.frametime) return true; - for (iterations = 0;iterations < 128 && !ent->priv.server->free;iterations++) + for (iterations = 0;iterations < 128 && !ent->free;iterations++) { PRVM_serverglobalfloat(time) = max(sv.time, PRVM_serveredictfloat(ent, nextthink)); PRVM_serveredictfloat(ent, nextthink) = 0; @@ -1085,7 +1103,7 @@ static qboolean SV_RunThink (prvm_edict_t *ent) if (PRVM_serveredictfloat(ent, nextthink) <= PRVM_serverglobalfloat(time) || PRVM_serveredictfloat(ent, nextthink) > sv.time + sv.frametime || !sv_gameplayfix_multiplethinksperframe.integer) break; } - return !ent->priv.server->free; + return !ent->free; } /* @@ -1108,7 +1126,7 @@ static void SV_Impact (prvm_edict_t *e1, trace_t *trace) VM_SetTraceGlobals(prog, trace); - if (!e1->priv.server->free && !e2->priv.server->free && PRVM_serveredictfunction(e1, touch) && PRVM_serveredictfloat(e1, solid) != SOLID_NOT) + if (!e1->free && !e2->free && PRVM_serveredictfunction(e1, touch) && PRVM_serveredictfloat(e1, solid) != SOLID_NOT) { PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(e1); @@ -1116,7 +1134,7 @@ static void SV_Impact (prvm_edict_t *e1, trace_t *trace) prog->ExecuteProgram(prog, PRVM_serveredictfunction(e1, touch), "QC function self.touch is missing"); } - if (!e1->priv.server->free && !e2->priv.server->free && PRVM_serveredictfunction(e2, touch) && PRVM_serveredictfloat(e2, solid) != SOLID_NOT) + if (!e1->free && !e2->free && PRVM_serveredictfunction(e2, touch) && PRVM_serveredictfloat(e2, solid) != SOLID_NOT) { PRVM_serverglobalfloat(time) = sv.time; PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(e2); @@ -1175,9 +1193,9 @@ If stepnormal is not NULL, the plane normal of any vertical wall hit will be sto ============ */ static float SV_Gravity (prvm_edict_t *ent); -static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboolean dolink); +static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink); #define MAX_CLIP_PLANES 5 -static int SV_FlyMove (prvm_edict_t *ent, float time, qboolean applygravity, float *stepnormal, int hitsupercontentsmask, int skipsupercontentsmask, int skipmaterialflagsmask, float stepheight) +static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float *stepnormal, int hitsupercontentsmask, int skipsupercontentsmask, int skipmaterialflagsmask, float stepheight) { prvm_prog_t *prog = SVVM_prog; int blocked, bumpcount; @@ -1440,7 +1458,7 @@ PUSHMOVE =============================================================================== */ -static qboolean SV_NudgeOutOfSolid_PivotIsKnownGood(prvm_edict_t *ent, vec3_t pivot) +static qbool SV_NudgeOutOfSolid_PivotIsKnownGood(prvm_edict_t *ent, vec3_t pivot) { prvm_prog_t *prog = SVVM_prog; int bump; @@ -1521,7 +1539,7 @@ static qboolean SV_NudgeOutOfSolid_PivotIsKnownGood(prvm_edict_t *ent, vec3_t pi return true; } -qboolean SV_NudgeOutOfSolid(prvm_edict_t *ent) +qbool SV_NudgeOutOfSolid(prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; int bump, pass; @@ -1570,7 +1588,7 @@ The trace struct is filled with the trace that has been done. Returns true if the push did not result in the entity being teleported by QC code. ============ */ -static qboolean SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qboolean dolink) +static qbool SV_PushEntity (trace_t *trace, prvm_edict_t *ent, vec3_t push, qbool dolink) { prvm_prog_t *prog = SVVM_prog; int solid; @@ -1658,13 +1676,13 @@ static void SV_PushMove (prvm_edict_t *pusher, float movetime) int i, e, index; int pusherowner, pusherprog; int checkcontents; - qboolean rotated; + qbool rotated; float savesolid, movetime2, pushltime; vec3_t mins, maxs, move, move1, moveangle, pushorig, pushang, a, forward, left, up, org, pushermins, pushermaxs, checkorigin, checkmins, checkmaxs; int num_moved; int numcheckentities; static prvm_edict_t *checkentities[MAX_EDICTS]; - dp_model_t *pushermodel; + model_t *pushermodel; trace_t trace, trace2; matrix4x4_t pusherfinalmatrix, pusherfinalimatrix; static unsigned short moved_edicts[MAX_EDICTS]; @@ -1965,7 +1983,7 @@ SV_Physics_Pusher static void SV_Physics_Pusher (prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; - float thinktime, oldltime, movetime; + prvm_vec_t thinktime, oldltime, movetime; oldltime = PRVM_serveredictfloat(ent, ltime); @@ -2072,7 +2090,7 @@ static unstickresult_t SV_UnstickEntityReturnOffset (prvm_edict_t *ent, vec3_t o return UNSTICK_STUCK; } -qboolean SV_UnstickEntity (prvm_edict_t *ent) +qbool SV_UnstickEntity (prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; vec3_t offset; @@ -2136,7 +2154,7 @@ static void SV_CheckStuck (prvm_edict_t *ent) SV_CheckWater ============= */ -static qboolean SV_CheckWater (prvm_edict_t *ent) +static qbool SV_CheckWater (prvm_edict_t *ent) { prvm_prog_t *prog = SVVM_prog; int cont; @@ -2290,7 +2308,7 @@ static void SV_WalkMove (prvm_edict_t *ent) int type; vec3_t upmove, downmove, start_origin, start_velocity, stepnormal, originalmove_origin, originalmove_velocity, entmins, entmaxs; trace_t downtrace, trace; - qboolean applygravity; + qbool applygravity; // if frametime is 0 (due to client sending the same timestamp twice), // don't move @@ -2332,7 +2350,11 @@ static void SV_WalkMove (prvm_edict_t *ent) VectorCopy(PRVM_serveredictvector(ent, maxs), entmaxs); trace = SV_TraceBox(upmove, entmins, entmaxs, downmove, type, ent, SV_GenericHitSuperContentsMask(ent), skipsupercontentsmask, skipmaterialflagsmask, collision_extendmovelength.value); if(trace.fraction < 1 && trace.plane.normal[2] > 0.7) + { clip |= 1; // but we HAVE found a floor + // set groundentity so we get carried when walking onto a mover with sv_gameplayfix_nogravityonground + PRVM_serveredictedict(ent, groundentity) = PRVM_EDICT_TO_PROG(trace.ent); + } } // if the move did not hit the ground at any point, we're not on ground @@ -2608,7 +2630,7 @@ void SV_Physics_Toss (prvm_edict_t *ent) // we can trust FL_ONGROUND if groundentity is world because it never moves return; } - else if (ent->priv.server->suspendedinairflag && groundentity->priv.server->free) + else if (ent->priv.server->suspendedinairflag && groundentity->free) { // if ent was supported by a brush model on previous frame, // and groundentity is now freed, set groundentity to 0 (world) @@ -2641,7 +2663,7 @@ void SV_Physics_Toss (prvm_edict_t *ent) VectorScale(PRVM_serveredictvector(ent, velocity), movetime, move); if(!SV_PushEntity(&trace, ent, move, true)) return; // teleported - if (ent->priv.server->free) + if (ent->free) return; if (trace.bmodelstartsolid && sv_gameplayfix_unstickentities.integer) { @@ -2649,7 +2671,7 @@ void SV_Physics_Toss (prvm_edict_t *ent) SV_UnstickEntity(ent); if(!SV_PushEntity(&trace, ent, move, true)) return; // teleported - if (ent->priv.server->free) + if (ent->free) return; } if (trace.fraction == 1) @@ -2821,7 +2843,7 @@ static void SV_Physics_Entity (prvm_edict_t *ent) // (if an ent spawns a higher numbered ent, it moves in the same frame, // but if it spawns a lower numbered ent, it doesn't - this never moves // ents in the first frame regardless) - qboolean runmove = ent->priv.server->move; + qbool runmove = ent->priv.server->move; ent->priv.server->move = true; if (!runmove && sv_gameplayfix_delayprojectiles.integer > 0) return; @@ -2947,7 +2969,7 @@ void SV_Physics_ClientMove(void) // call player physics, this needs the proper frametime PRVM_serverglobalfloat(frametime) = sv.frametime; - SV_ClientThink(); + SV_PlayerPhysics(); // call standard client pre-think, with frametime = 0 PRVM_serverglobalfloat(time) = sv.time; @@ -2975,7 +2997,7 @@ void SV_Physics_ClientMove(void) // angle fixing was requested by physics code... // so store the current angles for later use VectorCopy(PRVM_serveredictvector(ent, angles), host_client->fixangle_angles); - host_client->fixangle_angles_set = TRUE; + host_client->fixangle_angles_set = true; // and clear fixangle for the next frame PRVM_serveredictfloat(ent, fixangle) = 0; @@ -2995,7 +3017,7 @@ static void SV_Physics_ClientEntity_PreThink(prvm_edict_t *ent) // don't run physics here if running asynchronously if (host_client->clmovement_inputtimeout <= 0) { - SV_ClientThink(); + SV_PlayerPhysics(); //host_client->cmd.time = max(host_client->cmd.time, sv.time); } @@ -3034,7 +3056,7 @@ static void SV_Physics_ClientEntity_PostThink(prvm_edict_t *ent) // angle fixing was requested by physics code... // so store the current angles for later use VectorCopy(PRVM_serveredictvector(ent, angles), host_client->fixangle_angles); - host_client->fixangle_angles_set = TRUE; + host_client->fixangle_angles_set = true; // and clear fixangle for the next frame PRVM_serveredictfloat(ent, fixangle) = 0; @@ -3158,8 +3180,10 @@ void SV_Physics (void) PRVM_serverglobalfloat(frametime) = sv.frametime; prog->ExecuteProgram(prog, PRVM_serverfunction(StartFrame), "QC function StartFrame is missing"); +#ifdef USEODE // run physics engine World_Physics_Frame(&sv.world, sv.frametime, sv_gravity.value); +#endif // // treat each object in turn @@ -3168,22 +3192,22 @@ void SV_Physics (void) // if force_retouch, relink all the entities if (PRVM_serverglobalfloat(force_retouch) > 0) for (i = 1, ent = PRVM_EDICT_NUM(i);i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent)) - if (!ent->priv.server->free) + if (!ent->free) SV_LinkEdict_TouchAreaGrid(ent); // force retouch even for stationary if (sv_gameplayfix_consistentplayerprethink.integer) { // run physics on the client entities in 3 stages for (i = 1, ent = PRVM_EDICT_NUM(i), host_client = svs.clients;i <= svs.maxclients;i++, ent = PRVM_NEXT_EDICT(ent), host_client++) - if (!ent->priv.server->free) + if (!ent->free) SV_Physics_ClientEntity_PreThink(ent); for (i = 1, ent = PRVM_EDICT_NUM(i), host_client = svs.clients;i <= svs.maxclients;i++, ent = PRVM_NEXT_EDICT(ent), host_client++) - if (!ent->priv.server->free) + if (!ent->free) SV_Physics_ClientEntity(ent); for (i = 1, ent = PRVM_EDICT_NUM(i), host_client = svs.clients;i <= svs.maxclients;i++, ent = PRVM_NEXT_EDICT(ent), host_client++) - if (!ent->priv.server->free) + if (!ent->free) SV_Physics_ClientEntity_PostThink(ent); } else @@ -3191,7 +3215,7 @@ void SV_Physics (void) // run physics on the client entities for (i = 1, ent = PRVM_EDICT_NUM(i), host_client = svs.clients;i <= svs.maxclients;i++, ent = PRVM_NEXT_EDICT(ent), host_client++) { - if (!ent->priv.server->free) + if (!ent->free) { SV_Physics_ClientEntity_PreThink(ent); SV_Physics_ClientEntity(ent); @@ -3204,13 +3228,13 @@ void SV_Physics (void) if (!sv_freezenonclients.integer) { for (;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent)) - if (!ent->priv.server->free) + if (!ent->free) SV_Physics_Entity(ent); // make a second pass to see if any ents spawned this frame and make // sure they run their move/think if (sv_gameplayfix_delayprojectiles.integer < 0) for (i = svs.maxclients + 1, ent = PRVM_EDICT_NUM(i);i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent)) - if (!ent->priv.server->move && !ent->priv.server->free) + if (!ent->priv.server->move && !ent->free) SV_Physics_Entity(ent); }