X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fvector.qh;h=bb363c12ef26ba5b5dd765200ed08f28dc99519f;hb=268f9c69576b6bb929f66d19f0d077d19ba47edd;hp=c5c4d655585d1bf6d8a0b0b3d9dd0b2b8ffaebef;hpb=678a61b45f332fcd560083b01e6b0bf5a5ae268c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/vector.qh b/qcsrc/lib/vector.qh
index c5c4d6555..bb363c12e 100644
--- a/qcsrc/lib/vector.qh
+++ b/qcsrc/lib/vector.qh
@@ -1,22 +1,30 @@
-#ifndef VECTOR_H
-#define VECTOR_H
+#pragma once
 
 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 +32,14 @@ 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
+
+noref vector _vmul_a, _vmul_b;
+#define vmul(a, b) \
+    (_vmul_a = (a), _vmul_b = (b), \
+	  '1 0 0' * (_vmul_a.x * _vmul_b.x) \
+	+ '0 1 0' * (_vmul_a.y * _vmul_b.y) \
+	+ '0 0 1' * (_vmul_a.z * _vmul_b.z))
 
 const vector eX = '1 0 0';
 const vector eY = '0 1 0';
@@ -79,10 +94,12 @@ float boxinsidebox(vector smins, vector smaxs, vector bmins, vector bmaxs) { ret
 } MACRO_END
 
 noref vector _vec2;
-#define vec2(v) (_vec2 = (v), _vec2.z = 0, _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)
+#define vec3(_x, _y, _z) (_vec3.x = (_x), _vec3.y = (_y), _vec3.z = (_z), _vec3)
 
 vector rotate(vector v, float a)
 {
@@ -96,7 +113,36 @@ vector rotate(vector v, float a)
 noref vector _yinvert;
 #define yinvert(v) (_yinvert = (v), _yinvert.y = 1 - _yinvert.y, _yinvert)
 
-#ifndef MENUQC
+/**
+ * @param dir the directional vector
+ * @param norm the normalized normal
+ * @returns dir reflected by norm
+ */
+vector reflect(vector dir, vector norm)
+{
+	return dir - 2 * (dir * norm) * norm;
+}
+
+/**
+ * clip vel along the plane defined by norm (assuming 0 distance away), bounciness determined by bounce 0..1
+ */
+vector vec_reflect(vector vel, vector norm, float bounce)
+{
+	return vel - (1 + bounce) * (vel * norm) * norm;
+}
+
+vector vec_epsilon(vector this, float eps)
+{
+	if (this.x > -eps && this.x < eps) this.x = 0;
+	if (this.y > -eps && this.y < eps) this.y = 0;
+	if (this.z > -eps && this.z < eps) this.z = 0;
+	return this;
+}
+
+#define ClipVelocity(in, normal, out, overbounce) \
+	(out = vec_epsilon(vec_reflect(in, normal, (overbounce) - 1), 0.1))
+
+#ifdef GAMEQC
 	vector get_corner_position(entity box, int corner)
 	{
 		switch (corner)
@@ -125,5 +171,3 @@ noref vector _yinvert;
 		return ret;
 	}
 #endif
-
-#endif