ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2025-03-26 04:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

reduce sticking to diagonal walls. Credit to @AltimorTASDK

Browse source
This commit is contained in:
pierow 2024-01-14 17:41:48 -05:00
parent e59ea9b87f
commit 61c7fc5d9c
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
main/source/pm_shared/pm_shared.cpp
View file

@ -2653,7 +2653,8 @@ int PM_ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce)
float change;
float angle;
int i, blocked;
#define DIST_EPSILON 0.125f
angle = normal[ 2 ];
blocked = 0x00; // Assume unblocked.
@ -2661,7 +2662,7 @@ int PM_ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce)
blocked |= 0x01; //
if (!angle) // If the plane has no Z, it is vertical (wall/step)
blocked |= 0x02; //
// Determine how far along plane to slide based on incoming direction.
// Scale by overbounce factor.
backoff = DotProduct (in, normal) * overbounce;
@ -2670,11 +2671,21 @@ int PM_ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce)
{
change = normal[i]*backoff;
out[i] = in[i] - change;
// If out velocity is too small, zero it out.
if (out[i] > -STOP_EPSILON && out[i] < STOP_EPSILON)
out[i] = 0;
//// If out velocity is too small, zero it out.
//if (out[i] > -STOP_EPSILON && out[i] < STOP_EPSILON)
// out[i] = 0;
}
// iterate once to make sure we aren't still moving through the plane
float adjust = DotProduct(out, normal);
if (adjust <= 0.0f)
{
// min this against a small number (but no further from zero than -DIST_EPSILON) to account for crossing a plane with a near-parallel normal
adjust = min(adjust, -DIST_EPSILON);
for (i = 0; i < 3; i++)
out[i] -= normal[i] * adjust;
}
// Return blocking flags.
return blocked;
}