X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fvector.qh;h=23bfdf05593ff178f4f31c35d4319d4985d6626a;hb=2d9196051973e38c3407c8e78bf6aed6284c115a;hp=13869b016ef35f03f16f8be5d5cfbb0e14ad9282;hpb=1597f5c6dd578d807b84299600aa9c1a5f65c4e1;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/vector.qh b/qcsrc/lib/vector.qh index 13869b016..23bfdf055 100644 --- a/qcsrc/lib/vector.qh +++ b/qcsrc/lib/vector.qh @@ -177,13 +177,23 @@ 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) + ); +} #endif