--- ray/src/hd/sm_geom.h	1998/08/19 17:45:24	3.1
+++ ray/src/hd/sm_geom.h	1998/10/06 18:16:54	3.5
@@ -8,6 +8,8 @@
 
 /* Assumes included after standard.h  */
 
+#include <values.h>
+
 #define ZERO(x) ((x) < FTINY && (x) > -FTINY)
 #define EQUAL(a,b) ZERO((a) - (b))
 
@@ -16,8 +18,35 @@
 #define FALSE 0
 #endif
 
+typedef struct _FPEQ {
+    FVECT n;
+    double d;
+    char x,y,z;
+}FPEQ;
+
+#define FP_N(f) ((f).n)
+#define FP_D(f) ((f).d)
+#define FP_X(f) ((f).x) 
+#define FP_Y(f) ((f).y) 
+#define FP_Z(f) ((f).z) 
+  
+typedef long BCOORD;
+typedef long BDIR;
+typedef long TINT;
+#define BITS_BCOORD     (BITS(long)>>1)
+#define SHIFT_MAXBCOORD (BITS_BCOORD-2)   
+#define MAXBCOORD      (1L << SHIFT_MAXBCOORD)
+#define MAXBCOORD2      (MAXBCOORD>>1)
+#define MAXBDIR        MAXBCOORD
+#define MAXT           MAXBCOORD
+#define HUGET      MAXLONG
+
 #define M_2_3_PI PI*2/3
 
+#ifndef INVALID
+#define INVALID -1
+#endif
+
 #define GT_INVALID  0
 #define GT_VERTEX   1
 #define GT_EDGE     2
@@ -34,6 +63,9 @@
 #define DIST(a,b)         (sqrt(((a)[0]-(b)[0])*((a)[0]-(b)[0]) + \
 			        ((a)[1]-(b)[1])*((a)[1]-(b)[1]) + \
 				((a)[2]-(b)[2])*((a)[2]-(b)[2])))
+#define DIST_SQ(a,b)      (((a)[0]-(b)[0])*((a)[0]-(b)[0]) + \
+			        ((a)[1]-(b)[1])*((a)[1]-(b)[1]) + \
+				((a)[2]-(b)[2])*((a)[2]-(b)[2]))
 
 #define CROSS_VEC2(v1,v2) (((v1)[0]*(v2)[1]) - ((v1)[1]*(v2)[0])) 
 #define DOT_VEC2(v1,v2) ((v1)[0]*(v2)[0] + (v1)[1]*(v2)[1])
@@ -43,7 +75,11 @@
 
 #define MIN_VEC3(v) ((v)[0]<(v)[1]?((v)[0]<(v)[2]?(v)[0]:v[2]): \
 		     (v)[1]<(v)[2]?(v)[1]:(v)[2])
-   
+#define MAX3(a,b,c) (((b)>(a))?((b) > (c))?(b):(c):((a)>(c))?(a):(c))   
+#define MIN3(a,b,c) (((b)<(a))?((b) < (c))?(b):(c):((a)<(c))?(a):(c))   		   
+#define MAX(a,b)    (((b)>(a))?(b):(a))   
+#define MIN(a,b)  (((b)<(a))?(b):(a))   
+
 #define SUM_3VEC3(r,a,b,c) ((r)[0]=(a)[0]+(b)[0]+(c)[0], \
    (r)[1]=(a)[1]+(b)[1]+(c)[1],(r)[2]=(a)[2]+(b)[2]+(c)[2])
 
@@ -82,4 +118,7 @@ double tri_normal();
 /* double spherical_edge_normal(FVECT v0,FVECT v1,FVECT n,char norm) */
 double spherical_edge_normal();
 
+#define point_in_stri_n(n0,n1,n2,p) \
+                     ((DOT(n0,p)<=0.0)&&(DOT(n1,p)<=0.0)&&(DOT(n2,p)<=0.0))
 
+#define PT_ON_PLANE(p,peq) (DOT(FP_N(peq),p)+FP_D(peq))