qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add component-wise vector and quaternion comparison macros. 

Also, re-implement VectorCompare and QuatCompare using the new macros.

VectorCompCompare and QuatCompCompare take a parameter specifying the
comparison operator to use. All component-wise comparisons must be true
for the whole comparison to be true.
This commit is contained in:
Bill Currie 2011-12-22 09:21:54 +09:00
parent d441dc9027
commit 8b78aeb666
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/QF/mathlib.h
View File

@ -101,8 +101,9 @@ extern const vec_t * const quat_origin;
(c)[1] = (a)[1] * (b)[1]; \ (c)[1] = (a)[1] * (b)[1]; \
(c)[2] = (a)[2] * (b)[2]; \ (c)[2] = (a)[2] * (b)[2]; \
} while (0) } while (0)
#define VectorCompare(x, y) \ #define VectorCompCompare(x, op, y) \
(((x)[0] == (y)[0]) && ((x)[1] == (y)[1]) && ((x)[2] == (y)[2])) (((x)[0] op (y)[0]) && ((x)[1] op (y)[1]) && ((x)[2] op (y)[2]))
#define VectorCompare(x, y) VectorCompCompare (x, ==, y)
#define VectorIsZero(a) (!(a)[0] && !(a)[1] && !(a)[2]) #define VectorIsZero(a) (!(a)[0] && !(a)[1] && !(a)[2])
#define VectorZero(a) ((a)[2] = (a)[1] = (a)[0] = 0); #define VectorZero(a) ((a)[2] = (a)[1] = (a)[0] = 0);
@ -183,9 +184,10 @@ extern const vec_t * const quat_origin;
(c)[2] = (a)[2] * (b); \ (c)[2] = (a)[2] * (b); \
(c)[3] = (a)[3] * (3); \ (c)[3] = (a)[3] * (3); \
} while (0) } while (0)
#define QuatCompare(x, y) \ #define QuatCompCompare(x, op, y) \
(((x)[0] == (y)[0]) && ((x)[1] == (y)[1]) \ (((x)[0] op (y)[0]) && ((x)[1] op (y)[1]) \
&& ((x)[2] == (y)[2]) && ((x)[3] == (y)[3])) && ((x)[2] op (y)[2]) && ((x)[3] op (y)[3]))
#define QuatCompare(x, y) QuatCompCompare (x, ==, y)
#define QuatIsZero(a) (!(a)[0] && !(a)[1] && !(a)[2] && !(a)[3]) #define QuatIsZero(a) (!(a)[0] && !(a)[1] && !(a)[2] && !(a)[3])
#define QuatZero(a) ((a)[3] = (a)[2] = (a)[1] = (a)[0] = 0); #define QuatZero(a) ((a)[3] = (a)[2] = (a)[1] = (a)[0] = 0);