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

Comparing ray/src/hd/sm_del.c (file contents):
Revision 3.3 by gwlarson, Fri Sep 11 11:52:25 1998 UTC vs.
Revision 3.7 by gwlarson, Wed Nov 11 12:05:38 1998 UTC

# Line 8 | Line 8 | static char SCCSid[] = "$SunId$ SGI";
8   *  sm_del.c
9   */
10   #include "standard.h"
11 <
11 > #include "sm_flag.h"
12   #include "sm_list.h"
13   #include "sm_geom.h"
14 + #include "sm_qtree.h"
15 + #include "sm_stree.h"
16   #include "sm.h"
17  
18 < static EDGE Edges[MAX_EDGES];
18 > static int Max_edges=200;
19 > static EDGE *Edges=NULL;
20   static int Ecnt=0;
21  
22 < int
23 < remove_tri(qtptr,fptr,t_id)
22 > #define remove_tri_compress remove_tri
23 > remove_tri(qtptr,fptr,tptr)
24     QUADTREE *qtptr;
25     int *fptr;
26 <   int t_id;
26 >   int *tptr;
27   {
25 –    OBJECT tset[QT_MAXSET+1];  
28      int n;
29  
30 <   if(QT_IS_EMPTY(*qtptr))
31 <     return(FALSE);
32 <   /* remove id from set */
33 <      else
32 <      {
33 <         if(!qtinset(*qtptr,t_id))
34 <           return(FALSE);
35 <         n = QT_SET_CNT(qtqueryset(*qtptr))-1;
36 <         *qtptr = qtdelelem(*qtptr,t_id);
37 <          if(n  == 0)
38 <             (*fptr) |= QT_COMPRESS;
39 <        if(!QT_FLAG_FILL_TRI(*fptr))
40 <          (*fptr)++;
41 <      }
42 <    return(TRUE);
43 < }
30 >    if(QT_IS_EMPTY(*qtptr))
31 >      return;
32 >    if(QT_LEAF_IS_FLAG(*qtptr))
33 >      return;
34  
35 < int
36 < remove_tri_compress(qtptr,q0,q1,q2,t0,t1,t2,n,arg,t_id)
37 < QUADTREE *qtptr;
38 < FVECT q0,q1,q2;
39 < FVECT t0,t1,t2;
40 < int n;
51 < int *arg;
52 < int t_id;
53 < {
54 <    int f = 0;
55 <    /* NOTE compress */
56 <    return(remove_tri(qtptr,&f,t_id));
35 >    n = QT_SET_CNT(qtqueryset(*qtptr))-1;
36 >    *qtptr = qtdelelem(*qtptr,*tptr);
37 >    if(n  == 0)
38 >      (*fptr) |= QT_COMPRESS;
39 >    if(!QT_FLAG_FILL_TRI(*fptr))
40 >      (*fptr)++;
41   }
42  
43  
44 <
61 < int
62 < stDelete_tri(st,t_id,t0,t1,t2)
63 <   STREE *st;
64 <   int t_id;
65 <   FVECT t0,t1,t2;
66 < {
67 <    int f;
68 <    FVECT dir;
69 <    
70 <  /* First add all of the leaf cells lying on the triangle perimeter:
71 <     mark all cells seen on the way
72 <   */
73 <    ST_CLEAR_FLAGS(st);
74 <    f = 0;
75 <    VSUB(dir,t1,t0);
76 <    stTrace_edge(st,t0,dir,1.0,remove_tri,&f,t_id);
77 <    VSUB(dir,t2,t1);
78 <    stTrace_edge(st,t1,dir,1.0,remove_tri,&f,t_id);
79 <    VSUB(dir,t0,t2);
80 <    stTrace_edge(st,t2,dir,1.0,remove_tri,&f,t_id);
81 <    /* Now visit interior */
82 <    if(QT_FLAG_FILL_TRI(f) || QT_FLAG_UPDATE(f))
83 <       stVisit_tri_interior(st,t0,t1,t2,remove_tri_compress,&f,t_id);
84 < }
85 <
86 <
87 < smLocator_remove_tri(sm,t_id)
44 > smLocator_remove_tri(sm,t_id,v0_id,v1_id,v2_id)
45   SM *sm;
46   int t_id;
47 + int v0_id,v1_id,v2_id;
48   {
49    STREE *st;
92 –  char found;
93 –  TRI *t;
50    FVECT v0,v1,v2;
51 <
51 >  
52    st = SM_LOCATOR(sm);
53  
54 <  t = SM_NTH_TRI(sm,t_id);
54 >  VSUB(v0,SM_NTH_WV(sm,v0_id),SM_VIEW_CENTER(sm));
55 >  VSUB(v1,SM_NTH_WV(sm,v1_id),SM_VIEW_CENTER(sm));
56 >  VSUB(v2,SM_NTH_WV(sm,v2_id),SM_VIEW_CENTER(sm));
57  
58 <  VSUB(v0,SM_T_NTH_WV(sm,t,0),SM_VIEW_CENTER(sm));
59 <  VSUB(v1,SM_T_NTH_WV(sm,t,1),SM_VIEW_CENTER(sm));
60 <  VSUB(v2,SM_T_NTH_WV(sm,t,2),SM_VIEW_CENTER(sm));
61 <  found = stUpdate_tri(st,t_id,v0,v1,v2,remove_tri,remove_tri_compress);
104 <  return(found);
58 >  qtClearAllFlags();
59 >  
60 >  stApply_to_tri(st,v0,v1,v2,remove_tri,remove_tri_compress,&t_id);
61 >
62   }
63  
64   smFree_tri(sm,id)
# Line 125 | Line 82 | SM *sm;
82   int t_id;
83   {
84  
128 –
85    /* NOTE: Assumes that a new triangle adjacent to each vertex
86       has been added- before the deletion: replacing
87       the old tri- and therefore dont need to dereference any pointers
# Line 134 | Line 90 | int t_id;
90    */
91    if(!SM_IS_NTH_T_BASE(sm,t_id))
92    {
93 <    SM_NUM_TRIS(sm)--;
93 >    SM_SAMPLE_TRIS(sm)--;
94      if(SM_IS_NTH_T_NEW(sm,t_id))
95        smNew_tri_cnt--;
96    }
97    smClear_tri_flags(sm,t_id);
98  
99    smFree_tri(sm,t_id);
144 –
100   }
101  
102  
103 + int
104 + eNew_edge()
105 + {
106 +  if(!Edges)
107 +    if(!(Edges = (EDGE *)realloc(NULL,(Max_edges+1)*sizeof(EDGE))))
108 +      goto memerr;
109  
110 < LIST
111 < *smVertex_star_polygon(sm,id)
110 >  if(Ecnt >= Max_edges)
111 >    {
112 >      if(Max_edges > 10000)
113 >        error(CONSISTENCY,"Too many edges in vertex loop\n");
114 >      Max_edges += 100;
115 >      if(!(Edges = (EDGE *)realloc(Edges,(Max_edges+1)*sizeof(EDGE))))
116 >        goto memerr;
117 >    }
118 >  return(++Ecnt);
119 >
120 > memerr:
121 >  error(SYSTEM,"eNew_edge(): Unable to allocate memory");
122 > }
123 >
124 > /* Return list of edges defining polygon formed by boundary of triangles
125 > adjacent to id. Return set of triangles adjacent to id to delete in delptr
126 > */
127 > LIST
128 > *smVertexPolygon(sm,id,delptr)
129   SM *sm;
130   int id;
131 + QUADTREE *delptr;
132   {
133      TRI *tri,*t_next;
134 <    LIST *elist,*end,*tlist;
135 <    int t_id,v_next,t_next_id;
136 <    int e;
134 >    LIST *elist,*end;
135 >    int e,t_id,v_next,t_next_id,b_id,v_id;
136 >    OBJECT del_set[2];
137  
138 +    eClear_edges();
139      elist = end =  NULL;
140 +
141      /* Get the first triangle adjacent to vertex id */
142      t_id = SM_NTH_VERT(sm,id);
143      tri = SM_NTH_TRI(sm,t_id);
144  
145 <    
146 <    if((e = eNew_edge()) == SM_INVALID)
147 <    {
148 < #ifdef DEBUG
149 <        eputs("smVertex_star_polygon():Too many edges\n");
150 < #endif
151 <        return(NULL);
152 <    }
145 >    e = eNew_edge();
146 >    /* Get the  next vertex on the polygon boundary */
147 >    v_id = T_WHICH_V(tri,id);
148 >    b_id = (v_id + 1)%3;
149 >    /* Create an edge */
150 >    SET_E_NTH_VERT(e,0,T_NTH_V(tri,b_id));
151 >    SET_E_NTH_TRI(e,0,INVALID);
152 >    SET_E_NTH_TRI(e,1,T_NTH_NBR(tri,v_id));
153 >    v_next = T_NTH_V(tri,(b_id+1)%3);
154 >    SET_E_NTH_VERT(e,1,v_next);
155      elist = add_data_to_circular_list(elist,&end,e);
173 –    v_next = (T_WHICH_V(tri,id)+1)%3;
174 –    SET_E_NTH_VERT(e,0,T_NTH_V(tri,v_next));
175 –    SET_E_NTH_TRI(e,0,SM_INVALID);
176 –    SET_E_NTH_TRI(e,1,T_NTH_NBR(tri,v_next));
177 –    v_next = (T_WHICH_V(tri,id)+2)%3;
178 –    SET_E_NTH_VERT(e,1,T_NTH_V(tri,v_next));
179 –
180 –    
156      t_next_id = t_id;
157      t_next = tri;
158  
159 <    tlist = push_data(NULL,t_id);
159 >    /* Create a set to hold all of the triangles for deletion later */
160 >    del_set[0] = 1; del_set[1] = t_id;
161 >    *delptr = qtnewleaf(del_set);
162  
163 <    while((t_next_id = smTri_next_ccw_nbr(sm,t_next,id)) != t_id)
187 <    {  
188 <        if((e = eNew_edge()) == SM_INVALID)
189 <        {
190 < #ifdef DEBUG
191 <            eputs("smVertex_star_polygon():Too many edges\n");
192 < #endif
193 <            return(NULL);
194 <        }
195 <        elist = add_data_to_circular_list(elist,&end,e);
196 <        t_next = SM_NTH_TRI(sm,t_next_id);
197 <        v_next = (T_WHICH_V(t_next,id)+1)%3;
198 <        SET_E_NTH_VERT(e,0,T_NTH_V(t_next,v_next));
199 <        SET_E_NTH_TRI(e,0,SM_INVALID);
200 <        SET_E_NTH_TRI(e,1,T_NTH_NBR(t_next,v_next));
201 <        v_next = (T_WHICH_V(t_next,id)+2)%3;
202 <        SET_E_NTH_VERT(e,1,T_NTH_V(t_next,v_next));
203 <        tlist = push_data(tlist,t_next_id);
204 <    }
205 <    while(tlist)
163 >    while((t_next_id = T_NTH_NBR(t_next,b_id)) != t_id)
164      {
165 <        t_id = (int)pop_list(&tlist);
166 <        /* first remove from point location structure */
167 <        smLocator_remove_tri(sm,t_id);
168 <        smDelete_tri(sm,t_id);
165 >      e = eNew_edge();
166 >      t_next = SM_NTH_TRI(sm,t_next_id);
167 >      SET_E_NTH_VERT(e,0,v_next);
168 >      SET_E_NTH_TRI(e,0,INVALID);
169 >      v_id = T_WHICH_V(t_next,id);
170 >      b_id = (v_id + 1)%3;
171 >      SET_E_NTH_TRI(e,1,T_NTH_NBR(t_next,v_id));
172 >      v_next = T_NTH_V(t_next,(b_id+1)%3);
173 >      SET_E_NTH_VERT(e,1,v_next);
174 >      elist = add_data_to_circular_list(elist,&end,e);
175 >      qtaddelem(*delptr,t_next_id);
176      }
177      return(elist);
178   }
179  
180 +
181   int
182 < smEdge_intersect_polygon(sm,v0,v1,l)
182 > smTriangulate_add_tri(sm,id0,id1,id2,e0,e1,e2ptr)
183   SM *sm;
184 < FVECT v0,v1;
219 < LIST *l;
184 > int id0,id1,id2,e0,e1,*e2ptr;
185   {
186 <    FVECT e0,e1;
187 <    int e,id_e0,id_e1;
223 <    LIST *el,*eptr;
224 <    
225 <    /* Test the edges in l against v0v1 to see if v0v1 intersects
226 <       any other edges
227 <     */
228 <    
229 <    el = l;
186 >  int t_id;
187 >  int e2;
188  
189 <    while(el)
190 <    {
191 <      e = (int)LIST_DATA(el);
234 <      id_e0 = E_NTH_VERT(e,0);
235 <      id_e1 = E_NTH_VERT(e,1);
236 <      /* NOTE: DO these need to be normalized? Just subtract center? */
237 <      smDir(sm,e0,id_e0);
238 <      smDir(sm,e1,id_e1);
239 <      if(sedge_intersect(v0,v1,e0,e1))
240 <        return(TRUE);
241 <
242 <      el = LIST_NEXT(el);
243 <      if(el == l)
244 <        break;
245 <    }
246 <    return(FALSE);
247 < }
248 <
249 < int
250 < smFind_next_convex_vertex(sm,id0,id1,v0,v1,l)
251 <   SM *sm;
252 <   int id0,id1;
253 <   FVECT v0,v1;
254 <   LIST *l;
255 < {
256 <    int e,id;
257 <    LIST *el;
258 <    FVECT v;
259 <
260 <    /* starting with the end of edge at head of l, search sequentially for
261 <      vertex v such that v0v1v is a convex angle, and the edge v1v does
262 <      not intersect any other edges
263 <   */
264 <    id = SM_INVALID;
265 <    el = l;
266 <    while(id != id0)
267 <    {
268 <        e = (int)LIST_DATA(el);
269 <        id = E_NTH_VERT(e,1);
270 <
271 <        smDir(sm,v,id);
272 <
273 <        if(convex_angle(v0,v1,v) && !smEdge_intersect_polygon(sm,v1,v,l))
274 <           return(id);
275 <              
276 <        el = LIST_NEXT(el);
277 <        if(el == l)
278 <           break;
279 <    }
280 <    return(SM_INVALID);
281 < }
282 <
283 < int
284 < split_edge_list(id0,id_new,l,lnew)
285 < int id0,id_new;
286 < LIST **l,**lnew;
287 < {
288 <    LIST *list,*lptr,*end;
289 <    int e,e1,e2,new_e;
290 <
291 <    e2 = SM_INVALID;
292 <    list = lptr = *l;
293 <
294 <    if((new_e = eNew_edge())==SM_INVALID)
295 <     {
296 < #ifdef DEBUG
297 <            eputs("split_edge_list():Too many edges\n");
189 > #ifdef DEBUG
190 >  if(id0 == INVALID || id1==INVALID || id2==INVALID)
191 >    error(CONSISTENCY,"bad id- smTriangulate_add_tri()\n");
192   #endif
193 <         return(FALSE);
194 <     }
195 <    SET_E_NTH_VERT(new_e,0,id0);
196 <    SET_E_NTH_VERT(new_e,1,id_new);
197 <    SET_E_NTH_TRI(new_e,0,SM_INVALID);
198 <    SET_E_NTH_TRI(new_e,1,SM_INVALID);
199 <    
200 <    while(e2 != id_new)
201 <    {
202 <        lptr = LIST_NEXT(lptr);
203 <        e = (int)LIST_DATA(lptr);
204 <        e2 = E_NTH_VERT(e,1);
205 <        if(lptr == list)
312 <        {
313 < #ifdef DEBUG        
314 <          eputs("split_edge_list():cant find vertex\n");
315 < #endif
316 <          *lnew = NULL;
317 <          return(FALSE);
318 <        }
193 >  t_id = smAdd_tri(sm,id0,id1,id2);
194 >  if(*e2ptr == 0)
195 >  {
196 >    e2 = eNew_edge();
197 >    SET_E_NTH_VERT(e2,0,id2);
198 >    SET_E_NTH_VERT(e2,1,id0);
199 >  }
200 >  else
201 >    e2 = *e2ptr;
202 >  /* set appropriate tri for each edge*/
203 >  SET_E_NTH_TRI(e0,0,t_id);
204 >  SET_E_NTH_TRI(e1,0,t_id);
205 >  SET_E_NTH_TRI(e2,0,t_id);
206  
207 <    }
208 <    end = lptr;
322 <    lptr =  LIST_NEXT(lptr);
323 <    list = add_data_to_circular_list(list,&end,-new_e);
324 <    *lnew = list;
325 <
326 <    /* now follow other cycle */
327 <
328 <    list = lptr;
329 <    e2 = SM_INVALID;
330 <    while(e2 != id0)
331 <    {
332 <        lptr = LIST_NEXT(lptr);
333 <        e = (int)LIST_DATA(lptr);
334 <        e2 = E_NTH_VERT(e,1);
335 <        if(lptr == list)
336 <        {
337 < #ifdef DEBUG        
338 <          eputs("split_edge_list():cant find intial vertex\n");
339 < #endif
340 <          *l = NULL;
341 <          return(FALSE);
342 <        }
343 <
344 <    }
345 <    end = lptr;
346 <    list = add_data_to_circular_list(list,&end,new_e);
347 <    *l = list;
348 <    return(TRUE);
207 >  *e2ptr = e2;
208 >  return(t_id);
209   }
210  
351 –
211   int
212 < smTriangulate_convex(sm,plist)
212 > smTriangulateConvex(sm,plist,add_ptr)
213   SM *sm;
214 < LIST *plist;
214 > LIST *plist,**add_ptr;
215   {
357 –    TRI *tri;
216      int t_id,e_id0,e_id1,e_id2;
217      int v_id0,v_id1,v_id2;
218      LIST *lptr;
361 –    int cnt;
219  
220      lptr = plist;
221      e_id0 = (int)LIST_DATA(lptr);
# Line 369 | Line 226 | LIST *plist;
226          e_id1 = (int)LIST_DATA(lptr);
227          v_id1 = E_NTH_VERT(e_id1,0);
228          v_id2 = E_NTH_VERT(e_id1,1);
372 –        /* form a triangle for each triple of with v0 as base of star */
373 –        t_id = smAdd_tri(sm,v_id0,v_id1,v_id2,&tri);
374 –        smLocator_add_tri(sm,t_id,v_id0,v_id1,v_id2);
375 –        /* add which pointer?*/
376 –
229          lptr = LIST_NEXT(lptr);
230  
231 <        if(LIST_NEXT(lptr) != plist)
232 <        {
381 <            e_id2 = eNew_edge();
382 <            SET_E_NTH_VERT(e_id2,0,v_id2);
383 <            SET_E_NTH_VERT(e_id2,1,v_id0);
384 <        }
231 >        if(LIST_NEXT(lptr) != plist)    
232 >          e_id2 = 0;
233          else
234             e_id2 = (int)LIST_DATA(lptr);
235 <        
236 <        /* set appropriate tri for each edge*/
389 <        SET_E_NTH_TRI(e_id0,0,t_id);
390 <        SET_E_NTH_TRI(e_id1,0,t_id);
391 <        SET_E_NTH_TRI(e_id2,0,t_id);
392 <
235 >        t_id = smTriangulate_add_tri(sm,v_id0,v_id1,v_id2,e_id0,e_id1,&e_id2);
236 >        *add_ptr = push_data(*add_ptr,t_id);
237          e_id0 = -e_id2;
238      }
395 –    
239      free_list(plist);
240      return(TRUE);
241   }
242 + #ifdef TEST_DRIVER
243 + FVECT Norm[500],B_V[500];
244 + int Ncnt,Bcnt,Del=0;
245 + #endif
246 +
247 +
248 + /* Triangulate the polygon defined by plist, and generating vertex p_id.
249 +   Return list of added triangles in list add_ptr. Returns TRUE if
250 +   successful, FALSE otherwise. This is NOT a general triangulation routine,
251 +   assumes polygon star relative to id
252 + */
253 +
254   int
255 < smTriangulate_elist(sm,plist)
255 > smTriangulate(sm,id,plist,add_ptr)
256   SM *sm;
257 < LIST *plist;
257 > int id;
258 > LIST *plist,**add_ptr;
259   {
260 <    LIST *l,*el1;
261 <    FVECT v0,v1,v2;
262 <    int id0,id1,id2,e,id_next;
263 <    char flipped;
408 <    int done;
260 >    LIST *l,*prev,*t;
261 >    FVECT v0,v1,v2,n,p;
262 >    int is_tri,is_convex,cut,t_id,id0,id1,id2,e2,e1,enew;
263 >    double dp;
264  
265 <    l = plist;
266 <    
265 >    VSUB(p,SM_NTH_WV(sm,id),SM_VIEW_CENTER(sm));
266 >    enew = 0;
267 >    is_convex = TRUE;
268 >    cut = is_tri= FALSE;
269 >    l = prev = plist;
270 >
271 >    /* get v0,v1 */
272 >    e1 = (int)LIST_DATA(l);
273 >    id0 = E_NTH_VERT(e1,0);
274 >    id1 = E_NTH_VERT(e1,1);
275 >    VSUB(v0,SM_NTH_WV(sm,id0),SM_VIEW_CENTER(sm));
276 >    VSUB(v1,SM_NTH_WV(sm,id1),SM_VIEW_CENTER(sm));  
277 > #ifdef TEST_DRIVER
278 >    Del = TRUE;
279 >    VCOPY(B_V[0],v0);
280 >    VCOPY(B_V[1],v1);
281 >    Bcnt = 2;
282 >    Ncnt = 0;
283 > #endif
284      while(l)
285      {
414 –        /* get v0,v1,v2 */
415 –      e = (int)LIST_DATA(l);
416 –      id0 = E_NTH_VERT(e,0);
417 –      id1 = E_NTH_VERT(e,1);
286        l = LIST_NEXT(l);
287 <      e = (int)LIST_DATA(l);
288 <      id2 = E_NTH_VERT(e,1);
287 >      /* Get v2 */
288 >      e2 = (int)LIST_DATA(l);
289 >      id2 = E_NTH_VERT(e2,1);
290 >      VSUB(v2,SM_NTH_WV(sm,id2),SM_VIEW_CENTER(sm));
291 > #ifdef TEST_DRIVER
292 >      VCOPY(B_V[Bcnt++],v2);
293 > #endif
294 >      if(LIST_NEXT(LIST_NEXT(l)) == prev)
295 >      {/* Check if have a triangle */
296 >           is_tri = TRUE;      
297 >           break;
298 >      }
299  
300 <      smDir(sm,v0,id0);
301 <      smDir(sm,v1,id1);
302 <      smDir(sm,v2,id2);
303 <      /* determine if convex (left turn), or concave(right turn) angle */
426 <      if(convex_angle(v0,v1,v2))
300 >      /* determine if v0-v1-v2 is convex:defined clockwise on the sphere-
301 >       so switch orientation
302 >       */
303 >      if(convex_angle(v2,v1,v0))
304        {
305 <        if(l == plist)
306 <          break;
307 <        else
305 >          /* test if safe to cut off v0-v1-v2 by testing if p lies outside of
306 >         triangle v0-v1-v2: if so, because plist is the star polygon around p,
307 >          the new edge v2-v0 cannot intersect any existing edges
308 >        */
309 >        VCROSS(n,v0,v2);
310 >        dp = DOT(n,p);
311 >        if(dp  <= 0.0)
312 >        {
313 >            /* remove edges e1,e2 and add triangle id0,id1,id2 */
314 >          enew = 0;
315 >          t_id = smTriangulate_add_tri(sm,id0,id1,id2,e1,e2,&enew);
316 >          cut = TRUE;
317 >          *add_ptr = push_data(*add_ptr,t_id);
318 >           /* Insert edge enew into the list, reuse prev list element */
319 >          LIST_NEXT(prev) = LIST_NEXT(l);
320 >          LIST_DATA(prev) = e1 = -enew;
321 >           /* If removing head of list- reset plist pointer */
322 >          if(l== plist)
323 >            plist = prev;
324 >          /* free list element for e2 */
325 >          LIST_NEXT(l)=NULL;
326 >          free_list(l);
327 >          l = prev;
328 >          VCOPY(v1,v2);
329 >          id1 = id2;
330            continue;
331 +        }
332        }
333 <      /* if concave: add edge and recurse on two sub polygons */
334 <      id_next = smFind_next_convex_vertex(sm,id0,id1,v0,v1,LIST_NEXT(l));
335 <      if(id_next == SM_INVALID)
333 >      else
334 >        is_convex = FALSE;
335 >      VCOPY(v0,v1);
336 >      VCOPY(v1,v2);
337 >      id0 = id1;
338 >      id1 = id2;
339 >      e1 = e2;  
340 >      /* check if gone around circular list without adding any
341 >         triangles: prevent infinite loop */
342 >      if(l == plist)
343        {
344 +        if(LIST_NEXT(LIST_NEXT(l)) == prev)
345 +          {/* Check if have a triangle */
346 +            is_tri = TRUE;      
347 +            break;
348 +          }
349 +
350 +        if(is_convex)
351 +          break;
352 +        if(!cut)
353 +        {
354   #ifdef DEBUG
355 <          eputs("smTriangulate_elist():Unable to find convex vertex\n");
355 >          eputs("smTriangulate():Unable to triangulate\n");
356   #endif
357 +          free_list(l);
358 +          while(*add_ptr)
359 +          {
360 +            t_id = pop_list(add_ptr);
361 +            smDelete_tri(sm,t_id);
362 +          }
363            return(FALSE);
364 +        }
365 +        cut = FALSE;
366 +        is_convex = TRUE;
367        }
368 <      /* add edge */
443 <      el1 = NULL;
444 <      /* Split edge list l into two lists: one from id1-id_next-id1,
445 <         and the next from id2-id_next-id2
446 <      */
447 <      split_edge_list(id1,id_next,&l,&el1);
448 <      /* Recurse and triangulate the two edge lists */
449 <      done = smTriangulate_elist(sm,l);
450 <      if(done)
451 <        done = smTriangulate_elist(sm,el1);
452 <      return(done);
368 >      prev = l;
369      }
370 <    done = smTriangulate_convex(sm,plist);
371 <    return(done);
372 < }
370 >    if(is_tri)
371 >    {
372 >      l = LIST_NEXT(l);
373 >      enew = (int)LIST_DATA(l);
374 >      t_id = smTriangulate_add_tri(sm,id0,id1,id2,e1,e2,&enew);
375 >      *add_ptr = push_data(*add_ptr,t_id);
376 >      free_list(l);
377 >    }
378 >    else
379 >      if(!smTriangulateConvex(sm,l,add_ptr))
380 >        return(FALSE);
381  
382 < int
383 < smTriangulate(sm,plist)
460 < SM *sm;
461 < LIST *plist;
462 < {
463 <    int e,id_t0,id_t1,e0,e1;
464 <    TRI *t0,*t1;
465 <    int test;
466 <    
467 <    test = smTriangulate_elist(sm,plist);
468 <
469 <    if(!test)
470 <       return(test);
471 <    FOR_ALL_EDGES(e)
382 >    /* Set triangle adjacencies based on edge adjacencies */
383 >    FOR_ALL_EDGES(enew)
384      {
385 <        id_t0 = E_NTH_TRI(e,0);
386 <        id_t1 = E_NTH_TRI(e,1);
475 <        if((id_t0==SM_INVALID) || (id_t1==SM_INVALID))
476 <        {
477 < #ifdef DEBUG
478 <           eputs("smTriangulate(): Unassigned edge neighbor\n");
479 < #endif
480 <            continue;
481 <        }
482 <        t0 = SM_NTH_TRI(sm,id_t0);
483 <        t1 = SM_NTH_TRI(sm,id_t1);
385 >      id0 = E_NTH_TRI(enew,0);
386 >      id1 = E_NTH_TRI(enew,1);
387          
388 <        e0 = T_WHICH_V(t0,E_NTH_VERT(e,0));
389 <        T_NTH_NBR(t0,e0) = id_t1;
390 <
391 <        e1 = T_WHICH_V(t1,E_NTH_VERT(e,1));
392 <        T_NTH_NBR(t1,e1) = id_t0;
388 >      e1 = (T_WHICH_V(SM_NTH_TRI(sm,id0),E_NTH_VERT(enew,0))+2)%3;
389 >      T_NTH_NBR(SM_NTH_TRI(sm,id0),e1) = id1;
390 >      
391 >      e2 = (T_WHICH_V(SM_NTH_TRI(sm,id1),E_NTH_VERT(enew,1))+2)%3;
392 >      T_NTH_NBR(SM_NTH_TRI(sm,id1),e2) = id0;
393      }
394 <    return(test);
394 >    return(TRUE);
395   }
396  
397   eIn_tri(e,t)
# Line 503 | Line 406 | TRI *t;
406        return(T_NTH_V(t,0)==E_NTH_VERT(e,1)||T_NTH_V(t,2)==E_NTH_VERT(e,1));
407      else if(T_NTH_V(t,2)==E_NTH_VERT(e,0))
408        return(T_NTH_V(t,0)==E_NTH_VERT(e,1)||T_NTH_V(t,1)==E_NTH_VERT(e,1));
409 +
410    return(FALSE);
411   }
412 < smFix_edges(sm)
412 >
413 > /* Test the new set of triangles for Delaunay condition. 'Edges' contains
414 >   all of the new edges added. The CCW triangle assoc with each edge is
415 >   tested against the opposite vertex of the CW triangle. If the vertex
416 >   lies inside the circle defined by the CCW triangle- the edge is swapped
417 >   for the opposite diagonal
418 > */
419 > smFixEdges(sm,add_list,delptr)
420     SM *sm;
421 +   LIST *add_list;
422 +   QUADTREE *delptr;
423 +
424   {
425 <    int e,id_t0,id_t1,e_new,e0,e1,e0_next,e1_next;
426 <    TRI *t0,*t1,*nt0,*nt1;
513 <    int i,id_v0,id_v1,id_v2,id_p,nid_t0,nid_t1;
425 >    int e,t0_id,t1_id,e_new,e0,e1,e0_next,e1_next;
426 >    int i,v0_id,v1_id,v2_id,p_id,t0_nid,t1_nid;
427      FVECT v0,v1,v2,p,np,v;
428 <    LIST *add,*del;
429 <    
517 <    add = del = NULL;
428 >    TRI *t0,*t1;
429 >
430      FOR_ALL_EDGES(e)
431      {
432 <        id_t0 = E_NTH_TRI(e,0);
433 <        id_t1 = E_NTH_TRI(e,1);
434 <        if((id_t0==SM_INVALID) || (id_t1==SM_INVALID))
432 >        t0_id = E_NTH_TRI(e,0);
433 >        t1_id = E_NTH_TRI(e,1);
434 >        if((t0_id==INVALID) || (t1_id==INVALID))
435          {
436   #ifdef DEBUG
437 <            eputs("smFix_edges: Unassigned edge nbr\n");
437 >            error(CONSISTENCY,"smFix_edges: Unassigned edge nbr\n");
438   #endif
527 –            continue;
439          }
440 <        t0 = SM_NTH_TRI(sm,id_t0);
441 <        t1 = SM_NTH_TRI(sm,id_t1);
442 <        
443 <        e0 = T_WHICH_V(t0,E_NTH_VERT(e,0));
533 <        e1 = T_WHICH_V(t1,E_NTH_VERT(-e,0));
534 <        e0_next = (e0+2)%3;
535 <        e1_next = (e1+2)%3;
536 <        id_v0 = E_NTH_VERT(e,0);
537 <        id_v1 = E_NTH_VERT(e,1);
538 <        id_v2 = T_NTH_V(t0,e0_next);
539 <        id_p = T_NTH_V(t1,e1_next);
440 >        t0 = SM_NTH_TRI(sm,t0_id);
441 >        t1 = SM_NTH_TRI(sm,t1_id);
442 >        e0 = T_NTH_NBR_PTR(t1_id,t0);
443 >        e1 = T_NTH_NBR_PTR(t0_id,t1);
444  
445 <        smDir(sm,v0,id_v0);
446 <        smDir(sm,v1,id_v1);
447 <        smDir(sm,v2,id_v2);
445 >        v0_id = E_NTH_VERT(e,0);
446 >        v1_id = E_NTH_VERT(e,1);
447 >        v2_id = T_NTH_V(t0,e0);
448 >        p_id = T_NTH_V(t1,e1);
449 >
450 >        smDir_in_cone(sm,v0,v0_id);
451 >        smDir_in_cone(sm,v1,v1_id);
452 >        smDir_in_cone(sm,v2,v2_id);
453          
454 <        VCOPY(p,SM_NTH_WV(sm,id_p));    
454 >        VCOPY(p,SM_NTH_WV(sm,p_id));    
455          VSUB(p,p,SM_VIEW_CENTER(sm));
456          if(point_in_cone(p,v0,v1,v2))
457          {
458 <            smTris_swap_edge(sm,id_t0,id_t1,e0,e1,&nid_t0,&nid_t1,&add,&del);
458 >           smTris_swap_edge(sm,t0_id,t1_id,e0,e1,&t0_nid,&t1_nid,&add_list,
459 >                            delptr);
460              
461 <            nt0 = SM_NTH_TRI(sm,nid_t0);
462 <            nt1 = SM_NTH_TRI(sm,nid_t1);
461 >           /* Adjust the triangle pointers of the remaining edges to be
462 >              processed
463 >            */
464              FOR_ALL_EDGES_FROM(e,i)
465              {
466 <              if(E_NTH_TRI(i,0)==id_t0 || E_NTH_TRI(i,0)==id_t1)
466 >              if(E_NTH_TRI(i,0)==t0_id || E_NTH_TRI(i,0)==t1_id)
467                {
468 <                if(eIn_tri(i,nt0))
469 <                  SET_E_NTH_TRI(i,0,nid_t0);
468 >                if(eIn_tri(i,SM_NTH_TRI(sm,t0_nid)))
469 >                  SET_E_NTH_TRI(i,0,t0_nid);
470                  else
471 <                  SET_E_NTH_TRI(i,0,nid_t1);
471 >                  SET_E_NTH_TRI(i,0,t1_nid);
472                }
473  
474 <              if(E_NTH_TRI(i,1)==id_t0 || E_NTH_TRI(i,1)==id_t1)
474 >              if(E_NTH_TRI(i,1)==t0_id || E_NTH_TRI(i,1)==t1_id)
475                {
476 <                if(eIn_tri(i,nt0))
477 <                  SET_E_NTH_TRI(i,1,nid_t0);
476 >                if(eIn_tri(i,SM_NTH_TRI(sm,t0_nid)))
477 >                  SET_E_NTH_TRI(i,1,t0_nid);
478                  else
479 <                  SET_E_NTH_TRI(i,1,nid_t1);
479 >                  SET_E_NTH_TRI(i,1,t1_nid);
480                }
481              }
482 <            id_t0 = nid_t0;
483 <            id_t1 = nid_t1;
482 >            t0_id = t0_nid;
483 >            t1_id = t1_nid;
484              e_new = eNew_edge();
485 <            SET_E_NTH_VERT(e_new,0,id_p);
486 <            SET_E_NTH_VERT(e_new,1,id_v2);
487 <            SET_E_NTH_TRI(e_new,0,id_t0);
488 <            SET_E_NTH_TRI(e_new,1,id_t1);
485 >            SET_E_NTH_VERT(e_new,0,p_id);
486 >            SET_E_NTH_VERT(e_new,1,v2_id);
487 >            SET_E_NTH_TRI(e_new,0,t0_id);
488 >            SET_E_NTH_TRI(e_new,1,t1_id);
489          }
490      }
491 <    smUpdate_locator(sm,add,del);
491 >    /* Add/Delete the appropriate triangles from the stree */
492 >    smUpdate_locator(sm,add_list,qtqueryset(*delptr));
493 >
494   }
495  
496 + /* Remove vertex "id" from the mesh- and retriangulate the resulting
497 +   hole: Returns TRUE if successful, FALSE otherwise.
498 + */
499   int
500 < smMesh_remove_vertex(sm,id)
500 > smRemoveVertex(sm,id)
501     SM *sm;
502     int id;
503   {
504 <    int tri;
505 <    LIST *elist;
506 <    int cnt,debug;
507 <    /* generate list of vertices that form the boundary of the
508 <       star polygon formed by vertex id and all of its adjacent
509 <       triangles
504 >    LIST *b_list,*add_list;
505 >    QUADTREE delnode=-1;
506 >    int t_id;
507 >
508 >    /* generate list of edges that form the boundary of the
509 >       polygon formed by the triangles adjacent to vertex 'id'
510       */
511 <    eClear_edges();
596 <    elist = smVertex_star_polygon(sm,id);
597 <    if(!elist)
598 <       return(FALSE);
511 >    b_list = smVertexPolygon(sm,id,&delnode);
512  
513 <    /* Triangulate spherical polygon */
514 <    smTriangulate(sm,elist);
513 >    add_list = NULL;
514 >    /* Triangulate polygonal hole  */
515 >    if(!smTriangulate(sm,id,b_list,&add_list))
516 >    {
517 >      qtfreeleaf(delnode);
518 >      return(FALSE);
519 >    }
520 >    /* Fix up new triangles to be Delaunay-delnode contains set of
521 >     triangles to delete,add_list is the set of new triangles to add
522 >     */
523 >    smFixEdges(sm,add_list,&delnode);
524  
525  
526 <    /* Fix up new triangles to be Delaunay */
605 <    smFix_edges(sm);
606 <
526 >    qtfreeleaf(delnode);
527      return(TRUE);
528   }
529    
610 – /* Remove point from samples, and from mesh. Delete any triangles
611 –   adjacent to the point and re-triangulate the hole
612 –   Return TRUE is point found , FALSE otherwise
613 – */
614 – int
615 – smDelete_point(sm,id)
616 – SM *sm;
617 – int id;
618 – {
619 –
620 –    /* Remove the corresponding vertex from the mesh */
621 –    smMesh_remove_vertex(sm,id);
622 –    /* Free the sample point */
623 –    smDelete_sample(sm,id);
624 –    return(TRUE);
625 – }
530  
531  
532  

Diff Legend

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