Merge branch 'master' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / vector.qh

diff --git a/qcsrc/lib/vector.qh b/qcsrc/lib/vector.qh
index 13869b016ef35f03f16f8be5d5cfbb0e14ad9282..d2d83ff6595dca5a2642017702112745527eef1c 100644 (file)
--- a/qcsrc/lib/vector.qh
+++ b/qcsrc/lib/vector.qh
@@ -177,13 +177,36 @@ vector vec_epsilon(vector this, float eps)
        ERASEABLE
        vector NearestPointOnBox(entity box, vector org)
        {
-               vector m1 = box.mins + box.origin;
-               vector m2 = box.maxs + box.origin;
+               vector mi = box.mins + box.origin;
+               vector ma = box.maxs + box.origin;
 
                return vec3(
-                       bound(m1.x, org.x, m2.x),
-                       bound(m1.y, org.y, m2.y),
-                       bound(m1.z, org.z, m2.z)
+                       bound(mi.x, org.x, ma.x),
+                       bound(mi.y, org.y, ma.y),
+                       bound(mi.z, org.z, ma.z)
                );
        }
+
+ERASEABLE
+vector NearestPointOnBoundingBox(vector mi, vector ma, vector org)
+{
+       return vec3(
+               bound(mi.x, org.x, ma.x),
+               bound(mi.y, org.y, ma.y),
+               bound(mi.z, org.z, ma.z)
+       );
+}
+
+// bones_was_here: rounding bbox to nearest perfect floats prevents obscure collision bugs like #2742
+// FIXME: QC shouldn't need to work around tracebox potentially returning a tiny trace_fraction when the move should have been blocked.
+// Tiny values are valid in some situations and can't simply be ignored.
+#define PFLOAT (1/1024) // 1/32 1/64 etc also work
+#define RPFLOAT(a) (a=rint(a/PFLOAT)*PFLOAT)
+ERASEABLE
+vector RoundPerfectVector(vector v)
+{
+       RPFLOAT(v.x); RPFLOAT(v.y); RPFLOAT(v.z);
+       return v;
+}
+
 #endif