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

Comparing ray/src/hd/sm.h (file contents):
Revision 3.6 by gwlarson, Mon Dec 28 18:07:34 1998 UTC vs.
Revision 3.7 by gwlarson, Tue Jan 5 16:52:38 1999 UTC

# Line 148 | Line 148 | typedef struct _SM {
148  
149   #define SM_T_ID_VALID(s,t_id) T_IS_VALID(SM_NTH_TRI(s,t_id))
150  
151 +
152   #define SM_MAX_SAMP(m)                S_MAX_SAMP(SM_SAMP(m))
153   #define SM_MAX_POINTS(m)              S_MAX_POINTS(SM_SAMP(m))
154   #define SM_SAMP_BASE(m)               S_BASE(SM_SAMP(m))
155   #define SM_NTH_WV(m,i)                S_NTH_W_PT(SM_SAMP(m),i)
156   #define SM_NTH_W_DIR(m,i)             S_NTH_W_DIR(SM_SAMP(m),i)
157 < #define SM_DIR_ID(m,i)                (SM_NTH_W_DIR(m,i)==-1)
157 > #define SM_DIR_ID(m,i)            (!SM_BASE_ID(m,i) && SM_NTH_W_DIR(m,i)==-1)
158   #define SM_NTH_RGB(m,i)               S_NTH_RGB(SM_SAMP(m),i)
159   #define SM_RGB(m)                    S_RGB(SM_SAMP(m))
160 + #define SM_WP(m)                    S_W_PT(SM_SAMP(m))
161   #define SM_BRT(m)                     S_BRT(SM_SAMP(m))
162   #define SM_NTH_BRT(m,i)               S_NTH_BRT(SM_SAMP(m),i)
163   #define SM_CHR(m)                     S_CHR(SM_SAMP(m))
# Line 169 | Line 171 | typedef struct _SM {
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))
# Line 235 | Line 241 | typedef struct _ADD_ARGS {
241  
242   extern SM *smMesh;
243   extern int smNew_tri_cnt;
244 + extern int smNew_tri_size;
245 + extern T_DEPTH *smNew_tris;
246 +
247   extern double smDist_sum;
248  
249  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines