| 32 |
|
static int lineno; /* current line number */ |
| 33 |
|
static int faceno; /* current face number */ |
| 34 |
|
|
| 35 |
< |
static int getstmt(char *av[MAXARG], FILE *fp); |
| 36 |
< |
static int cvtndx(VNDX vi, char *vs); |
| 37 |
< |
static int putface(int ac, char **av); |
| 35 |
> |
static int getstmt(char *av[MAXARG], FILE *fp); |
| 36 |
> |
static int cvtndx(VNDX vi, char *vs); |
| 37 |
> |
static int putface(int ac, char **av); |
| 38 |
|
static OBJECT getmod(void); |
| 39 |
< |
static int puttri(char *v1, char *v2, char *v3); |
| 39 |
> |
static int puttri(char *v1, char *v2, char *v3); |
| 40 |
|
static void freeverts(void); |
| 41 |
< |
static int newv(double x, double y, double z); |
| 42 |
< |
static int newvn(double x, double y, double z); |
| 43 |
< |
static int newvt(double x, double y); |
| 41 |
> |
static int newv(double x, double y, double z); |
| 42 |
> |
static int newvn(double x, double y, double z); |
| 43 |
> |
static int newvt(double x, double y); |
| 44 |
|
static void syntax(char *er); |
| 45 |
|
|
| 46 |
|
|
| 249 |
|
static int |
| 250 |
|
dominant_axis(char *v1, char *v2, char *v3) |
| 251 |
|
{ |
| 252 |
< |
int v1i = atoi(v1), v2i = atoi(v2), v3i = atoi(v3); |
| 252 |
> |
VNDX v1i, v2i, v3i; |
| 253 |
|
FVECT e1, e2, vn; |
| 254 |
|
int i, imax; |
| 255 |
|
|
| 256 |
< |
VSUB(e1, vlist[v2i], vlist[v1i]); |
| 257 |
< |
VSUB(e2, vlist[v3i], vlist[v2i]); |
| 256 |
> |
if (!cvtndx(v1i, v1) || !cvtndx(v2i, v2) || !cvtndx(v3i, v3)) |
| 257 |
> |
return(-1); |
| 258 |
> |
VSUB(e1, vlist[v2i[0]], vlist[v1i[0]]); |
| 259 |
> |
VSUB(e2, vlist[v3i[0]], vlist[v2i[0]]); |
| 260 |
|
VCROSS(vn, e1, e2); |
| 261 |
|
for (i = imax = 2; i--; ) |
| 262 |
|
if (vn[i]*vn[i] > vn[imax]*vn[imax]) |
| 263 |
|
imax = i; |
| 264 |
< |
return(vn[imax]*vn[imax] > FTINY ? imax : -1); |
| 264 |
> |
return(vn[imax]*vn[imax] > FTINY*FTINY*FTINY*FTINY ? imax : -1); |
| 265 |
|
} |
| 266 |
|
|
| 267 |
|
/* callback for triangle output from polygon */ |
| 279 |
|
char **av |
| 280 |
|
) |
| 281 |
|
{ |
| 282 |
< |
Vert2_list *poly = polyAlloc(ac); |
| 282 |
> |
Vert2_list *poly; |
| 283 |
|
int i, ax, ay; |
| 284 |
|
|
| 283 |
– |
if (poly == NULL) |
| 284 |
– |
return(0); |
| 285 |
– |
poly->p = (void *)av; |
| 285 |
|
for (i = ac-3; i >= 0; i--) /* identify dominant axis */ |
| 286 |
|
if ((ax = dominant_axis(av[i], av[i+1], av[i+2])) >= 0) |
| 287 |
|
break; |
| 288 |
|
if (ax < 0) |
| 289 |
+ |
return(1); /* ignore degenerate face */ |
| 290 |
+ |
poly = polyAlloc(ac); |
| 291 |
+ |
if (poly == NULL) |
| 292 |
|
return(0); |
| 293 |
+ |
poly->p = (void *)av; |
| 294 |
|
if (++ax >= 3) ax = 0; |
| 295 |
|
ay = ax; |
| 296 |
|
if (++ay >= 3) ay = 0; |
| 305 |
|
poly->v[i].mY = vlist[vi[0]][ay]; |
| 306 |
|
} |
| 307 |
|
/* break into triangles & output */ |
| 308 |
< |
if (!polyTriangulate(poly, &tri_out)) |
| 309 |
< |
return(0); |
| 308 |
> |
if (!polyTriangulate(poly, &tri_out)) { |
| 309 |
> |
sprintf(errmsg, "self-intersecting face with %d vertices", ac); |
| 310 |
> |
error(WARNING, errmsg); |
| 311 |
> |
} |
| 312 |
|
polyFree(poly); |
| 313 |
|
return(1); |
| 314 |
|
} |
| 469 |
|
char *er |
| 470 |
|
) |
| 471 |
|
{ |
| 472 |
< |
sprintf(errmsg, "%s: Wavefront syntax error near line %d: %s\n", |
| 472 |
> |
sprintf(errmsg, "%s: Wavefront syntax error near line %d: %s", |
| 473 |
|
inpfile, lineno, er); |
| 474 |
|
error(USER, errmsg); |
| 475 |
|
} |
