X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fvector.qh;h=def1dae2d489f512a0c677087943814c00f8b8a7;hb=0a20a065f61e6235f62801362a25dfb0a70c6a14;hp=0cda013c0e8238ba26e259c0a232befd690ee9de;hpb=7f64f637f43db3555fbe00e2424c68474de7bcc0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/vector.qh b/qcsrc/lib/vector.qh
index 0cda013c0..def1dae2d 100644
--- a/qcsrc/lib/vector.qh
+++ b/qcsrc/lib/vector.qh
@@ -1,8 +1,30 @@
-#ifndef VECTOR_H
-#define VECTOR_H
+#pragma once
 
+noref vector _vlen2;
+#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
@@ -10,7 +32,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';
@@ -26,11 +48,6 @@ vector randompos(vector m1, vector m2)
 	return v;
 }
 
-float vlen2d(vector v)
-{
-	return sqrt(v.x * v.x + v.y * v.y);
-}
-
 float vlen_maxnorm2d(vector v)
 {
 	return max(v.x, v.y, -v.x, -v.y);
@@ -58,21 +75,24 @@ float boxesoverlap(vector m1, vector m2, vector m3, vector m4) { return m2_x >=
 /** requires the same as boxesoverlap, but is a stronger condition */
 float boxinsidebox(vector smins, vector smaxs, vector bmins, vector bmaxs) { return smins.x >= bmins.x && smaxs.x <= bmaxs.x && smins.y >= bmins.y && smaxs.y <= bmaxs.y && smins.z >= bmins.z && smaxs.z <= bmaxs.z; }
 
+#define PITCH(v) ((v).x)
+#define YAW(v) ((v).y)
+#define ROLL(v) ((v).z)
 
-vector vec2(vector v)
-{
-	v.z = 0;
-	return v;
-}
+#define MAKEVECTORS(f, angles, forward, right, up) MACRO_BEGIN { \
+	f(angles); \
+	forward = v_forward; \
+	right = v_right; \
+	up = v_up; \
+} MACRO_END
 
-vector vec3(float x, float y, float z)
-{
-	vector v;
-	v.x = x;
-	v.y = y;
-	v.z = z;
-	return v;
-}
+noref vector _vec2;
+#define vec2(...) EVAL(OVERLOAD(vec2, __VA_ARGS__))
+#define vec2_1(v) (_vec2 = (v), _vec2.z = 0, _vec2)
+#define vec2_2(x, y) (_vec2_x = (x), _vec2_y = (y), _vec2)
+
+noref vector _vec3;
+#define vec3(_x, _y, _z) (_vec3.x = (_x), _vec3.y = (_y), _vec3.z = (_z), _vec3)
 
 vector rotate(vector v, float a)
 {
@@ -83,10 +103,17 @@ vector rotate(vector v, float a)
 	return r;
 }
 
-vector yinvert(vector v)
+noref vector _yinvert;
+#define yinvert(v) (_yinvert = (v), _yinvert.y = 1 - _yinvert.y, _yinvert)
+
+/**
+ * @param dir the directional vector
+ * @param norm the normalized normal
+ * @returns dir reflected by norm
+ */
+vector reflect(vector dir, vector norm)
 {
-	v.y = 1 - v.y;
-	return v;
+	return dir - 2 * (dir * norm) * norm;
 }
 
 #ifndef MENUQC
@@ -118,5 +145,3 @@ vector yinvert(vector v)
 		return ret;
 	}
 #endif
-
-#endif