ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/hd/sm_geom.h
(Generate patch)

Comparing ray/src/hd/sm_geom.h (file contents):
Revision 3.6 by gwlarson, Wed Nov 11 12:05:39 1998 UTC vs.
Revision 3.7 by gwlarson, Mon Dec 28 18:07:35 1998 UTC

# Line 10 | Line 10
10  
11   #include <values.h>
12  
13 < #define F_TINY 1e-3
14 <
13 > #define F_TINY 1e-5
14   #define FZERO(x) ((x) < F_TINY && (x) > -F_TINY)
15   #define FEQUAL(a,b) FZERO((a) - (b))
16  
# Line 38 | Line 37 | typedef struct _FPEQ {
37   typedef long BCOORD;
38   typedef long BDIR;
39   typedef long TINT;
40 < #define BITS_BCOORD     (BITS(long)>>1)
41 < #define SHIFT_MAXBCOORD (BITS_BCOORD-2)  
42 < #define MAXBCOORD      (1L << SHIFT_MAXBCOORD)
40 >
41 > #define BITS_BCOORD     (BITS(long)-2)
42 > #define SHIFT_MAXBCOORD (BITS_BCOORD-1)  
43 > #define MAXBCOORD      ((1L << BITS_BCOORD)-1)
44   #define MAXBCOORD2      (MAXBCOORD>>1)
45 < #define MAXBDIR        MAXBCOORD
46 < #define MAXT           MAXBCOORD
47 < #define HUGET      MAXLONG
45 > #define MAXBCOORD4      (MAXBCOORD2>>1)
46  
47   #define M_2_3_PI PI*2/3
48  
# Line 63 | Line 61 | typedef long TINT;
61  
62   #define ZERO_VEC3(v)     (ZERO(v[0]) && ZERO(v[1]) && ZERO(v[2]) )
63   #define EQUAL_VEC3(a,b)  (EQUAL(a[0],b[0])&&EQUAL(a[1],b[1])&&EQUAL(a[2],b[2]))
64 + #define OPP_EQUAL_VEC3(a,b)  (EQUAL(a[0],-b[0])&&EQUAL(a[1],-b[1])&&EQUAL(a[2],-b[2]))
65   #define FZERO_VEC3(v)     (FZERO(v[0]) && FZERO(v[1]) && FZERO(v[2]) )
66   #define FEQUAL_VEC3(a,b) (FEQUAL(a[0],b[0])&&FEQUAL(a[1],b[1])&&FEQUAL(a[2],b[2]))
67   #define NEGATE_VEC3(v)   ((v)[0] *= -1.0,(v)[1] *= -1.0,(v)[2] *= -1.0)
# Line 74 | Line 73 | typedef long TINT;
73                                  ((a)[1]-(b)[1])*((a)[1]-(b)[1]) + \
74                                  ((a)[2]-(b)[2])*((a)[2]-(b)[2]))
75  
76 + #define SIGN(x) ((x<0)?-1:1)
77   #define CROSS_VEC2(v1,v2) (((v1)[0]*(v2)[1]) - ((v1)[1]*(v2)[0]))
78   #define DOT_VEC2(v1,v2) ((v1)[0]*(v2)[0] + (v1)[1]*(v2)[1])
79  
80 < #define EDGE_MIDPOINT_VEC3(a,v1,v2) ((a)[0]=((v1)[0]+(v2)[0])*0.5, \
80 > #define EDGE_MIDPOINT(a,v1,v2) ((a)[0]=((v1)[0]+(v2)[0])*0.5, \
81   (a)[1]=((v1)[1]+(v2)[1])*0.5,(a)[2] = ((v1)[2]+(v2)[2])*0.5)
82  
83   #define MIN_VEC3(v) ((v)[0]<(v)[1]?((v)[0]<(v)[2]?(v)[0]:v[2]): \
# Line 124 | Line 124 | typedef long TINT;
124   double tri_normal();
125   /* double spherical_edge_normal(FVECT v0,FVECT v1,FVECT n,char norm) */
126   double spherical_edge_normal();
127 + double point_on_sphere();
128  
129   #define point_in_stri_n(n0,n1,n2,p) \
130 <  ((DOT(n0,p)<=F_TINY)&&(DOT(n1,p)<=F_TINY)&&(DOT(n2,p)<=F_TINY))
130 >  ((DOT(n0,p)<=FTINY)&&(DOT(n1,p)<=FTINY)&&(DOT(n2,p)<=FTINY))
131  
132   #define PT_ON_PLANE(p,peq) (DOT(FP_N(peq),p)+FP_D(peq))
133 +

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)