libretro/libretro-tyrquake
1
0
Fork 0
mirror of https://github.com/libretro/libretro-tyrquake.git synced 2025-04-05 12:11:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pmove: pass only origin into NudgePosition, instead of pmove

Browse Source 
Slightly modified the behaviour of this function. Previously it would
always round to the nearest 1/8th coordinate towards zero, whereas now
I round to the nearest coordinate. Also, there would previously always
be at least one nudge, but I test the position once before starting
that process.

Hopefully, haven't broken any weird behaviour that depends on
this. Got to be careful when dealing with the physics of Quake!

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2013-03-20 14:34:59 +10:30
parent 3f1e96767c
commit fb39918875
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
QW/common/pmove.c
View File

@ -699,31 +699,34 @@ allow for the cut precision of the net coordinates
================= =================
*/ */
static void static void
NudgePosition(playermove_t *pmove) NudgePosition(vec3_t origin)
{ {
vec3_t base; static const vec3_t signs = { 0, -1, 1 };
int x, y, z; vec3_t nudged;
int i; int i, x, y, z;
static int sign[3] = { 0, -1, 1 };
VectorCopy(pmove->origin, base);
/*
* Round to the nearest 1/8th world coordinate
* (Note: the original QW always rounded towards zero)
*/
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
pmove->origin[i] = ((int)(pmove->origin[i] * 8)) * 0.125; origin[i] = floor(origin[i] * 8 + 0.5) * 0.125;
if (PM_TestPlayerPosition(origin))
return;
/* Nudge slightly along each axis and re-test */
for (z = 0; z <= 2; z++) { for (z = 0; z <= 2; z++) {
for (x = 0; x <= 2; x++) { for (x = 0; x <= 2; x++) {
for (y = 0; y <= 2; y++) { for (y = 0; y <= 2; y++) {
pmove->origin[0] = base[0] + (sign[x] * 1.0 / 8); VectorMA(origin, 0.125, signs, nudged);
pmove->origin[1] = base[1] + (sign[y] * 1.0 / 8); if (PM_TestPlayerPosition(nudged)) {
pmove->origin[2] = base[2] + (sign[z] * 1.0 / 8); VectorCopy(nudged, origin);
if (PM_TestPlayerPosition(pmove->origin))
return; return;
} }
} }
} }
VectorCopy(base, pmove->origin); }
// Con_DPrintf ("NudgePosition: stuck\n");
} }
/* /*
@ -818,7 +821,7 @@ PlayerMove(void)
return; return;
} }
NudgePosition(&pmove); NudgePosition(pmove.origin);
/* take angles directly from command */ /* take angles directly from command */
VectorCopy(pmove.cmd.angles, pmove.angles); VectorCopy(pmove.cmd.angles, pmove.angles);