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

Comparing ray/src/hd/sm.h (file contents):
Revision 3.7 by gwlarson, Tue Jan 5 16:52:38 1999 UTC vs.
Revision 3.8 by gwlarson, Sun Jan 10 10:27:47 1999 UTC

# Line 89 | Line 89 | typedef struct _TRI {
89   #define T_NEXT_AVAILABLE(t) ((t)->nbrs[0])
90   #define T_VALID_FLAG(t) ((t)->nbrs[1])
91   #define T_IS_VALID(t)  (T_VALID_FLAG(t)!=-1)
92 < #define T_FLAGS 3
92 > #define T_FLAGS 4
93  
94   typedef struct _SM {
95      FVECT view_center;    /* Canonical view center defining unit sphere */
# Line 111 | Line 111 | typedef struct _SM {
111   #define T_ACTIVE_FLAG   0
112   #define T_NEW_FLAG      1
113   #define T_BASE_FLAG     2
114 + #define T_BG_FLAG       3
115  
116   #define SM_VIEW_CENTER(m)             ((m)->view_center)
117   #define SM_SAMP(m)                    ((m)->samples)
# Line 134 | Line 135 | typedef struct _SM {
135   #define SM_IS_NTH_T_ACTIVE(sm,n)     SM_IS_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
136   #define SM_IS_NTH_T_BASE(sm,n)       SM_IS_NTH_T_FLAG(sm,n,T_BASE_FLAG)
137   #define SM_IS_NTH_T_NEW(sm,n)        SM_IS_NTH_T_FLAG(sm,n,T_NEW_FLAG)
138 + #define SM_IS_NTH_T_BG(sm,n)        SM_IS_NTH_T_FLAG(sm,n,T_BG_FLAG)
139  
140   #define SM_SET_NTH_T_ACTIVE(sm,n)    SM_SET_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
141   #define SM_SET_NTH_T_BASE(sm,n)      SM_SET_NTH_T_FLAG(sm,n,T_BASE_FLAG)
142   #define SM_SET_NTH_T_NEW(sm,n)       SM_SET_NTH_T_FLAG(sm,n,T_NEW_FLAG)
143 + #define SM_SET_NTH_T_BG(sm,n)        SM_SET_NTH_T_FLAG(sm,n,T_BG_FLAG)
144  
145   #define SM_CLR_NTH_T_ACTIVE(sm,n)   SM_CLR_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
146   #define SM_CLR_NTH_T_BASE(sm,n)     SM_CLR_NTH_T_FLAG(sm,n,T_BASE_FLAG)
147   #define SM_CLR_NTH_T_NEW(sm,n)      SM_CLR_NTH_T_FLAG(sm,n,T_NEW_FLAG)
148 + #define SM_CLR_NTH_T_BG(sm,n)       SM_CLR_NTH_T_FLAG(sm,n,T_BG_FLAG)
149  
150   #define SM_NTH_TRI(m,n)               (&(SM_TRIS(m)[(n)]))
151   #define SM_NTH_VERT(m,n)              (SM_VERTS(m)[(n)])
# Line 167 | Line 171 | typedef struct _SM {
171  
172   #define SM_ALLOWED_VIEW_CHANGE(m) (SM_NUM_SAMP(m)/smDist_sum*SM_VIEW_FRAC)
173  
170 – #define SM_FOR_ALL_FLAGGED_TRIS(m,i,w,b) for(i=smNext_tri_flag_set(m,0,w,b); \
171 – i < SM_NUM_TRI(m); i=smNext_tri_flag_set(m,i+1,w,b))
172 –
173 – #define SM_FOR_ALL_ACTIVE_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_ACTIVE_FLAG,0)
174 – #if 0
175 – #define SM_FOR_ALL_NEW_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_NEW_FLAG,0)
176 – #else
177 – #define SM_FOR_ALL_NEW_TRIS(m,i) for(i=0; i < smNew_tri_cnt; i++)
178 – #endif
179 – #define SM_FOR_ALL_BASE_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_BASE_FLAG,0)
180 – #define SM_FOR_ALL_VALID_TRIS(m,i) for(i=smNext_valid_tri(m,0); \
181 – i < SM_NUM_TRI(m); i=smNext_valid_tri(m,i+1))
182 –
183 – #define SM_FOR_ALL_ACTIVE_FG_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_ACTIVE_FLAG,1)
184 –
185 – #define SM_FOR_ALL_ACTIVE_BG_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_ACTIVE_FLAG,2)
186 –
187 –
174   #define SM_FOR_ALL_ADJACENT_TRIS(sm,id,t) for(t=smTri_next_ccw_nbr(sm,t,id); \
175   t!=SM_NTH_TRI(sm,SM_NTH_VERT(sm,id)); t=smTri_next_ccw_nbr(sm,t,id))
176  
# Line 220 | Line 206 | t!=SM_NTH_TRI(sm,SM_NTH_VERT(sm,id)); t=smTri_next_ccw
206  
207   #define smClear_vert(sm,id)    (SM_NTH_VERT(sm,id) = INVALID)
208  
223 – #define SQRT3_INV 0.5773502692
224 –
225 – typedef struct _T_DEPTH {
226 –  int tri;
227 –  double depth;
228 – }T_DEPTH;
229 –
209   typedef struct _RT_ARGS_{
210    FVECT orig,dir;
211    int t_id;
# Line 241 | Line 220 | typedef struct _ADD_ARGS {
220  
221   extern SM *smMesh;
222   extern int smNew_tri_cnt;
244 – extern int smNew_tri_size;
245 – extern T_DEPTH *smNew_tris;
246 –
223   extern double smDist_sum;
224  
225  

Diff Legend

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