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.6 by gwlarson, Tue Oct 6 18:16:53 1998 UTC vs.
Revision 3.8 by gwlarson, Mon Dec 28 18:07:34 1998 UTC

# Line 19 | Line 19 | static int Max_edges=200;
19   static EDGE *Edges=NULL;
20   static int Ecnt=0;
21  
22 – #define remove_tri_compress remove_tri
23 – remove_tri(qtptr,fptr,tptr)
24 –   QUADTREE *qtptr;
25 –   int *fptr;
26 –   int *tptr;
27 – {
28 –    int n;
29 –
30 –    if(QT_IS_EMPTY(*qtptr))
31 –      return;
32 –    if(QT_LEAF_IS_FLAG(*qtptr))
33 –      return;
34 –
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 – 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;
50 –  FVECT v0,v1,v2;
51 –  
52 –  st = SM_LOCATOR(sm);
53 –
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 –  qtClearAllFlags();
59 –  
60 –  stApply_to_tri(st,v0,v1,v2,remove_tri,remove_tri_compress,&t_id);
61 –
62 – }
63 –
22   smFree_tri(sm,id)
23   SM *sm;
24   int id;
25   {
26 <  TRI *tri;
26 >  TRI *tri,*t;
27  
28    tri = SM_NTH_TRI(sm,id);
29    /* Add to the free_list */
30 +
31    T_NEXT_FREE(tri) = SM_FREE_TRIS(sm);
32    SM_FREE_TRIS(sm) = id;
33    T_VALID_FLAG(tri) = -1;
# Line 97 | Line 56 | int t_id;
56    smClear_tri_flags(sm,t_id);
57  
58    smFree_tri(sm,t_id);
59 +
60 + #if 0
61 +  {
62 +    int i;
63 +    TRI *t;
64 +    for(i=0; i < SM_NUM_TRI(sm);i++)
65 +    {
66 +      t = SM_NTH_TRI(sm,i);
67 +      if(!T_IS_VALID(t))
68 +        continue;
69 +      if(T_NTH_NBR(t,0)==t_id || T_NTH_NBR(t,1)==t_id || T_NTH_NBR(t,2)==t_id)
70 +        eputs("Stale pointer: smDelete_tri()\n");
71 +    }
72 +  }
73 + #endif
74   }
75  
76  
# Line 121 | Line 95 | memerr:
95    error(SYSTEM,"eNew_edge(): Unable to allocate memory");
96   }
97  
98 + /* Return list of edges defining polygon formed by boundary of triangles
99 + adjacent to id. Return set of triangles adjacent to id to delete in delptr
100 + */
101   LIST
102 < *smVertex_star_polygon(sm,id,delptr)
102 > *smVertexPolygon(sm,id,del_ptr)
103   SM *sm;
104   int id;
105 < QUADTREE *delptr;
105 > LIST **del_ptr;
106   {
107      TRI *tri,*t_next;
108      LIST *elist,*end;
109 <    int t_id,v_next,t_next_id;
133 <    int e;
134 <    OBJECT del_set[2];
109 >    int e,t_id,v_next,t_next_id,b_id,v_id;
110  
111 +    eClear_edges();
112      elist = end =  NULL;
113 +
114      /* Get the first triangle adjacent to vertex id */
115      t_id = SM_NTH_VERT(sm,id);
116      tri = SM_NTH_TRI(sm,t_id);
117  
118 <    if((e = eNew_edge()) == INVALID)
119 <      return(NULL);
120 <
121 <    v_next = (T_WHICH_V(tri,id)+1)%3;
122 <    SET_E_NTH_VERT(e,0,T_NTH_V(tri,v_next));
118 >    e = eNew_edge();
119 >    /* Get the  next vertex on the polygon boundary */
120 >    v_id = T_WHICH_V(tri,id);
121 >    b_id = (v_id + 1)%3;
122 >    /* Create an edge */
123 >    SET_E_NTH_VERT(e,0,T_NTH_V(tri,b_id));
124      SET_E_NTH_TRI(e,0,INVALID);
125 <    SET_E_NTH_TRI(e,1,T_NTH_NBR(tri,v_next));
126 <    v_next = (T_WHICH_V(tri,id)+2)%3;
127 <    SET_E_NTH_VERT(e,1,T_NTH_V(tri,v_next));
125 >    SET_E_NTH_TRI(e,1,T_NTH_NBR(tri,v_id));
126 >    v_next = T_NTH_V(tri,(b_id+1)%3);
127 >    SET_E_NTH_VERT(e,1,v_next);
128      elist = add_data_to_circular_list(elist,&end,e);
151 –
129      t_next_id = t_id;
130      t_next = tri;
131  
132 <    del_set[0] =1; del_set[1] = t_id;
133 <    *delptr = qtnewleaf(del_set);
132 >    *del_ptr = push_data(*del_ptr,t_id);
133 >    /* Create a set to hold all of the triangles for deletion later */
134  
135 <    while((t_next_id = T_NTH_NBR(t_next,v_next)) != t_id)
136 <    {  
137 <      if((e = eNew_edge()) == INVALID)
161 <        return(NULL);
162 <
135 >    while((t_next_id = T_NTH_NBR(t_next,b_id)) != t_id)
136 >    {
137 >      e = eNew_edge();
138        t_next = SM_NTH_TRI(sm,t_next_id);
139 <      v_next = (T_WHICH_V(t_next,id)+1)%3;
165 <
166 <      SET_E_NTH_VERT(e,0,T_NTH_V(t_next,v_next));
139 >      SET_E_NTH_VERT(e,0,v_next);
140        SET_E_NTH_TRI(e,0,INVALID);
141 <      SET_E_NTH_TRI(e,1,T_NTH_NBR(t_next,v_next));
142 <      v_next = (T_WHICH_V(t_next,id)+2)%3;
143 <      SET_E_NTH_VERT(e,1,T_NTH_V(t_next,v_next));
141 >      v_id = T_WHICH_V(t_next,id);
142 >      b_id = (v_id + 1)%3;
143 >      SET_E_NTH_TRI(e,1,T_NTH_NBR(t_next,v_id));
144 >      v_next = T_NTH_V(t_next,(b_id+1)%3);
145 >      SET_E_NTH_VERT(e,1,v_next);
146        elist = add_data_to_circular_list(elist,&end,e);
147 <
173 <
174 <      if(qtinset(*delptr,t_next_id))
175 <        {
176 < #ifdef DEBUG
177 <          eputs("smVertex_star_polygon(): id already in set\n");
178 < #endif    
179 <          free_list(elist);
180 <          return(NULL);
181 <        }
182 <      else
183 <        qtaddelem(*delptr,t_next_id);
147 >      *del_ptr = push_data(*del_ptr,t_next_id);
148      }
149      return(elist);
150   }
151  
152 +
153   int
154 < smEdge_intersect_polygon(sm,v0,v1,l)
154 > smTriangulate_add_tri(sm,id0,id1,id2,e0,e1,e2ptr)
155   SM *sm;
156 < FVECT v0,v1;
192 < LIST *l;
156 > int id0,id1,id2,e0,e1,*e2ptr;
157   {
158 <    FVECT e0,e1;
159 <    int e,id_e0,id_e1;
196 <    LIST *el,*eptr;
197 <    
198 <    /* Test the edges in l against v0v1 to see if v0v1 intersects
199 <       any other edges
200 <     */
201 <    
202 <    el = l;
158 >  int t_id;
159 >  int e2;
160  
161 <    while(el)
162 <    {
163 <      e = (int)LIST_DATA(el);
207 <      id_e0 = E_NTH_VERT(e,0);
208 <      id_e1 = E_NTH_VERT(e,1);
209 <
210 <      VSUB(e0,SM_NTH_WV(sm,id_e0),SM_VIEW_CENTER(sm));
211 <      VSUB(e1,SM_NTH_WV(sm,id_e1),SM_VIEW_CENTER(sm));
212 <      if(sedge_intersect(v0,v1,e0,e1))
213 <        return(TRUE);
214 <
215 <      el = LIST_NEXT(el);
216 <      if(el == l)
217 <        break;
218 <    }
219 <    return(FALSE);
220 < }
221 <
222 < int
223 < smFind_next_convex_vertex(sm,id0,id1,v0,v1,l)
224 <   SM *sm;
225 <   int id0,id1;
226 <   FVECT v0,v1;
227 <   LIST *l;
228 < {
229 <    int e,id;
230 <    LIST *el;
231 <    FVECT v;
232 <
233 <    /* starting with the end of edge at head of l, search sequentially for
234 <      vertex v such that v0v1v is a convex angle, and the edge v1v does
235 <      not intersect any other edges
236 <   */
237 <    id = INVALID;
238 <    el = l;
239 <    while(id != id0)
240 <    {
241 <        e = (int)LIST_DATA(el);
242 <        id = E_NTH_VERT(e,1);
243 <
244 <        smDir(sm,v,id);
245 <
246 <        if(convex_angle(v0,v1,v) && !smEdge_intersect_polygon(sm,v1,v,l))
247 <           return(id);
248 <              
249 <        el = LIST_NEXT(el);
250 <        if(el == l)
251 <           break;
252 <    }
253 <    return(INVALID);
254 < }
255 <
256 < int
257 < split_edge_list(id0,id_new,l,lnew)
258 < int id0,id_new;
259 < LIST **l,**lnew;
260 < {
261 <    LIST *list,*lptr,*end;
262 <    int e,e1,e2,new_e;
263 <
264 <    e2 = INVALID;
265 <    list = lptr = *l;
266 <
267 <    if((new_e = eNew_edge())==INVALID)
268 <     {
269 < #ifdef DEBUG
270 <            eputs("split_edge_list():Too many edges\n");
161 > #ifdef DEBUG
162 >  if(id0 == INVALID || id1==INVALID || id2==INVALID)
163 >    error(CONSISTENCY,"bad id- smTriangulate_add_tri()\n");
164   #endif
165 <         return(FALSE);
166 <     }
167 <    SET_E_NTH_VERT(new_e,0,id0);
168 <    SET_E_NTH_VERT(new_e,1,id_new);
169 <    SET_E_NTH_TRI(new_e,0,INVALID);
170 <    SET_E_NTH_TRI(new_e,1,INVALID);
171 <    
172 <    while(e2 != id_new)
173 <    {
174 <        lptr = LIST_NEXT(lptr);
175 <        e = (int)LIST_DATA(lptr);
176 <        e2 = E_NTH_VERT(e,1);
177 <        if(lptr == list)
285 <        {
286 < #ifdef DEBUG        
287 <          eputs("split_edge_list():cant find vertex\n");
288 < #endif
289 <          *lnew = NULL;
290 <          return(FALSE);
291 <        }
165 >  t_id = smAdd_tri(sm,id0,id1,id2);
166 >  if(*e2ptr == 0)
167 >  {
168 >    e2 = eNew_edge();
169 >    SET_E_NTH_VERT(e2,0,id2);
170 >    SET_E_NTH_VERT(e2,1,id0);
171 >  }
172 >  else
173 >    e2 = *e2ptr;
174 >  /* set appropriate tri for each edge*/
175 >  SET_E_NTH_TRI(e0,0,t_id);
176 >  SET_E_NTH_TRI(e1,0,t_id);
177 >  SET_E_NTH_TRI(e2,0,t_id);
178  
179 <    }
180 <    end = lptr;
295 <    lptr =  LIST_NEXT(lptr);
296 <    list = add_data_to_circular_list(list,&end,-new_e);
297 <    *lnew = list;
298 <
299 <    /* now follow other cycle */
300 <
301 <    list = lptr;
302 <    e2 = INVALID;
303 <    while(e2 != id0)
304 <    {
305 <        lptr = LIST_NEXT(lptr);
306 <        e = (int)LIST_DATA(lptr);
307 <        e2 = E_NTH_VERT(e,1);
308 <        if(lptr == list)
309 <        {
310 < #ifdef DEBUG        
311 <          eputs("split_edge_list():cant find intial vertex\n");
312 < #endif
313 <          *l = NULL;
314 <          return(FALSE);
315 <        }
316 <
317 <    }
318 <    end = lptr;
319 <    list = add_data_to_circular_list(list,&end,new_e);
320 <    *l = list;
321 <    return(TRUE);
179 >  *e2ptr = e2;
180 >  return(t_id);
181   }
182  
324 –
183   int
184 < smTriangulate_convex(sm,plist,add_ptr)
184 > smTriangulateConvex(sm,plist,add_ptr)
185   SM *sm;
186   LIST *plist,**add_ptr;
187   {
188      int t_id,e_id0,e_id1,e_id2;
189      int v_id0,v_id1,v_id2;
190      LIST *lptr;
333 –    int cnt;
191  
192      lptr = plist;
193      e_id0 = (int)LIST_DATA(lptr);
# Line 341 | Line 198 | LIST *plist,**add_ptr;
198          e_id1 = (int)LIST_DATA(lptr);
199          v_id1 = E_NTH_VERT(e_id1,0);
200          v_id2 = E_NTH_VERT(e_id1,1);
344 –        /* form a triangle for each triple of with v0 as base of star */
345 –        t_id = smAdd_tri(sm,v_id0,v_id1,v_id2);
346 –        *add_ptr = push_data(*add_ptr,t_id);
347 –
348 –        /* add which pointer?*/
349 –
201          lptr = LIST_NEXT(lptr);
202  
203 <        if(LIST_NEXT(lptr) != plist)
204 <        {
354 <            e_id2 = eNew_edge();
355 <            SET_E_NTH_VERT(e_id2,0,v_id2);
356 <            SET_E_NTH_VERT(e_id2,1,v_id0);
357 <        }
203 >        if(LIST_NEXT(lptr) != plist)    
204 >          e_id2 = 0;
205          else
206             e_id2 = (int)LIST_DATA(lptr);
207 <        
208 <        /* set appropriate tri for each edge*/
362 <        SET_E_NTH_TRI(e_id0,0,t_id);
363 <        SET_E_NTH_TRI(e_id1,0,t_id);
364 <        SET_E_NTH_TRI(e_id2,0,t_id);
365 <
207 >        t_id = smTriangulate_add_tri(sm,v_id0,v_id1,v_id2,e_id0,e_id1,&e_id2);
208 >        *add_ptr = push_data(*add_ptr,t_id);
209          e_id0 = -e_id2;
210      }
211      free_list(plist);
212      return(TRUE);
213   }
214 < int
215 < smTriangulate_elist(sm,plist,add_ptr)
216 < SM *sm;
374 < LIST *plist,**add_ptr;
375 < {
376 <    LIST *l,*el1;
377 <    FVECT v0,v1,v2;
378 <    int id0,id1,id2,e,id_next;
379 <    char flipped;
380 <    int done;
381 <
382 <    l = plist;
383 <    
384 <    while(l)
385 <    {
386 <        /* get v0,v1,v2 */
387 <      e = (int)LIST_DATA(l);
388 <      id0 = E_NTH_VERT(e,0);
389 <      id1 = E_NTH_VERT(e,1);
390 <      l = LIST_NEXT(l);
391 <      e = (int)LIST_DATA(l);
392 <      id2 = E_NTH_VERT(e,1);
393 <
394 <      smDir(sm,v0,id0);
395 <      smDir(sm,v1,id1);
396 <      smDir(sm,v2,id2);
397 <      /* determine if convex (left turn), or concave(right turn) angle */
398 <      if(convex_angle(v0,v1,v2))
399 <      {
400 <        if(l == plist)
401 <          break;
402 <        else
403 <          continue;
404 <      }
405 <      /* if concave: add edge and recurse on two sub polygons */
406 <      id_next = smFind_next_convex_vertex(sm,id0,id1,v0,v1,LIST_NEXT(l));
407 <      if(id_next == INVALID)
408 <      {
409 < #ifdef DEBUG
410 <          eputs("smTriangulate_elist():Unable to find convex vertex\n");
214 > #ifdef TEST_DRIVER
215 > FVECT Norm[500],B_V[500];
216 > int Ncnt,Bcnt,Del=0;
217   #endif
412 –          return(FALSE);
413 –      }
414 –      /* add edge */
415 –      el1 = NULL;
416 –      /* Split edge list l into two lists: one from id1-id_next-id1,
417 –         and the next from id2-id_next-id2
418 –      */
419 –      split_edge_list(id1,id_next,&l,&el1);
420 –      /* Recurse and triangulate the two edge lists */
421 –      done = smTriangulate_elist(sm,l,add_ptr);
422 –      if(done)
423 –        done = smTriangulate_elist(sm,el1,add_ptr);
424 –      return(done);
425 –    }
426 –    done = smTriangulate_convex(sm,plist,add_ptr);
427 –    return(done);
428 – }
218  
430 – int
431 – smTriangulate_add_tri(sm,id0,id1,id2,e0,e1,e2ptr)
432 – SM *sm;
433 – int id0,id1,id2,e0,e1,*e2ptr;
434 – {
435 –  int t_id;
436 –  int e2;
219  
220 <  t_id = smAdd_tri(sm,id0,id1,id2);
221 <  if(*e2ptr == 0)
222 <  {
223 <    e2 = eNew_edge();
224 <    SET_E_NTH_VERT(e2,0,id2);
443 <    SET_E_NTH_VERT(e2,1,id0);
444 <  }
445 <  else
446 <    e2 = *e2ptr;
447 <  /* set appropriate tri for each edge*/
448 <  SET_E_NTH_TRI(e0,0,t_id);
449 <  SET_E_NTH_TRI(e1,0,t_id);
450 <  SET_E_NTH_TRI(e2,0,t_id);
220 > /* Triangulate the polygon defined by plist, and generating vertex p_id.
221 >   Return list of added triangles in list add_ptr. Returns TRUE if
222 >   successful, FALSE otherwise. This is NOT a general triangulation routine,
223 >   assumes polygon star relative to id
224 > */
225  
452 –  *e2ptr = e2;
453 –  return(t_id);
454 – }
226   int
227 < smTriangulate_elist_new(sm,id,plist,add_ptr)
227 > smTriangulate(sm,id,plist,add_ptr)
228   SM *sm;
229   int id;
230   LIST *plist,**add_ptr;
231   {
232      LIST *l,*prev,*t;
233      FVECT v0,v1,v2,n,p;
234 <    int is_tri,loop,t_id,id0,id1,id2,e2,eprev,enext;
234 >    int is_tri,is_convex,cut,t_id,id0,id1,id2,e2,e1,enew;
235      double dp;
236 +    static int debug=0;
237  
238 <    smDir(sm,p,id);
239 <    enext=0;
240 <    is_tri= loop = FALSE;
238 >    VSUB(p,SM_NTH_WV(sm,id),SM_VIEW_CENTER(sm));
239 >    enew = 0;
240 >    is_convex = TRUE;
241 >    cut = is_tri= FALSE;
242      l = prev = plist;
243 <    /* get v0,v1,v2 */
244 <    eprev = (int)LIST_DATA(l);
245 <    id0 = E_NTH_VERT(eprev,0);
246 <    id1 = E_NTH_VERT(eprev,1);
247 <    smDir(sm,v0,id0);
248 <    smDir(sm,v1,id1);  
243 >
244 >    /* get v0,v1 */
245 >    e1 = (int)LIST_DATA(l);
246 >    id0 = E_NTH_VERT(e1,0);
247 >    id1 = E_NTH_VERT(e1,1);
248 >    VSUB(v0,SM_NTH_WV(sm,id0),SM_VIEW_CENTER(sm));
249 >    VSUB(v1,SM_NTH_WV(sm,id1),SM_VIEW_CENTER(sm));  
250 > #ifdef TEST_DRIVER
251 >    Del = TRUE;
252 >    VCOPY(B_V[0],v0);
253 >    VCOPY(B_V[1],v1);
254 >    Bcnt = 2;
255 >    Ncnt = 0;
256 > #endif
257      while(l)
258      {
259        l = LIST_NEXT(l);
260 +      /* Get v2 */
261        e2 = (int)LIST_DATA(l);
262        id2 = E_NTH_VERT(e2,1);
263 <      /* Check if have a triangle */
263 >      VSUB(v2,SM_NTH_WV(sm,id2),SM_VIEW_CENTER(sm));
264 > #ifdef TEST_DRIVER
265 >      VCOPY(B_V[Bcnt++],v2);
266 > #endif
267        if(LIST_NEXT(LIST_NEXT(l)) == prev)
268 <      {
269 <        is_tri = TRUE;
270 <        break;
268 >      {/* Check if have a triangle */
269 >           is_tri = TRUE;      
270 >           break;
271        }
272 <      if(LIST_NEXT(l) == plist)
272 >
273 >      /* determine if v0-v1-v2 is convex:defined clockwise on the sphere-
274 >       so switch orientation
275 >       */
276 >      if(convex_angle(v2,v1,v0))
277        {
278 <        if(!loop)
279 <          loop = 1;
280 <        else
281 <          loop++;
282 <        if(loop > 3)
283 <          break;
278 >          /* test if safe to cut off v0-v1-v2 by testing if p lies outside of
279 >         triangle v0-v1-v2: if so, because plist is the star polygon around p,
280 >          the new edge v2-v0 cannot intersect any existing edges
281 >        */
282 >        VCROSS(n,v0,v2);
283 >        dp = DOT(n,p);
284 >        if(dp  <= 0.0)
285 >        {
286 >            /* remove edges e1,e2 and add triangle id0,id1,id2 */
287 >          enew = 0;
288 >          t_id = smTriangulate_add_tri(sm,id0,id1,id2,e1,e2,&enew);
289 >          cut = TRUE;
290 >          *add_ptr = push_data(*add_ptr,t_id);
291 >           /* Insert edge enew into the list, reuse prev list element */
292 >          LIST_NEXT(prev) = LIST_NEXT(l);
293 >          LIST_DATA(prev) = e1 = -enew;
294 >           /* If removing head of list- reset plist pointer */
295 >          if(l== plist)
296 >            plist = prev;
297 >          /* free list element for e2 */
298 >          LIST_NEXT(l)=NULL;
299 >          free_list(l);
300 >          l = prev;
301 >          VCOPY(v1,v2);
302 >          id1 = id2;
303 >          continue;
304 >        }
305        }
306 <      smDir(sm,v2,id2);
307 <      /* determine if convex (left turn), or concave(right turn) angle */
308 <      if(!convex_angle(v0,v1,v2))
499 <      {
500 <        VCOPY(v0,v1);
501 <        VCOPY(v1,v2);
502 <        id0 = id1;
503 <        id1 = id2;
504 <        prev = l;
505 <        eprev = e2;
506 <        continue;
507 <      }
508 <      VCROSS(n,v0,v2);
509 <      dp = DOT(n,p);
510 <      if(loop <=1 && (!ZERO(dp) && dp  < 0.0))
511 <      {
512 <        VCOPY(v0,v1);
513 <        VCOPY(v1,v2);
514 <        id0 = id1;
515 <        id1 = id2;
516 <        eprev = e2;
517 <        prev = l;
518 <        continue;
519 <      }
520 <      loop = FALSE;
521 <
522 <      enext = 0;
523 <      t_id = smTriangulate_add_tri(sm,id0,id1,id2,eprev,e2,&enext);
524 <      *add_ptr = push_data(*add_ptr,t_id);
525 <
526 <      LIST_NEXT(prev) = LIST_NEXT(l);
527 <      LIST_DATA(prev) = eprev = -enext;
528 <      LIST_NEXT(l)=NULL;
529 <      if(l== plist)
530 <        plist = prev;
531 <      free_list(l);
532 <      l = prev;
306 >      else
307 >        is_convex = FALSE;
308 >      VCOPY(v0,v1);
309        VCOPY(v1,v2);
310 +      id0 = id1;
311        id1 = id2;
312 +      e1 = e2;  
313 +      /* check if gone around circular list without adding any
314 +         triangles: prevent infinite loop */
315 +      if(l == plist)
316 +      {
317 +        if(LIST_NEXT(LIST_NEXT(l)) == prev)
318 +          {/* Check if have a triangle */
319 +            is_tri = TRUE;      
320 +            break;
321 +          }
322 +
323 +        if(is_convex)
324 +          break;
325 +        if(!cut)
326 +        {
327 + #ifdef DEBUG
328 +          eputs("smTriangulate():Unable to triangulate\n");
329 + #endif
330 +         free_list(l);
331 +          while(*add_ptr)
332 +          {
333 +            t_id = pop_list(add_ptr);
334 +            smDelete_tri(sm,t_id);
335 +          }
336 +          return(FALSE);
337 +         }
338 +        
339 +        cut = FALSE;
340 +        is_convex = TRUE;
341 +      }
342 +      prev = l;
343      }
344      if(is_tri)
345      {
346        l = LIST_NEXT(l);
347 <      enext = (int)LIST_DATA(l);
348 <      t_id = smTriangulate_add_tri(sm,id0,id1,id2,eprev,e2,&enext);
347 >      enew = (int)LIST_DATA(l);
348 >      t_id = smTriangulate_add_tri(sm,id0,id1,id2,e1,e2,&enew);
349        *add_ptr = push_data(*add_ptr,t_id);
350        free_list(l);
351 <     }
351 >    }
352      else
353 <      {
546 < #ifdef DEBUG      
547 <        eputs("smTriangulate_elist()Unable to triangulate\n");
548 < #endif
353 >      if(!smTriangulateConvex(sm,l,add_ptr))
354          return(FALSE);
550 –      }
551 –    return(TRUE);
552 – }
355  
356 < int
357 < smTriangulate(sm,p_id,plist,add_ptr)
556 < SM *sm;
557 < int p_id;
558 < LIST *plist,**add_ptr;
559 < {
560 <    int e,id_t0,id_t1,e0,e1;
561 <    int test;
562 <
563 <    test = smTriangulate_elist_new(sm,p_id,plist,add_ptr);
564 < #if 0
565 <    test = smTriangulate_elist(sm,plist,add_ptr);
566 < #endif
567 <
568 <    if(!test)
569 <       return(test);
570 <
571 <    FOR_ALL_EDGES(e)
356 >    /* Set triangle adjacencies based on edge adjacencies */
357 >    FOR_ALL_EDGES(enew)
358      {
359 <        id_t0 = E_NTH_TRI(e,0);
360 <        id_t1 = E_NTH_TRI(e,1);
575 <        if((id_t0==INVALID) || (id_t1==INVALID))
576 <        {
577 < #ifdef DEBUG
578 <           eputs("smTriangulate(): Unassigned edge neighbor\n");
579 < #endif
580 <            continue;
581 <        }
359 >      id0 = E_NTH_TRI(enew,0);
360 >      id1 = E_NTH_TRI(enew,1);
361          
362 <        e0 = T_WHICH_V(SM_NTH_TRI(sm,id_t0),E_NTH_VERT(e,0));
363 <        T_NTH_NBR(SM_NTH_TRI(sm,id_t0),e0) = id_t1;
364 <
365 <        e1 = T_WHICH_V(SM_NTH_TRI(sm,id_t1),E_NTH_VERT(e,1));
366 <        T_NTH_NBR(SM_NTH_TRI(sm,id_t1),e1) = id_t0;
362 >      e1 = (T_WHICH_V(SM_NTH_TRI(sm,id0),E_NTH_VERT(enew,0))+2)%3;
363 >      T_NTH_NBR(SM_NTH_TRI(sm,id0),e1) = id1;
364 >      
365 >      e2 = (T_WHICH_V(SM_NTH_TRI(sm,id1),E_NTH_VERT(enew,1))+2)%3;
366 >      T_NTH_NBR(SM_NTH_TRI(sm,id1),e2) = id0;
367      }
368 <    return(test);
368 >    return(TRUE);
369   }
370  
371   eIn_tri(e,t)
# Line 601 | Line 380 | TRI *t;
380        return(T_NTH_V(t,0)==E_NTH_VERT(e,1)||T_NTH_V(t,2)==E_NTH_VERT(e,1));
381      else if(T_NTH_V(t,2)==E_NTH_VERT(e,0))
382        return(T_NTH_V(t,0)==E_NTH_VERT(e,1)||T_NTH_V(t,1)==E_NTH_VERT(e,1));
383 +
384    return(FALSE);
385   }
386  
387 < smFix_edges(sm,add_list,delptr)
387 > /* Test the new set of triangles for Delaunay condition. 'Edges' contains
388 >   all of the new edges added. The CCW triangle assoc with each edge is
389 >   tested against the opposite vertex of the CW triangle. If the vertex
390 >   lies inside the circle defined by the CCW triangle- the edge is swapped
391 >   for the opposite diagonal
392 > */
393 > smFixEdges(sm,add_list)
394     SM *sm;
395     LIST *add_list;
610 –   QUADTREE *delptr;
611 –
396   {
397      int e,t0_id,t1_id,e_new,e0,e1,e0_next,e1_next;
398      int i,v0_id,v1_id,v2_id,p_id,t0_nid,t1_nid;
399      FVECT v0,v1,v2,p,np,v;
400 +    TRI *t0,*t1;
401  
402      FOR_ALL_EDGES(e)
403      {
# Line 621 | Line 406 | smFix_edges(sm,add_list,delptr)
406          if((t0_id==INVALID) || (t1_id==INVALID))
407          {
408   #ifdef DEBUG
409 <            eputs("smFix_edges: Unassigned edge nbr\n");
409 >            error(CONSISTENCY,"smFix_edges: Unassigned edge nbr\n");
410   #endif
626 –            continue;
411          }
412 <        e0 = T_WHICH_V(SM_NTH_TRI(sm,t0_id),E_NTH_VERT(e,0));
413 <        e1 = T_WHICH_V(SM_NTH_TRI(sm,t1_id),E_NTH_VERT(-e,0));
414 <        e0_next = (e0+2)%3;
415 <        e1_next = (e1+2)%3;
412 >        t0 = SM_NTH_TRI(sm,t0_id);
413 >        t1 = SM_NTH_TRI(sm,t1_id);
414 >        e0 = T_NTH_NBR_PTR(t1_id,t0);
415 >        e1 = T_NTH_NBR_PTR(t0_id,t1);
416 >
417          v0_id = E_NTH_VERT(e,0);
418          v1_id = E_NTH_VERT(e,1);
419 <        v2_id = T_NTH_V(SM_NTH_TRI(sm,t0_id),e0_next);
420 <        p_id = T_NTH_V(SM_NTH_TRI(sm,t1_id),e1_next);
419 >        v2_id = T_NTH_V(t0,e0);
420 >        p_id = T_NTH_V(t1,e1);
421  
422          smDir_in_cone(sm,v0,v0_id);
423          smDir_in_cone(sm,v1,v1_id);
# Line 642 | Line 427 | smFix_edges(sm,add_list,delptr)
427          VSUB(p,p,SM_VIEW_CENTER(sm));
428          if(point_in_cone(p,v0,v1,v2))
429          {
430 <           smTris_swap_edge(sm,t0_id,t1_id,e0,e1,&t0_nid,&t1_nid,&add_list,
646 <                            delptr);
430 >           smTris_swap_edge(sm,t0_id,t1_id,e0,e1,&t0_nid,&t1_nid,&add_list);
431              
432 +           /* Adjust the triangle pointers of the remaining edges to be
433 +              processed
434 +            */
435              FOR_ALL_EDGES_FROM(e,i)
436              {
437                if(E_NTH_TRI(i,0)==t0_id || E_NTH_TRI(i,0)==t1_id)
# Line 672 | Line 459 | smFix_edges(sm,add_list,delptr)
459              SET_E_NTH_TRI(e_new,1,t1_id);
460          }
461      }
462 <    smUpdate_locator(sm,add_list,qtqueryset(*delptr));
462 >    /* Add/Delete the appropriate triangles from the stree */
463 >    smUpdate_locator(sm,add_list);
464   }
465  
466 + /* Remove vertex "id" from the mesh- and retriangulate the resulting
467 +   hole: Returns TRUE if successful, FALSE otherwise.
468 + */
469   int
470 < smMesh_remove_vertex(sm,id)
470 > smRemoveVertex(sm,id)
471     SM *sm;
472     int id;
473   {
474 <    int t_id;
475 <    LIST *elist,*add_list;
476 <    int cnt,debug;
477 <    QUADTREE delnode;
478 <    /* generate list of vertices that form the boundary of the
479 <       star polygon formed by vertex id and all of its adjacent
689 <       triangles
474 >    LIST *b_list,*add_list,*del_list;
475 >    int t_id,i;
476 >    static int cnt=0;
477 >    OBJECT *optr,*os;
478 >    /* generate list of edges that form the boundary of the
479 >       polygon formed by the triangles adjacent to vertex 'id'
480       */
481 <    eClear_edges();
482 <    elist = smVertex_star_polygon(sm,id,&delnode);
481 >    del_list = NULL;
482 >    b_list = smVertexPolygon(sm,id,&del_list);
483  
484 <    if(!elist)
484 >    add_list = NULL;
485 >    /* Triangulate polygonal hole  */
486 >    if(!smTriangulate(sm,id,b_list,&add_list))
487      {
488 < #ifdef DEBUG
697 <      eputs("smMesh_remove_vertex(): Unable to remove vertex");
698 < #endif
699 <      qtfreeleaf(delnode);
488 >      free_list(del_list);
489        return(FALSE);
490      }
491 <    add_list = NULL;
703 <    /* Triangulate spherical polygon */
704 <    if(!smTriangulate(sm,id,elist,&add_list))
491 >    else
492      {
493 <      while(add_list)
493 > #ifdef DEBUG
494 >      b_list = del_list;
495 >      while(b_list)
496        {
497 <        t_id = pop_list(&add_list);
498 <        smDelete_tri(sm,t_id);
497 >        t_id = LIST_DATA(b_list);
498 >        b_list = LIST_NEXT(b_list);
499 >        T_VALID_FLAG(SM_NTH_TRI(sm,t_id))=-1;
500        }
501 <      qtfreeleaf(delnode);
502 <      return(FALSE);
503 <    }
504 <    /* Fix up new triangles to be Delaunay */
505 <    smFix_edges(sm,add_list,&delnode);
501 > #endif
502 >      while(del_list)
503 >      {
504 >        t_id = pop_list(&del_list);
505 >        smDelete_tri(sm,t_id);
506 >      }    
507 >    }      
508 >    /* Fix up new triangles to be Delaunay-delnode contains set of
509 >     triangles to delete,add_list is the set of new triangles to add
510 >     */
511 >    smFixEdges(sm,add_list);
512  
717 –    qtfreeleaf(delnode);
513      return(TRUE);
514   }
515    
516  
517  
518 <
518 >
519  
520  
521  

Diff Legend

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