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.9 by gwlarson, Tue Jan 5 16:52:37 1999 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 88 | Line 47 | int t_id;
47       to id because the vertices can no longer
48       point to tri id as being the first triangle pointer
49    */
50 +  SM_SAMPLE_TRIS(sm)--;
51    if(!SM_IS_NTH_T_BASE(sm,t_id))
52    {
53 <    SM_SAMPLE_TRIS(sm)--;
53 >
54 > #if 0
55      if(SM_IS_NTH_T_NEW(sm,t_id))
56        smNew_tri_cnt--;
57 + #endif
58    }
59    smClear_tri_flags(sm,t_id);
60  
# Line 121 | Line 83 | memerr:
83    error(SYSTEM,"eNew_edge(): Unable to allocate memory");
84   }
85  
86 + /* Return list of edges defining polygon formed by boundary of triangles
87 + adjacent to id. Return set of triangles adjacent to id to delete in delptr
88 + */
89   LIST
90 < *smVertex_star_polygon(sm,id,delptr)
90 > *smVertexPolygon(sm,id,del_ptr)
91   SM *sm;
92   int id;
93 < QUADTREE *delptr;
93 > LIST **del_ptr;
94   {
95      TRI *tri,*t_next;
96      LIST *elist,*end;
97 <    int t_id,v_next,t_next_id;
133 <    int e;
134 <    OBJECT del_set[2];
97 >    int e,t_id,v_next,t_next_id,b_id,v_id;
98  
99 +    eClear_edges();
100      elist = end =  NULL;
101 +
102      /* Get the first triangle adjacent to vertex id */
103      t_id = SM_NTH_VERT(sm,id);
104      tri = SM_NTH_TRI(sm,t_id);
105  
106 <    if((e = eNew_edge()) == INVALID)
107 <      return(NULL);
108 <
109 <    v_next = (T_WHICH_V(tri,id)+1)%3;
110 <    SET_E_NTH_VERT(e,0,T_NTH_V(tri,v_next));
106 >    e = eNew_edge();
107 >    /* Get the  next vertex on the polygon boundary */
108 >    v_id = T_WHICH_V(tri,id);
109 >    b_id = (v_id + 1)%3;
110 >    /* Create an edge */
111 >    SET_E_NTH_VERT(e,0,T_NTH_V(tri,b_id));
112      SET_E_NTH_TRI(e,0,INVALID);
113 <    SET_E_NTH_TRI(e,1,T_NTH_NBR(tri,v_next));
114 <    v_next = (T_WHICH_V(tri,id)+2)%3;
115 <    SET_E_NTH_VERT(e,1,T_NTH_V(tri,v_next));
113 >    SET_E_NTH_TRI(e,1,T_NTH_NBR(tri,v_id));
114 >    v_next = T_NTH_V(tri,(b_id+1)%3);
115 >    SET_E_NTH_VERT(e,1,v_next);
116      elist = add_data_to_circular_list(elist,&end,e);
151 –
117      t_next_id = t_id;
118      t_next = tri;
119  
120 <    del_set[0] =1; del_set[1] = t_id;
121 <    *delptr = qtnewleaf(del_set);
120 >    *del_ptr = push_data(*del_ptr,t_id);
121 >    /* Create a set to hold all of the triangles for deletion later */
122  
123 <    while((t_next_id = T_NTH_NBR(t_next,v_next)) != t_id)
124 <    {  
125 <      if((e = eNew_edge()) == INVALID)
161 <        return(NULL);
162 <
123 >    while((t_next_id = T_NTH_NBR(t_next,b_id)) != t_id)
124 >    {
125 >      e = eNew_edge();
126        t_next = SM_NTH_TRI(sm,t_next_id);
127 <      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));
127 >      SET_E_NTH_VERT(e,0,v_next);
128        SET_E_NTH_TRI(e,0,INVALID);
129 <      SET_E_NTH_TRI(e,1,T_NTH_NBR(t_next,v_next));
130 <      v_next = (T_WHICH_V(t_next,id)+2)%3;
131 <      SET_E_NTH_VERT(e,1,T_NTH_V(t_next,v_next));
129 >      v_id = T_WHICH_V(t_next,id);
130 >      b_id = (v_id + 1)%3;
131 >      SET_E_NTH_TRI(e,1,T_NTH_NBR(t_next,v_id));
132 >      v_next = T_NTH_V(t_next,(b_id+1)%3);
133 >      SET_E_NTH_VERT(e,1,v_next);
134        elist = add_data_to_circular_list(elist,&end,e);
135 <
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);
135 >      *del_ptr = push_data(*del_ptr,t_next_id);
136      }
137      return(elist);
138   }
139  
140 +
141   int
142 < smEdge_intersect_polygon(sm,v0,v1,l)
142 > smTriangulate_add_tri(sm,id0,id1,id2,e0,e1,e2ptr)
143   SM *sm;
144 < FVECT v0,v1;
192 < LIST *l;
144 > int id0,id1,id2,e0,e1,*e2ptr;
145   {
146 <    FVECT e0,e1;
147 <    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;
146 >  int t_id;
147 >  int e2;
148  
149 <    while(el)
150 <    {
151 <      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");
149 > #ifdef DEBUG
150 >  if(id0 == INVALID || id1==INVALID || id2==INVALID)
151 >    error(CONSISTENCY,"bad id- smTriangulate_add_tri()\n");
152   #endif
153 <         return(FALSE);
154 <     }
155 <    SET_E_NTH_VERT(new_e,0,id0);
156 <    SET_E_NTH_VERT(new_e,1,id_new);
157 <    SET_E_NTH_TRI(new_e,0,INVALID);
158 <    SET_E_NTH_TRI(new_e,1,INVALID);
159 <    
160 <    while(e2 != id_new)
161 <    {
162 <        lptr = LIST_NEXT(lptr);
163 <        e = (int)LIST_DATA(lptr);
164 <        e2 = E_NTH_VERT(e,1);
165 <        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 <        }
153 >  t_id = smAdd_tri(sm,id0,id1,id2);
154 >  if(*e2ptr == 0)
155 >  {
156 >    e2 = eNew_edge();
157 >    SET_E_NTH_VERT(e2,0,id2);
158 >    SET_E_NTH_VERT(e2,1,id0);
159 >  }
160 >  else
161 >    e2 = *e2ptr;
162 >  /* set appropriate tri for each edge*/
163 >  SET_E_NTH_TRI(e0,0,t_id);
164 >  SET_E_NTH_TRI(e1,0,t_id);
165 >  SET_E_NTH_TRI(e2,0,t_id);
166  
167 <    }
168 <    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);
167 >  *e2ptr = e2;
168 >  return(t_id);
169   }
170  
324 –
171   int
172 < smTriangulate_convex(sm,plist,add_ptr)
172 > smTriangulateConvex(sm,plist,add_ptr)
173   SM *sm;
174   LIST *plist,**add_ptr;
175   {
176      int t_id,e_id0,e_id1,e_id2;
177      int v_id0,v_id1,v_id2;
178      LIST *lptr;
333 –    int cnt;
179  
180      lptr = plist;
181      e_id0 = (int)LIST_DATA(lptr);
# Line 341 | Line 186 | LIST *plist,**add_ptr;
186          e_id1 = (int)LIST_DATA(lptr);
187          v_id1 = E_NTH_VERT(e_id1,0);
188          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 –
189          lptr = LIST_NEXT(lptr);
190  
191 <        if(LIST_NEXT(lptr) != plist)
192 <        {
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 <        }
191 >        if(LIST_NEXT(lptr) != plist)    
192 >          e_id2 = 0;
193          else
194             e_id2 = (int)LIST_DATA(lptr);
195 <        
196 <        /* 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 <
195 >        t_id = smTriangulate_add_tri(sm,v_id0,v_id1,v_id2,e_id0,e_id1,&e_id2);
196 >        *add_ptr = push_data(*add_ptr,t_id);
197          e_id0 = -e_id2;
198      }
199      free_list(plist);
200      return(TRUE);
201   }
202 < int
203 < smTriangulate_elist(sm,plist,add_ptr)
204 < 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");
202 > #ifdef TEST_DRIVER
203 > FVECT Norm[500],B_V[500];
204 > int Ncnt,Bcnt,Del=0;
205   #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 – }
206  
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;
207  
208 <  t_id = smAdd_tri(sm,id0,id1,id2);
209 <  if(*e2ptr == 0)
210 <  {
211 <    e2 = eNew_edge();
212 <    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);
208 > /* Triangulate the polygon defined by plist, and generating vertex p_id.
209 >   Return list of added triangles in list add_ptr. Returns TRUE if
210 >   successful, FALSE otherwise. This is NOT a general triangulation routine,
211 >   assumes polygon star relative to id
212 > */
213  
452 –  *e2ptr = e2;
453 –  return(t_id);
454 – }
214   int
215 < smTriangulate_elist_new(sm,id,plist,add_ptr)
215 > smTriangulate(sm,id,plist,add_ptr)
216   SM *sm;
217   int id;
218   LIST *plist,**add_ptr;
219   {
220      LIST *l,*prev,*t;
221      FVECT v0,v1,v2,n,p;
222 <    int is_tri,loop,t_id,id0,id1,id2,e2,eprev,enext;
222 >    int is_tri,is_convex,cut,t_id,id0,id1,id2,e2,e1,enew;
223      double dp;
224 +    static int debug=0;
225  
226 <    smDir(sm,p,id);
227 <    enext=0;
228 <    is_tri= loop = FALSE;
226 >    VSUB(p,SM_NTH_WV(sm,id),SM_VIEW_CENTER(sm));
227 >    enew = 0;
228 >    is_convex = TRUE;
229 >    cut = is_tri= FALSE;
230      l = prev = plist;
231 <    /* get v0,v1,v2 */
232 <    eprev = (int)LIST_DATA(l);
233 <    id0 = E_NTH_VERT(eprev,0);
234 <    id1 = E_NTH_VERT(eprev,1);
235 <    smDir(sm,v0,id0);
236 <    smDir(sm,v1,id1);  
231 >
232 >    /* get v0,v1 */
233 >    e1 = (int)LIST_DATA(l);
234 >    id0 = E_NTH_VERT(e1,0);
235 >    id1 = E_NTH_VERT(e1,1);
236 >    VSUB(v0,SM_NTH_WV(sm,id0),SM_VIEW_CENTER(sm));
237 >    VSUB(v1,SM_NTH_WV(sm,id1),SM_VIEW_CENTER(sm));  
238 > #ifdef TEST_DRIVER
239 >    Del = TRUE;
240 >    VCOPY(B_V[0],v0);
241 >    VCOPY(B_V[1],v1);
242 >    Bcnt = 2;
243 >    Ncnt = 0;
244 > #endif
245      while(l)
246      {
247        l = LIST_NEXT(l);
248 +      /* Get v2 */
249        e2 = (int)LIST_DATA(l);
250        id2 = E_NTH_VERT(e2,1);
251 <      /* Check if have a triangle */
251 >      VSUB(v2,SM_NTH_WV(sm,id2),SM_VIEW_CENTER(sm));
252 > #ifdef TEST_DRIVER
253 >      VCOPY(B_V[Bcnt++],v2);
254 > #endif
255        if(LIST_NEXT(LIST_NEXT(l)) == prev)
256 <      {
257 <        is_tri = TRUE;
258 <        break;
256 >      {/* Check if have a triangle */
257 >           is_tri = TRUE;      
258 >           break;
259        }
260 <      if(LIST_NEXT(l) == plist)
260 >
261 >      /* determine if v0-v1-v2 is convex:defined clockwise on the sphere-
262 >       so switch orientation
263 >       */
264 >      if(convex_angle(v2,v1,v0))
265        {
266 <        if(!loop)
267 <          loop = 1;
268 <        else
269 <          loop++;
270 <        if(loop > 3)
271 <          break;
266 >          /* test if safe to cut off v0-v1-v2 by testing if p lies outside of
267 >         triangle v0-v1-v2: if so, because plist is the star polygon around p,
268 >          the new edge v2-v0 cannot intersect any existing edges
269 >        */
270 >        VCROSS(n,v0,v2);
271 >        dp = DOT(n,p);
272 >        if(dp  <= 0.0)
273 >        {
274 >            /* remove edges e1,e2 and add triangle id0,id1,id2 */
275 >          enew = 0;
276 >          t_id = smTriangulate_add_tri(sm,id0,id1,id2,e1,e2,&enew);
277 >          cut = TRUE;
278 >          *add_ptr = push_data(*add_ptr,t_id);
279 >           /* Insert edge enew into the list, reuse prev list element */
280 >          LIST_NEXT(prev) = LIST_NEXT(l);
281 >          LIST_DATA(prev) = e1 = -enew;
282 >           /* If removing head of list- reset plist pointer */
283 >          if(l== plist)
284 >            plist = prev;
285 >          /* free list element for e2 */
286 >          LIST_NEXT(l)=NULL;
287 >          free_list(l);
288 >          l = prev;
289 >          VCOPY(v1,v2);
290 >          id1 = id2;
291 >          continue;
292 >        }
293        }
294 <      smDir(sm,v2,id2);
295 <      /* determine if convex (left turn), or concave(right turn) angle */
296 <      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;
294 >      else
295 >        is_convex = FALSE;
296 >      VCOPY(v0,v1);
297        VCOPY(v1,v2);
298 +      id0 = id1;
299        id1 = id2;
300 +      e1 = e2;  
301 +      /* check if gone around circular list without adding any
302 +         triangles: prevent infinite loop */
303 +      if(l == plist)
304 +      {
305 +        if(LIST_NEXT(LIST_NEXT(l)) == prev)
306 +          {/* Check if have a triangle */
307 +            is_tri = TRUE;      
308 +            break;
309 +          }
310 +
311 +        if(is_convex)
312 +          break;
313 +        if(!cut)
314 +        {
315 + #ifdef DEBUG
316 +          eputs("smTriangulate():Unable to triangulate\n");
317 + #endif
318 +         free_list(l);
319 +          while(*add_ptr)
320 +          {
321 +            t_id = pop_list(add_ptr);
322 +            smDelete_tri(sm,t_id);
323 +          }
324 +          return(FALSE);
325 +         }
326 +        
327 +        cut = FALSE;
328 +        is_convex = TRUE;
329 +      }
330 +      prev = l;
331      }
332      if(is_tri)
333      {
334        l = LIST_NEXT(l);
335 <      enext = (int)LIST_DATA(l);
336 <      t_id = smTriangulate_add_tri(sm,id0,id1,id2,eprev,e2,&enext);
335 >      enew = (int)LIST_DATA(l);
336 >      t_id = smTriangulate_add_tri(sm,id0,id1,id2,e1,e2,&enew);
337        *add_ptr = push_data(*add_ptr,t_id);
338        free_list(l);
339 <     }
339 >    }
340      else
341 <      {
546 < #ifdef DEBUG      
547 <        eputs("smTriangulate_elist()Unable to triangulate\n");
548 < #endif
341 >      if(!smTriangulateConvex(sm,l,add_ptr))
342          return(FALSE);
550 –      }
551 –    return(TRUE);
552 – }
343  
344 < int
345 < 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)
344 >    /* Set triangle adjacencies based on edge adjacencies */
345 >    FOR_ALL_EDGES(enew)
346      {
347 <        id_t0 = E_NTH_TRI(e,0);
348 <        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 <        }
347 >      id0 = E_NTH_TRI(enew,0);
348 >      id1 = E_NTH_TRI(enew,1);
349          
350 <        e0 = T_WHICH_V(SM_NTH_TRI(sm,id_t0),E_NTH_VERT(e,0));
351 <        T_NTH_NBR(SM_NTH_TRI(sm,id_t0),e0) = id_t1;
352 <
353 <        e1 = T_WHICH_V(SM_NTH_TRI(sm,id_t1),E_NTH_VERT(e,1));
354 <        T_NTH_NBR(SM_NTH_TRI(sm,id_t1),e1) = id_t0;
350 >      e1 = (T_WHICH_V(SM_NTH_TRI(sm,id0),E_NTH_VERT(enew,0))+2)%3;
351 >      T_NTH_NBR(SM_NTH_TRI(sm,id0),e1) = id1;
352 >      
353 >      e2 = (T_WHICH_V(SM_NTH_TRI(sm,id1),E_NTH_VERT(enew,1))+2)%3;
354 >      T_NTH_NBR(SM_NTH_TRI(sm,id1),e2) = id0;
355      }
356 <    return(test);
356 >    return(TRUE);
357   }
358  
359   eIn_tri(e,t)
# Line 601 | Line 368 | TRI *t;
368        return(T_NTH_V(t,0)==E_NTH_VERT(e,1)||T_NTH_V(t,2)==E_NTH_VERT(e,1));
369      else if(T_NTH_V(t,2)==E_NTH_VERT(e,0))
370        return(T_NTH_V(t,0)==E_NTH_VERT(e,1)||T_NTH_V(t,1)==E_NTH_VERT(e,1));
371 +
372    return(FALSE);
373   }
374  
375 < smFix_edges(sm,add_list,delptr)
375 > /* Test the new set of triangles for Delaunay condition. 'Edges' contains
376 >   all of the new edges added. The CCW triangle assoc with each edge is
377 >   tested against the opposite vertex of the CW triangle. If the vertex
378 >   lies inside the circle defined by the CCW triangle- the edge is swapped
379 >   for the opposite diagonal
380 > */
381 > smFixEdges(sm,add_list)
382     SM *sm;
383     LIST *add_list;
610 –   QUADTREE *delptr;
611 –
384   {
385      int e,t0_id,t1_id,e_new,e0,e1,e0_next,e1_next;
386      int i,v0_id,v1_id,v2_id,p_id,t0_nid,t1_nid;
387      FVECT v0,v1,v2,p,np,v;
388 +    TRI *t0,*t1;
389  
390      FOR_ALL_EDGES(e)
391      {
# Line 621 | Line 394 | smFix_edges(sm,add_list,delptr)
394          if((t0_id==INVALID) || (t1_id==INVALID))
395          {
396   #ifdef DEBUG
397 <            eputs("smFix_edges: Unassigned edge nbr\n");
397 >            error(CONSISTENCY,"smFix_edges: Unassigned edge nbr\n");
398   #endif
626 –            continue;
399          }
400 <        e0 = T_WHICH_V(SM_NTH_TRI(sm,t0_id),E_NTH_VERT(e,0));
401 <        e1 = T_WHICH_V(SM_NTH_TRI(sm,t1_id),E_NTH_VERT(-e,0));
402 <        e0_next = (e0+2)%3;
403 <        e1_next = (e1+2)%3;
400 >        t0 = SM_NTH_TRI(sm,t0_id);
401 >        t1 = SM_NTH_TRI(sm,t1_id);
402 >        e0 = T_NTH_NBR_PTR(t1_id,t0);
403 >        e1 = T_NTH_NBR_PTR(t0_id,t1);
404 >
405          v0_id = E_NTH_VERT(e,0);
406          v1_id = E_NTH_VERT(e,1);
407 <        v2_id = T_NTH_V(SM_NTH_TRI(sm,t0_id),e0_next);
408 <        p_id = T_NTH_V(SM_NTH_TRI(sm,t1_id),e1_next);
407 >        v2_id = T_NTH_V(t0,e0);
408 >        p_id = T_NTH_V(t1,e1);
409  
410          smDir_in_cone(sm,v0,v0_id);
411          smDir_in_cone(sm,v1,v1_id);
# Line 642 | Line 415 | smFix_edges(sm,add_list,delptr)
415          VSUB(p,p,SM_VIEW_CENTER(sm));
416          if(point_in_cone(p,v0,v1,v2))
417          {
418 <           smTris_swap_edge(sm,t0_id,t1_id,e0,e1,&t0_nid,&t1_nid,&add_list,
646 <                            delptr);
418 >           smTris_swap_edge(sm,t0_id,t1_id,e0,e1,&t0_nid,&t1_nid,&add_list);
419              
420 +           /* Adjust the triangle pointers of the remaining edges to be
421 +              processed
422 +            */
423              FOR_ALL_EDGES_FROM(e,i)
424              {
425                if(E_NTH_TRI(i,0)==t0_id || E_NTH_TRI(i,0)==t1_id)
# Line 672 | Line 447 | smFix_edges(sm,add_list,delptr)
447              SET_E_NTH_TRI(e_new,1,t1_id);
448          }
449      }
450 <    smUpdate_locator(sm,add_list,qtqueryset(*delptr));
450 >    /* Add/Delete the appropriate triangles from the stree */
451 >    smUpdate_locator(sm,add_list);
452   }
453  
454 + /* Remove vertex "id" from the mesh- and retriangulate the resulting
455 +   hole: Returns TRUE if successful, FALSE otherwise.
456 + */
457   int
458 < smMesh_remove_vertex(sm,id)
458 > smRemoveVertex(sm,id)
459     SM *sm;
460     int id;
461   {
462 <    int t_id;
463 <    LIST *elist,*add_list;
464 <    int cnt,debug;
465 <    QUADTREE delnode;
466 <    /* generate list of vertices that form the boundary of the
467 <       star polygon formed by vertex id and all of its adjacent
689 <       triangles
462 >    LIST *b_list,*add_list,*del_list;
463 >    int t_id,i;
464 >    static int cnt=0;
465 >    OBJECT *optr,*os;
466 >    /* generate list of edges that form the boundary of the
467 >       polygon formed by the triangles adjacent to vertex 'id'
468       */
469 <    eClear_edges();
470 <    elist = smVertex_star_polygon(sm,id,&delnode);
469 >    del_list = NULL;
470 >    b_list = smVertexPolygon(sm,id,&del_list);
471  
472 <    if(!elist)
472 >    add_list = NULL;
473 >    /* Triangulate polygonal hole  */
474 >    if(!smTriangulate(sm,id,b_list,&add_list))
475      {
476 < #ifdef DEBUG
697 <      eputs("smMesh_remove_vertex(): Unable to remove vertex");
698 < #endif
699 <      qtfreeleaf(delnode);
476 >      free_list(del_list);
477        return(FALSE);
478      }
479 <    add_list = NULL;
703 <    /* Triangulate spherical polygon */
704 <    if(!smTriangulate(sm,id,elist,&add_list))
479 >    else
480      {
481 <      while(add_list)
481 > #ifdef DEBUG
482 >      b_list = del_list;
483 >      while(b_list)
484        {
485 <        t_id = pop_list(&add_list);
486 <        smDelete_tri(sm,t_id);
485 >        t_id = LIST_DATA(b_list);
486 >        b_list = LIST_NEXT(b_list);
487 >        T_VALID_FLAG(SM_NTH_TRI(sm,t_id))=-1;
488        }
489 <      qtfreeleaf(delnode);
490 <      return(FALSE);
491 <    }
492 <    /* Fix up new triangles to be Delaunay */
493 <    smFix_edges(sm,add_list,&delnode);
489 > #endif
490 >      while(del_list)
491 >      {
492 >        t_id = pop_list(&del_list);
493 >        smDelete_tri(sm,t_id);
494 >      }    
495 >    }      
496 >    /* Fix up new triangles to be Delaunay-delnode contains set of
497 >     triangles to delete,add_list is the set of new triangles to add
498 >     */
499 >    smFixEdges(sm,add_list);
500  
717 –    qtfreeleaf(delnode);
501      return(TRUE);
502   }
503    
504  
505  
506 <
506 >
507  
508  
509  

Diff Legend

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