1 |
|
#ifndef lint |
2 |
< |
static const char RCSid[] = "$Id$"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
4 |
|
/* |
5 |
|
* face.c - routines dealing with polygonal faces. |
25 |
|
*/ |
26 |
|
|
27 |
|
#ifdef SMLFLT |
28 |
< |
#define VERTEPS 1e-2 /* allowed vertex error */ |
28 |
> |
#define VERTEPS 1e-3 /* allowed vertex error */ |
29 |
|
#else |
30 |
< |
#define VERTEPS 1e-4 /* allowed vertex error */ |
30 |
> |
#define VERTEPS 1e-5 /* allowed vertex error */ |
31 |
|
#endif |
32 |
|
|
33 |
|
|
86 |
|
f->offset = DOT(f->norm, VERTEX(f,0)); |
87 |
|
for (i = 1; i < f->nv; i++) { |
88 |
|
d1 = DOT(f->norm, VERTEX(f,i)); |
89 |
< |
badvert += fabs(d1 - f->offset/i) > VERTEPS; |
89 |
> |
badvert += fabs(1.0 - d1*i/f->offset) > VERTEPS; |
90 |
|
f->offset += d1; |
91 |
|
} |
92 |
|
f->offset /= (double)f->nv; |
93 |
< |
if (badvert) |
93 |
> |
if (f->nv > 3 && badvert) |
94 |
|
objerror(o, WARNING, "non-planar vertex"); |
95 |
|
/* find axis */ |
96 |
|
f->ax = fabs(f->norm[0]) > fabs(f->norm[1]) ? 0 : 1; |
119 |
|
{ |
120 |
|
int ncross, n; |
121 |
|
double x, y; |
122 |
+ |
int tst; |
123 |
|
register int xi, yi; |
124 |
|
register FLOAT *p0, *p1; |
125 |
|
|
133 |
|
ncross = 0; |
134 |
|
/* positive x axis cross test */ |
135 |
|
while (n--) { |
136 |
< |
if ((p0[yi] > y) ^ (p1[yi] > y)) |
137 |
< |
if (p0[xi] > x && p1[xi] > x) |
136 |
> |
if ((p0[yi] > y) ^ (p1[yi] > y)) { |
137 |
> |
tst = (p0[xi] > x) + (p1[xi] > x); |
138 |
> |
if (tst == 2) |
139 |
|
ncross++; |
140 |
< |
else if (p0[xi] > x || p1[xi] > x) |
140 |
> |
else if (tst) |
141 |
|
ncross += (p1[yi] > p0[yi]) ^ |
142 |
|
((p0[yi]-y)*(p1[xi]-x) > |
143 |
|
(p0[xi]-x)*(p1[yi]-y)); |
144 |
+ |
} |
145 |
|
p0 = p1; |
146 |
|
p1 += 3; |
147 |
|
} |