27 |
|
|
28 |
|
tri = SM_NTH_TRI(sm,id); |
29 |
|
/* Add to the free_list */ |
30 |
< |
|
30 |
> |
smClear_tri_flags(sm,id); |
31 |
|
T_NEXT_FREE(tri) = SM_FREE_TRIS(sm); |
32 |
|
SM_FREE_TRIS(sm) = id; |
33 |
|
T_VALID_FLAG(tri) = -1; |
47 |
|
to id because the vertices can no longer |
48 |
|
point to tri id as being the first triangle pointer |
49 |
|
*/ |
50 |
< |
if(!SM_IS_NTH_T_BASE(sm,t_id)) |
51 |
< |
{ |
52 |
< |
SM_SAMPLE_TRIS(sm)--; |
53 |
< |
if(SM_IS_NTH_T_NEW(sm,t_id)) |
54 |
< |
smNew_tri_cnt--; |
55 |
< |
} |
50 |
> |
SM_SAMPLE_TRIS(sm)--; |
51 |
> |
if(SM_IS_NTH_T_NEW(sm,t_id)) |
52 |
> |
smNew_tri_cnt--; |
53 |
> |
|
54 |
|
smClear_tri_flags(sm,t_id); |
55 |
|
|
56 |
|
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 |
57 |
|
} |
58 |
|
|
59 |
|
|
67 |
|
if(Ecnt >= Max_edges) |
68 |
|
{ |
69 |
|
if(Max_edges > 10000) |
70 |
< |
error(CONSISTENCY,"Too many edges in vertex loop\n"); |
70 |
> |
{ |
71 |
> |
eputs("Too many edges in vertex loop\n"); |
72 |
> |
return(-1); |
73 |
> |
} |
74 |
|
Max_edges += 100; |
75 |
|
if(!(Edges = (EDGE *)realloc(Edges,(Max_edges+1)*sizeof(EDGE)))) |
76 |
|
goto memerr; |
102 |
|
tri = SM_NTH_TRI(sm,t_id); |
103 |
|
|
104 |
|
e = eNew_edge(); |
105 |
+ |
|
106 |
|
/* Get the next vertex on the polygon boundary */ |
107 |
|
v_id = T_WHICH_V(tri,id); |
108 |
|
b_id = (v_id + 1)%3; |
122 |
|
while((t_next_id = T_NTH_NBR(t_next,b_id)) != t_id) |
123 |
|
{ |
124 |
|
e = eNew_edge(); |
125 |
+ |
if(e== INVALID) |
126 |
+ |
return(NULL); |
127 |
|
t_next = SM_NTH_TRI(sm,t_next_id); |
128 |
|
SET_E_NTH_VERT(e,0,v_next); |
129 |
|
SET_E_NTH_TRI(e,0,INVALID); |
469 |
|
*/ |
470 |
|
del_list = NULL; |
471 |
|
b_list = smVertexPolygon(sm,id,&del_list); |
472 |
< |
|
472 |
> |
if(!b_list) |
473 |
> |
{ |
474 |
> |
if(del_list) |
475 |
> |
free_list(del_list); |
476 |
> |
return(FALSE); |
477 |
> |
} |
478 |
|
add_list = NULL; |
479 |
|
/* Triangulate polygonal hole */ |
480 |
|
if(!smTriangulate(sm,id,b_list,&add_list)) |
484 |
|
} |
485 |
|
else |
486 |
|
{ |
493 |
– |
#ifdef DEBUG |
494 |
– |
b_list = del_list; |
495 |
– |
while(b_list) |
496 |
– |
{ |
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 |
– |
#endif |
487 |
|
while(del_list) |
488 |
|
{ |
489 |
|
t_id = pop_list(&del_list); |