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.2 by gwlarson, Fri Sep 11 11:52:25 1998 UTC vs.
Revision 3.4 by gwlarson, Tue Oct 6 18:16:54 1998 UTC

# Line 10 | Line 10
10   #define _SM_H_
11  
12   #include "rhd_sample.h"
13 – #include "sm_stree.h"
13  
14  
15   #ifndef TRUE
# Line 18 | Line 17
17   #define FALSE 0
18   #endif
19  
20 < #define P_REPLACE_EPS 0.5
20 > #define S_REPLACE_EPS 0.06
21 > #define S_REPLACE_SCALE 10.0
22 >
23   #define SQRT3_2 0.8660254
24  
25 < #define MAX_EDGES 200
26 <
26 < #define SM_INVALID  -1
27 < #define SM_DEFAULT   0
28 < #define SM_EXTRA_POINTS 5
25 > #define SM_DEFAULT 0
26 > #define SM_EXTRA_POINTS 8
27   #define SM_EXTRA_VERTS  SM_EXTRA_POINTS
30 – #define SM_POINTSIZ     (3*sizeof(float)+ sizeof(int4))
31 – #define SM_POINT_SPACE SM_EXTRA_POINTS * SM_POINTSIZ
28  
29   #define SM_INC_PERCENT 0.60
30   #define SM_VIEW_FRAC   0.1
# Line 41 | Line 37 | typedef struct _EDGE {
37      int verts[2];
38      int tris[2];
39   } EDGE;
40 +
41   #define E_NTH_VERT(e,i)  ((e>0)?Edges[(e)].verts[(i)]:Edges[-(e)].verts[(1-i)])
42   #define SET_E_NTH_VERT(e,i,v) if(e>0) Edges[(e)].verts[(i)]=(v); \
43                                 else Edges[-(e)].verts[(1-i)]=(v)
44   #define E_NTH_TRI(e,i)  ((e>0)?Edges[(e)].tris[(i)]:Edges[-(e)].tris[(1-i)])
45   #define SET_E_NTH_TRI(e,i,v) if(e>0) Edges[(e)].tris[(i)]=(v); \
46                                else Edges[-(e)].tris[(1-i)]=(v)
50 – #define eNew_edge() (((Ecnt) < MAX_EDGES)?(++Ecnt):SM_INVALID)
47   #define eClear_edges() (Ecnt = 0)
48  
49   #define FOR_ALL_EDGES(i) for((i)=1; (i) <= Ecnt; i++)
# Line 67 | Line 63 | typedef struct _TRI {
63   #define T_NTH_V(t,i)  ((t)->verts[(i)])
64   #define T_WHICH_V(t,i)     \
65           (T_NTH_V(t,0)==(i)?0:T_NTH_V(t,1)==(i)?1:T_NTH_V(t,2)==(i)?2:-1)
66 < #define T_NEXT_FREE(t) ((t)->verts[0])
67 < #define T_VALID_FLAG(t) ((t)->verts[1])
66 > #define T_NEXT_FREE(t) ((t)->nbrs[0])
67 > #define T_VALID_FLAG(t) ((t)->nbrs[1])
68   #define T_IS_VALID(t)  (T_VALID_FLAG(t)!=-1)
69 < #define T_FLAGS 4
74 < #define T_FLAG_BYTES T_FLAGS/8.0
75 < #define T_TOTAL_FLAG_BYTES(c)  ((((c)+31)>>5)*sizeof(int4))
69 > #define T_FLAGS 3
70  
71   typedef struct _SM {
72      FVECT view_center;    /* Canonical view center defining unit sphere */
73 <    RSAMP *samples;       /* Sample point information */
74 <    STREE locator;      /* spherical quadtree for point/triangle location */
73 >    SAMP *samples;        /* Sample point information */
74 >    STREE locator;        /* spherical quadtree for point/triangle location */
75      int max_tris;         /* Maximum number of triangles */
76 <    int tri_cnt;          /* Total number of tris ever alloc at one time*/
77 <    int num_tris;         /* Current number of sample (nonbase)triangles */
76 >    int num_tri;          /* Current number of triangles */
77 >    int sample_tris;      /* Current number of non-base triangles*/
78      int free_tris;        /* pointer to free_list */
79      int max_verts;        /* Maximum number of vertices in the mesh */
80      TRI *tris;            /* Pointer to list of triangle structs */
81      VERT *verts;          /* List of vertices */
82      int4 *flags[T_FLAGS]; /* Bit 0 set if active(in current frustum) */
83 <                             /* Bit 1 set if not rendered since created */
84 <                             /* Bit 2 set if base triangle */
91 <                             /* Bit 3 set used for LRU replacement */
92 <    char *base;           /* Allocated space */
83 >                          /* Bit 1 set if not rendered since created */
84 >                          /* Bit 2 set if base triangle */
85   }SM;
86  
87   #define T_ACTIVE_FLAG   0
88   #define T_NEW_FLAG      1
89   #define T_BASE_FLAG     2
98 – #define T_LRU_FLAG      3
90  
91   #define SM_VIEW_CENTER(m)             ((m)->view_center)
92   #define SM_SAMP(m)                    ((m)->samples)
93   #define SM_LOCATOR(m)                 (&((m)->locator))
94   #define SM_MAX_TRIS(m)                ((m)->max_tris)
95 < #define SM_TRI_CNT(m)                 ((m)->tri_cnt)
96 < #define SM_NUM_TRIS(m)                 ((m)->num_tris)
95 > #define SM_NUM_TRI(m)                 ((m)->num_tri)
96 > #define SM_SAMPLE_TRIS(m)                 ((m)->sample_tris)
97   #define SM_FREE_TRIS(m)               ((m)->free_tris)
98   #define SM_MAX_VERTS(m)               ((m)->max_verts)
99   #define SM_TRIS(m)                    ((m)->tris)
100   #define SM_VERTS(m)                   ((m)->verts)
101   #define SM_NTH_FLAGS(m,n)             ((m)->flags[(n)])
102 < #define SM_BASE(m)                    ((m)->base)
102 > #define SM_FLAGS(m)                   ((m)->flags)
103  
113 – #define TF_OFFSET(n)  ((n) >> 5)
114 – #define TF_BIT(n)     ((n) & 0x1f)
115 – #define SM_IS_NTH_T_FLAG(sm,n,f)  (SM_NTH_FLAGS(sm,f)[TF_OFFSET(n)] & (0x1 <<TF_BIT(n)))
116 – #define SM_SET_NTH_T_FLAG(sm,n,f) (SM_NTH_FLAGS(sm,f)[TF_OFFSET(n)] |= (0x1<<TF_BIT(n)))
117 – #define SM_CLEAR_NTH_T_FLAG(sm,n,f) (SM_NTH_FLAGS(sm,f)[TF_OFFSET(n)] &= ~(0x1<<TF_BIT(n)))
104  
105 + #define SM_IS_NTH_T_FLAG(sm,n,f)  IS_FLAG(SM_NTH_FLAGS(sm,f),n)
106 + #define SM_SET_NTH_T_FLAG(sm,n,f) SET_FLAG(SM_NTH_FLAGS(sm,f),n)
107 + #define SM_CLR_NTH_T_FLAG(sm,n,f) CLR_FLAG(SM_NTH_FLAGS(sm,f),n)
108 +
109   #define SM_IS_NTH_T_ACTIVE(sm,n)     SM_IS_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
110   #define SM_IS_NTH_T_BASE(sm,n)       SM_IS_NTH_T_FLAG(sm,n,T_BASE_FLAG)
111   #define SM_IS_NTH_T_NEW(sm,n)        SM_IS_NTH_T_FLAG(sm,n,T_NEW_FLAG)
122 – #define SM_IS_NTH_T_LRU(sm,n)        SM_IS_NTH_T_FLAG(sm,n,T_LRU_FLAG)
112  
113   #define SM_SET_NTH_T_ACTIVE(sm,n)    SM_SET_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
114   #define SM_SET_NTH_T_BASE(sm,n)      SM_SET_NTH_T_FLAG(sm,n,T_BASE_FLAG)
115 < #define SM_SET_NTH_T_NEW(sm,n)    SM_SET_NTH_T_FLAG(sm,n,T_NEW_FLAG)
127 < #define SM_SET_NTH_T_LRU(sm,n)       SM_SET_NTH_T_FLAG(sm,n,T_LRU_FLAG)
115 > #define SM_SET_NTH_T_NEW(sm,n)       SM_SET_NTH_T_FLAG(sm,n,T_NEW_FLAG)
116  
117 < #define SM_CLEAR_NTH_T_ACTIVE(sm,n)  SM_CLEAR_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
118 < #define SM_CLEAR_NTH_T_BASE(sm,n)    SM_CLEAR_NTH_T_FLAG(sm,n,T_BASE_FLAG)
119 < #define SM_CLEAR_NTH_T_NEW(sm,n)  SM_CLEAR_NTH_T_FLAG(sm,n,T_NEW_FLAG)
132 < #define SM_CLEAR_NTH_T_LRU(sm,n)     SM_CLEAR_NTH_T_FLAG(sm,n,T_LRU_FLAG)
117 > #define SM_CLR_NTH_T_ACTIVE(sm,n)   SM_CLR_NTH_T_FLAG(sm,n,T_ACTIVE_FLAG)
118 > #define SM_CLR_NTH_T_BASE(sm,n)     SM_CLR_NTH_T_FLAG(sm,n,T_BASE_FLAG)
119 > #define SM_CLR_NTH_T_NEW(sm,n)      SM_CLR_NTH_T_FLAG(sm,n,T_NEW_FLAG)
120  
121   #define SM_NTH_TRI(m,n)               (&(SM_TRIS(m)[(n)]))
122   #define SM_NTH_VERT(m,n)              (SM_VERTS(m)[(n)])
136 – #define SM_FREE_TRI_ID(m,n) (n = SM_FREE_TRIS(m)==-1? \
137 –    (SM_TRI_CNT(m)<SM_MAX_TRIS(m)?SM_TRI_CNT(m)++:-1):(n=SM_FREE_TRIS(m), \
138 –     SM_FREE_TRIS(m)=T_NEXT_FREE(SM_NTH_TRI(m,SM_FREE_TRIS(m))),n))
123  
124 < #define SM_SAMP_BASE(m)               RS_BASE(SM_SAMP(m))
125 < #define SM_SAMP_FREE(m)               RS_FREE(SM_SAMP(m))
126 < #define SM_SAMP_EOL(m)                RS_EOL(SM_SAMP(m))
127 < #define SM_MAX_SAMP(m)                RS_MAX_SAMP(SM_SAMP(m))
128 < #define SM_MAX_AUX_PT(m)              RS_MAX_AUX_PT(SM_SAMP(m))
129 < #define SM_NTH_WV(m,i)                RS_NTH_W_PT(SM_SAMP(m),i)
130 < #define SM_NTH_W_DIR(m,i)             RS_NTH_W_DIR(SM_SAMP(m),i)
131 < #define SM_NTH_RGB(m,i)               RS_NTH_RGB(SM_SAMP(m),i)
132 < #define SM_RGB(m)                    RS_RGB(SM_SAMP(m))
133 < #define SM_BRT(m)                     RS_BRT(SM_SAMP(m))
134 < #define SM_NTH_BRT(m,i)               RS_NTH_BRT(SM_SAMP(m),i)
135 < #define SM_CHR(m)                     RS_CHR(SM_SAMP(m))
136 < #define SM_NTH_CHR(m,i)               RS_NTH_CHR(SM_SAMP(m),i)
137 < #define SM_NUM_SAMP(m)               RS_NUM_SAMP(SM_SAMP(m))
154 < #define SM_TONE_MAP(m)               RS_TONE_MAP(SM_SAMP(m))
124 > #define SM_MAX_SAMP(m)                S_MAX_SAMP(SM_SAMP(m))
125 > #define SM_MAX_POINTS(m)              S_MAX_POINTS(SM_SAMP(m))
126 > #define SM_SAMP_BASE(m)               S_BASE(SM_SAMP(m))
127 > #define SM_NTH_WV(m,i)                S_NTH_W_PT(SM_SAMP(m),i)
128 > #define SM_NTH_W_DIR(m,i)             S_NTH_W_DIR(SM_SAMP(m),i)
129 > #define SM_DIR_ID(m,i)                (SM_NTH_W_DIR(m,i)==-1)
130 > #define SM_NTH_RGB(m,i)               S_NTH_RGB(SM_SAMP(m),i)
131 > #define SM_RGB(m)                    S_RGB(SM_SAMP(m))
132 > #define SM_BRT(m)                     S_BRT(SM_SAMP(m))
133 > #define SM_NTH_BRT(m,i)               S_NTH_BRT(SM_SAMP(m),i)
134 > #define SM_CHR(m)                     S_CHR(SM_SAMP(m))
135 > #define SM_NTH_CHR(m,i)               S_NTH_CHR(SM_SAMP(m),i)
136 > #define SM_NUM_SAMP(m)               S_NUM_SAMP(SM_SAMP(m))
137 > #define SM_TONE_MAP(m)               S_TONE_MAP(SM_SAMP(m))
138  
139   #define SM_ALLOWED_VIEW_CHANGE(m) (SM_NUM_SAMP(m)/smDist_sum*SM_VIEW_FRAC)
140  
141   #define SM_FOR_ALL_FLAGGED_TRIS(m,i,w,b) for(i=smNext_tri_flag_set(m,0,w,b); \
142 < i < SM_TRI_CNT(m); i=smNext_tri_flag_set(m,i+1,w,b))
142 > i < SM_NUM_TRI(m); i=smNext_tri_flag_set(m,i+1,w,b))
143  
144   #define SM_FOR_ALL_ACTIVE_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_ACTIVE_FLAG,0)
145   #define SM_FOR_ALL_NEW_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_NEW_FLAG,0)
146   #define SM_FOR_ALL_BASE_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_BASE_FLAG,0)
147   #define SM_FOR_ALL_VALID_TRIS(m,i) for(i=smNext_valid_tri(m,0); \
148 < i < SM_TRI_CNT(m); i=smNext_valid_tri(m,i+1))
148 > i < SM_NUM_TRI(m); i=smNext_valid_tri(m,i+1))
149  
150   #define SM_FOR_ALL_ACTIVE_FG_TRIS(m,i) SM_FOR_ALL_FLAGGED_TRIS(m,i,T_ACTIVE_FLAG,1)
151  
# Line 173 | Line 156 | i < SM_TRI_CNT(m); i=smNext_valid_tri(m,i+1))
156   t!=SM_NTH_TRI(sm,SM_NTH_VERT(sm,id)); t=smTri_next_ccw_nbr(sm,t,id))
157  
158   #define SM_INVALID_SAMP_ID(sm,id)  (((id) < 0) || ((id) >= SM_MAX_SAMP(sm)))
159 < #define SM_INVALID_POINT_ID(sm,id)  (((id) < 0) || ((id) >= SM_MAX_AUX_PT(sm)))
177 < #define SM_T_CENTROID(sm,t,c)  tri_centroid(SM_NTH_WV(sm,T_NTH_V(t,0)),SM_NTH_WV(sm,T_NTH_V(t,1)),SM_NTH_WV(sm,T_NTH_V(t,2)),c)
159 > #define SM_INVALID_POINT_ID(sm,id)  (((id) < 0) || ((id) >= SM_MAX_POINTS(sm)))
160   #define SM_T_NTH_WV(sm,t,i)  (SM_NTH_WV(sm,T_NTH_V(t,i)))
161  
162   #define SM_BASE_ID(s,i)  \
163 < ((i) >= RS_MAX_SAMP(SM_SAMP(s)) && (i) < RS_MAX_AUX_PT(SM_SAMP(s)))
163 > ((i) >= S_MAX_SAMP(SM_SAMP(s)) && (i) < S_MAX_BASE_PT(SM_SAMP(s)))
164  
165   #define SM_BG_SAMPLE(sm,i)   (SM_NTH_W_DIR(sm,i)==-1)
166  
# Line 191 | Line 173 | t!=SM_NTH_TRI(sm,SM_NTH_VERT(sm,id)); t=smTri_next_ccw
173  
174   #define SM_FOR_ALL_SAMPLES(sm,i) for((i)=0;i < SM_NUM_SAMP(sm);(i)++)
175  
176 + #define smInit_locator(sm,c)    (stInit(SM_LOCATOR(sm)), \
177 +                                 ST_SET_CENTER(SM_LOCATOR(sm),c))
178 + #define smClear_locator(sm)    stClear(SM_LOCATOR(sm))
179 + #define smAlloc_locator(sm)   stAlloc(SM_LOCATOR(sm))
180 + #define smFree_locator(sm)   stClear(SM_LOCATOR(sm))
181 + #define smPointLocateCell(sm,pt)  stPoint_locate(SM_LOCATOR(sm),pt)
182 + #define smUnalloc_samp(sm,id)  sUnalloc_samp(SM_SAMP(sm),id)
183 + #define smFree_samples(sm)     sFree(SM_SAMP(sm))
184 + #define smClear_samples(sm)    sClear(SM_SAMP(sm))
185 + #define smInit_samples(sm)     sInit(SM_SAMP(sm))
186 +
187 +
188 + #define smClear_vert(sm,id)    (SM_NTH_VERT(sm,id) = INVALID)
189 +
190 + #define SQRT3_INV 0.5773502692
191 +
192   typedef struct _T_DEPTH {
193    int tri;
194    double depth;
195   }T_DEPTH;
196  
197 + typedef struct _RT_ARGS_{
198 +  FVECT orig,dir;
199 +  int t_id;
200 +  OBJECT *os;
201 + }RT_ARGS;
202  
203 +
204 + typedef struct _ADD_ARGS {
205 +  int t_id;
206 +  OBJECT *del_set;
207 + }ADD_ARGS;
208 +
209   extern SM *smMesh;
210   extern int smNew_tri_cnt;
211   extern double smDist_sum;
212  
213 +
214   #ifdef TEST_DRIVER
215   extern VIEW View;
216   extern VIEW Current_View;
# Line 212 | Line 222 | extern int Pick_cnt;
222   extern FVECT FrustumNear[4],FrustumFar[4];
223   #endif
224  
225 < #ifdef DEBUG
226 < extern int Malloc_cnt;
227 < #endif
225 >
226 > /*
227 > * int
228 > * smInit(n)            : Initialize/clear data structures for n entries
229 > * int  n;
230 > *
231 > * Initialize sampL and other data structures for at least n samples.
232 > * If n is 0, then free data structures.  Return number actually allocated.
233 > *
234 > *
235 > * int
236 > * smNewSamp(c, p, v)   : register new sample point and return index
237 > * COLR c;              : pixel color (RGBE)
238 > * FVECT        p;      : world intersection point
239 > * FVECT        v;      : ray direction vector
240 > *
241 > * Add new sample point to data structures, removing old values as necessary.
242 > * New sample representation will be output in next call to smUpdate().
243 > *
244 > *
245 > * int
246 > * smFindSamp(orig, dir): intersect ray with 3D rep. and find closest sample
247 > * FVECT        orig, dir;
248 > *
249 > * Find the closest sample to the given ray.  Return -1 on failure.
250 > *
251 > *
252 > * smClean()            : display has been wiped clean
253 > *
254 > * Called after display has been effectively cleared, meaning that all
255 > * geometry must be resent down the pipeline in the next call to smUpdate().
256 > *
257 > *
258 > * smUpdate(vp, qua)    : update OpenGL output geometry for view vp
259 > * VIEW *vp;            : desired view
260 > * int  qua;            : quality level (percentage on linear time scale)
261 > *
262 > * Draw new geometric representation using OpenGL calls.  Assume that the
263 > * view has already been set up and the correct frame buffer has been
264 > * selected for drawing.  The quality level is on a linear scale, where 100%
265 > * is full (final) quality.  It is not necessary to redraw geometry that has
266 > * been output since the last call to smClean().  (The last view drawn will
267 > * be vp==&odev.v each time.)
268 > */
269 >
270   #endif
271  
272  

Diff Legend

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