From: TimePath Date: Tue, 29 Dec 2015 02:36:18 +0000 (+1100) Subject: Vector: vlen2 in terms of dotproduct X-Git-Tag: xonotic-v0.8.2~1367 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4b330326dfd04c5e534090cccf6da3fc6f04cd20;p=xonotic%2Fxonotic-data.pk3dir.git Vector: vlen2 in terms of dotproduct --- diff --git a/qcsrc/lib/vector.qh b/qcsrc/lib/vector.qh index c5c4d6555..8a63ae9b1 100644 --- a/qcsrc/lib/vector.qh +++ b/qcsrc/lib/vector.qh @@ -2,21 +2,30 @@ #define VECTOR_H noref vector _vlen2; -#define vlen2(v) \ - (_vlen2 = (v), \ - _vlen2.x * _vlen2.x \ - + _vlen2.y * _vlen2.y \ - + _vlen2.z * _vlen2.z) +#define vlen2(v) (_vlen2 = (v), dotproduct(_vlen2, _vlen2)) +#if 1 noref float _vdist_f; /** Vector distance comparison, avoids sqrt() */ #define vdist(v, cmp, f) (vlen2(v) cmp (_vdist_f = (f), _vdist_f * _vdist_f)) -/* +#else #define vdist(v, cmp, f) (vlen(v) cmp (f)) -*/ +#endif + +#if 1 +#define dotproduct(a, b) ((a) * (b)) +#else +noref vector _dotproduct_a, _dotproduct_b; +#define dotproduct(a, b) \ + (_dotproduct_a = (a), _dotproduct_b = (b), \ + _dotproduct_a.x * _dotproduct_b.x \ + + _dotproduct_a.y * _dotproduct_b.y \ + + _dotproduct_a.z * _dotproduct_b.z) +#endif +#if 1 #define cross(a, b) ((a) >< (b)) -/* +#else vector cross(vector a, vector b) { return @@ -24,7 +33,7 @@ vector cross(vector a, vector b) + '0 1 0' * (a.z * b.x - a.x * b.z) + '0 0 1' * (a.x * b.y - a.y * b.x); } -*/ +#endif const vector eX = '1 0 0'; const vector eY = '0 1 0';