From b7f84130dea511aa9bc023cf4bea706b914902a9 Mon Sep 17 00:00:00 2001 From: Tyrann Date: Mon, 9 Oct 2006 22:52:02 +0930 Subject: [PATCH] [PATCH] qbsp: Collect all epsilons together in qbsp.h Signed-off-by: Tyrann --- qbsp/brush.c | 4 ---- qbsp/merge.c | 2 -- qbsp/qbsp.h | 11 +++++++++-- qbsp/surfaces.c | 2 -- qbsp/tjunc.c | 2 -- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/qbsp/brush.c b/qbsp/brush.c index 4f2821b0..93423721 100644 --- a/qbsp/brush.c +++ b/qbsp/brush.c @@ -121,9 +121,6 @@ AddToBounds(vec3_t v) //=========================================================================== -#define DISTEPSILON 0.01 -#define ANGLEEPSILON 0.00001 - static void NormalizePlane(plane_t *dp) { @@ -277,7 +274,6 @@ FixRotateOrigin(int iEntity, vec3_t offset) CreateBrushFaces ================= */ -#define ZERO_EPSILON 0.001 static face_t * CreateBrushFaces(void) { diff --git a/qbsp/merge.c b/qbsp/merge.c index 6d5a403a..b1eedc6f 100644 --- a/qbsp/merge.c +++ b/qbsp/merge.c @@ -22,8 +22,6 @@ #include "qbsp.h" -#define CONTINUOUS_EPSILON 0.001 - #ifdef PARANOID static void CheckColinear(face_t *f) diff --git a/qbsp/qbsp.h b/qbsp/qbsp.h index 4672d1c5..6eaaa00b 100644 --- a/qbsp/qbsp.h +++ b/qbsp/qbsp.h @@ -101,9 +101,16 @@ #define NUM_AMBIENTS 4 // automatic ambient sounds // Misc values -#define ON_EPSILON 0.05 +#define ANGLEEPSILON 0.00001 +#define EQUAL_EPSILON 0.001 +#define ZERO_EPSILON 0.001 +#define CONTINUOUS_EPSILON 0.001 +#define DISTEPSILON 0.01 +#define POINT_EPSILON 0.01 +#define T_EPSILON 0.01 +#define ON_EPSILON 0.05 + #define BOGUS_RANGE 18000 -#define EQUAL_EPSILON 0.001 // the exact bounding box of the brushes is expanded some for the headnode // volume. is this still needed? diff --git a/qbsp/surfaces.c b/qbsp/surfaces.c index a8df7043..d9331815 100644 --- a/qbsp/surfaces.c +++ b/qbsp/surfaces.c @@ -144,8 +144,6 @@ GatherNodeFaces(node_t *headnode) //=========================================================================== -#define POINT_EPSILON 0.01 - static hashvert_t *hvert_p; // This is a kludge. Should be pEdgeFaces[2]. diff --git a/qbsp/tjunc.c b/qbsp/tjunc.c index cb799fbd..9fd9318f 100644 --- a/qbsp/tjunc.c +++ b/qbsp/tjunc.c @@ -179,8 +179,6 @@ AddVert =============== */ -#define T_EPSILON 0.01 - static void AddVert(wedge_t *w, vec_t t) {