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

Comparing ray/src/hd/sm_qtree.h (file contents):
Revision 3.7 by gwlarson, Tue Oct 6 18:18:54 1998 UTC vs.
Revision 3.12 by gwlarson, Thu Jun 10 15:22:24 1999 UTC

# Line 20 | Line 20
20   *              < -1:   it is an index to a set of objects
21   */
22   #include "object.h"
23 + typedef struct _FUNC {
24 +    int (*func)();
25 +    int (*func_after)();
26 +    int *argptr;
27 + }FUNC;
28  
29 + #define F_FUNC(f) (f.func)
30 + #define F_FUNC2(f) (f.func_after)
31 + #define F_ARGS(f) (f.argptr)
32   #define  QUADTREE               int
33  
34   #define  EMPTY          (-1)
# Line 64 | Line 72
72   #define QT_SET_NTH_ELEM(s,n)   ((s)[(n)])  
73  
74   #define QT_CLEAR_SET(s)        ((s)[0] = 0)
75 < #define QT_SET_NEXT_ELEM(p)    (*(p)++)
75 > #define QT_SET_NEXT_ELEM(p)    (*(++p))
76   #define QT_SET_PTR(s)          (&((s)[1]))
77  
78  
# Line 72 | Line 80
80   #define MAXCSET          2*QT_MAXSET
81   #define QT_MAXCSET       MAXCSET
82   #ifndef QT_SET_THRESHOLD
83 < #define QT_SET_THRESHOLD 30  
83 > #define QT_SET_THRESHOLD 32  
84   #endif
85  
86   #ifndef QT_MAX_LEVELS
87 < #define QT_MAX_LEVELS     12
87 > #define QT_MAX_LEVELS     10
88   #endif
89  
90 < #define QT_FILL_THRESHOLD 3
90 > #define QT_FILL_THRESHOLD 2
91   #define QT_EXPAND   8
92   #define QT_COMPRESS 16
93   #define QT_DONE 32
# Line 93 | Line 101
101   #define QT_FLAG_SET_MODIFIED(f)   ((f) |= QT_MODIFIED)
102  
103   #define qtSubdivide(qt) (qt = qtAlloc(),QT_CLEAR_CHILDREN(qt))
104 < #define qtSubdivide_tri(v0,v1,v2,a,b,c) (EDGE_MIDPOINT_VEC3(a,v0,v1), \
105 <                                         EDGE_MIDPOINT_VEC3(b,v1,v2), \
106 <                                         EDGE_MIDPOINT_VEC3(c,v2,v0))
104 > #define qtSubdivide_tri(v0,v1,v2,a,b,c) (EDGE_MIDPOINT(a,v1,v2), \
105 >                                         EDGE_MIDPOINT(b,v2,v0), \
106 >                                         EDGE_MIDPOINT(c,v0,v1))
107  
108   extern QUADTREE  qtnewleaf(), qtaddelem(), qtdelelem();
109  
# Line 110 | Line 118 | extern OBJECT  *qtqueryset();
118   #else
119   #define qtqueryset(qt)  (qtsettab[QT_SET_INDEX(qt)])
120   #endif
121 <
121 > #if 0
122 > #define qtremovelast(qt) ((*(qtqueryset(qt)))--)
123 > #endif
124   #define qtinset(qt,id)  inset(qtqueryset(qt),id)
125   #define qtgetset(os,qt) setcopy(os,qtqueryset(qt))
126  
127 +
128 + #define SIDES_GTR(b0,b1,b2,s0,s1,s2,a,b,c) \
129 +    (s0 = ((b0[0] > a?4:0) | (b1[0] > a?2:0) | (b2[0] > a?1:0)), \
130 +     s1 = ((b0[1] > b?4:0) | (b1[1] > b?2:0) | (b2[1] > b?1:0)), \
131 +     s2 = ((b0[2] > c?4:0) | (b1[2] > c?2:0) | (b2[2] > c?1:0)))
132 +
133 + #define SIDES_LESS(b0,b1,b2,s0,s1,s2,a,b,c) \
134 +    (s0 = ((b0[0] < a?4:0) | (b1[0] < a?2:0) | (b2[0] < a?1:0)), \
135 +     s1 = ((b0[1] < b?4:0) | (b1[1] < b?2:0) | (b2[1] < b?1:0)), \
136 +     s2 = ((b0[2] < c?4:0) | (b1[2] < c?2:0) | (b2[2] < c?1:0)))
137 +
138   /*
139   QUADTREE qtRoot_point_locate(qt,q0,q1,q2,peq,pt,r0,r1,r2)
140     QUADTREE qt;
# Line 133 | Line 154 | extern QUADTREE qtRoot_remove_tri();
154   extern QUADTREE qtAdd_tri();
155   extern QUADTREE qtRoot_visit_tri_edges();
156   extern QUADTREE qtRoot_trace_ray();
157 +
158 +
159 +
160 +
161 +
162 +

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines