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.4 by gwlarson, Tue Oct 6 18:16:54 1998 UTC vs.
Revision 3.7 by gwlarson, Tue Jan 5 16:52:38 1999 UTC

# Line 10 | Line 10
10   #define _SM_H_
11  
12   #include "rhd_sample.h"
13 + #define NEWSETS
14  
15  
16   #ifndef TRUE
# Line 17 | Line 18
18   #define FALSE 0
19   #endif
20  
20 – #define S_REPLACE_EPS 0.06
21 – #define S_REPLACE_SCALE 10.0
21  
22 + #define ON_V 1
23 + #define ON_P 2
24 + #define ON_E 3
25 + #define IN_T 4
26 +
27 + #define S_REPLACE_EPS 0.04      /* if (distance on sphere between sample
28 +                                     and a base point) < S_REPLACE_EPS,
29 +                                     replace base:
30 +                                     */
31 + #define S_REPLACE_SCALE (5.*5.)   /* if (distance to new point squared) is
32 +                                     > (triangle edge length squared*
33 +                                     S_REPLACE_SCALE):for all edges/triangle
34 +                                     vertices: new point is puncture
35 +                                     point: dont add
36 +                                   */
37 + #define S_REPLACE_TRI 2e-8              /* .052 radians to the sixth power */
38 +
39   #define SQRT3_2 0.8660254
40  
41   #define SM_DEFAULT 0
42 < #define SM_EXTRA_POINTS 8
42 > #define SM_EXTRA_POINTS 162
43 > #define SM_BASE_TRIS 320
44   #define SM_EXTRA_VERTS  SM_EXTRA_POINTS
45  
46 < #define SM_INC_PERCENT 0.60
46 > #define SM_INC_PERCENT 0.60            /* If number of new triangles added
47 >                                          since last full redraw is >
48 >                                          (SM_INC_PERCENT * total triangles)
49 >                                          do full redraw instead of incremental
50 >                                          */
51 >
52   #define SM_VIEW_FRAC   0.1
53  
54  
# Line 64 | Line 86 | typedef struct _TRI {
86   #define T_WHICH_V(t,i)     \
87           (T_NTH_V(t,0)==(i)?0:T_NTH_V(t,1)==(i)?1:T_NTH_V(t,2)==(i)?2:-1)
88   #define T_NEXT_FREE(t) ((t)->nbrs[0])
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
# Line 76 | Line 99 | typedef struct _SM {
99      int num_tri;          /* Current number of triangles */
100      int sample_tris;      /* Current number of non-base triangles*/
101      int free_tris;        /* pointer to free_list */
102 +    int available_tris;   /* pointer to available_list */
103      int max_verts;        /* Maximum number of vertices in the mesh */
104      TRI *tris;            /* Pointer to list of triangle structs */
105      VERT *verts;          /* List of vertices */
# Line 95 | Line 119 | typedef struct _SM {
119   #define SM_NUM_TRI(m)                 ((m)->num_tri)
120   #define SM_SAMPLE_TRIS(m)                 ((m)->sample_tris)
121   #define SM_FREE_TRIS(m)               ((m)->free_tris)
122 + #define SM_AVAILABLE_TRIS(m)          ((m)->available_tris)
123   #define SM_MAX_VERTS(m)               ((m)->max_verts)
124   #define SM_TRIS(m)                    ((m)->tris)
125   #define SM_VERTS(m)                   ((m)->verts)
# Line 120 | Line 145 | typedef struct _SM {
145  
146   #define SM_NTH_TRI(m,n)               (&(SM_TRIS(m)[(n)]))
147   #define SM_NTH_VERT(m,n)              (SM_VERTS(m)[(n)])
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 142 | 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 208 | 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  
# Line 217 | Line 253 | extern VIEW Current_View;
253   extern int Pick_tri,Picking,Pick_samp;
254   extern FVECT Pick_point[500],Pick_origin,Pick_dir;
255   extern FVECT Pick_v0[500],Pick_v1[500],Pick_v2[500];
256 + extern int Pick_q[500];
257   extern FVECT P0,P1,P2;
258   extern int Pick_cnt;
259   extern FVECT FrustumNear[4],FrustumFar[4];
# Line 266 | Line 303 | extern FVECT FrustumNear[4],FrustumFar[4];
303   * been output since the last call to smClean().  (The last view drawn will
304   * be vp==&odev.v each time.)
305   */
269 –
306   #endif
307  
308  

Diff Legend

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