231 |
|
FVECT ip, |
232 |
|
VIEW *v, |
233 |
|
FVECT p |
234 |
< |
) /* returns: Good=1, Bad=0, Behind=-1, OutOfFrame=2, Behind+OOF=-2 */ |
234 |
> |
) /* Use VL_* flags to interpret return value */ |
235 |
|
{ |
236 |
+ |
int rflags = VL_GOOD; |
237 |
|
double d, d2; |
238 |
|
FVECT disp; |
239 |
|
|
245 |
|
break; |
246 |
|
case VT_PER: /* perspective view */ |
247 |
|
d = DOT(disp,v->vdir); |
248 |
+ |
if ((v->vaft > FTINY) & (d >= v->vaft)) |
249 |
+ |
rflags |= VL_BEYOND; |
250 |
|
ip[2] = VLEN(disp); |
251 |
|
if (d < -FTINY) { /* fold pyramid */ |
252 |
|
ip[2] = -ip[2]; |
253 |
|
d = -d; |
254 |
|
} else if (d <= FTINY) |
255 |
< |
return(0); /* at infinite edge */ |
255 |
> |
return(VL_BAD); /* at infinite edge */ |
256 |
|
d = 1.0/d; |
257 |
|
disp[0] *= d; |
258 |
|
disp[1] *= d; |
274 |
|
ip[0] = 180.0/PI * atan2(d,d2) / v->horiz + 0.5 - v->hoff; |
275 |
|
d = d*d + d2*d2; |
276 |
|
if (d <= FTINY*FTINY) |
277 |
< |
return(0); /* at pole */ |
277 |
> |
return(VL_BAD); /* at pole */ |
278 |
> |
if ((v->vaft > FTINY) & (d >= v->vaft*v->vaft)) |
279 |
> |
rflags |= VL_BEYOND; |
280 |
|
d = 1.0/sqrt(d); |
281 |
|
ip[1] = DOT(disp,v->vvec)*d/v->vn2 + 0.5 - v->voff; |
282 |
|
ip[2] = VLEN(disp); |
305 |
|
if (d >= 1.0-FTINY) |
306 |
|
goto gotall; |
307 |
|
if (d <= -(1.0-FTINY)) |
308 |
< |
return(0); |
308 |
> |
return(VL_BAD); |
309 |
|
ip[0] += DOT(disp,v->hvec)/((1. + d)*sqrt(v->hn2)); |
310 |
|
ip[1] += DOT(disp,v->vvec)/((1. + d)*sqrt(v->vn2)); |
311 |
|
goto gotall; |
312 |
+ |
default: |
313 |
+ |
return(VL_BAD); |
314 |
|
} |
315 |
|
ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff; |
316 |
|
ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff; |
317 |
< |
gotall: /* compute return value */ |
318 |
< |
return( (1 - 2*(ip[2] <= 0.0)) * (1 + |
319 |
< |
((0.0 >= ip[0]) | (ip[0] >= 1.0) | (0.0 >= ip[1]) | (ip[1] >= 1.0))) ); |
317 |
> |
gotall: /* add appropriate return flags */ |
318 |
> |
if (ip[2] <= 0.0) |
319 |
> |
rflags |= VL_BEHIND; |
320 |
> |
else if ((v->type != VT_PER) & (v->type != VT_CYL)) |
321 |
> |
rflags |= VL_BEYOND*((v->vaft > FTINY) & |
322 |
> |
(ip[2] >= v->vaft - v->vfore)); |
323 |
> |
rflags |= VL_OUTSIDE*((0.0 >= ip[0]) | (ip[0] >= 1.0) | |
324 |
> |
(0.0 >= ip[1]) | (ip[1] >= 1.0)); |
325 |
> |
return(rflags); |
326 |
|
} |
327 |
|
|
328 |
|
|
386 |
|
char *av[] |
387 |
|
) |
388 |
|
{ |
389 |
< |
#define check(c,l) if ((av[0][c]&&av[0][c]!=' ') || \ |
389 |
> |
#define check(c,l) if ((av[0][c]&&!isspace(av[0][c])) || \ |
390 |
|
badarg(ac-1,av+1,l)) return(-1) |
391 |
|
|
392 |
|
if (ac <= 0 || av[0][0] != '-' || av[0][1] != 'v') |
393 |
|
return(-1); |
394 |
|
switch (av[0][2]) { |
395 |
|
case 't': /* type */ |
396 |
< |
if (!av[0][3] || av[0][3]==' ') |
396 |
> |
if (!av[0][3] || isspace(av[0][3])) |
397 |
|
return(-1); |
398 |
|
check(4,""); |
399 |
|
v->type = av[0][3]; |
578 |
|
} |
579 |
|
/* skip leading path */ |
580 |
|
cp = s; |
581 |
< |
while (*cp && *cp != ' ') |
581 |
> |
while (*cp && !isspace(*cp)) |
582 |
|
cp++; |
583 |
|
while (cp > s && !ISDIRSEP(cp[-1])) |
584 |
|
cp--; |