| 9 |
|
|
| 10 |
|
#include "copyright.h" |
| 11 |
|
|
| 12 |
+ |
#include <ctype.h> |
| 13 |
|
#include "rtio.h" |
| 14 |
|
#include "rtmath.h" |
| 15 |
|
#include "paths.h" |
| 35 |
|
if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore)) |
| 36 |
|
return("illegal fore/aft clipping plane"); |
| 37 |
|
|
| 38 |
< |
if (normalize(v->vdir) == 0.0) /* normalize direction */ |
| 38 |
> |
if (v->vdist <= FTINY) |
| 39 |
> |
return("illegal view distance"); |
| 40 |
> |
v->vdist *= normalize(v->vdir); /* normalize direction */ |
| 41 |
> |
if (v->vdist == 0.0) |
| 42 |
|
return("zero view direction"); |
| 43 |
|
|
| 44 |
|
if (normalize(v->vup) == 0.0) /* normalize view up */ |
| 352 |
|
v->vdir[0] = atof(av[1]); |
| 353 |
|
v->vdir[1] = atof(av[2]); |
| 354 |
|
v->vdir[2] = atof(av[3]); |
| 355 |
+ |
v->vdist = 1.; |
| 356 |
|
return(3); |
| 357 |
|
case 'u': /* up */ |
| 358 |
|
check(3,"fff"); |
| 401 |
|
int na; |
| 402 |
|
int nvopts = 0; |
| 403 |
|
|
| 404 |
< |
while (*s == ' ') |
| 405 |
< |
s++; |
| 406 |
< |
if (*s != '-') |
| 402 |
< |
s = sskip2(s,1); |
| 404 |
> |
while (isspace(*s)) |
| 405 |
> |
if (!*s++) |
| 406 |
> |
return(0); |
| 407 |
|
while (*s) { |
| 408 |
|
ac = 0; |
| 409 |
|
do { |
| 410 |
|
if (ac || *s == '-') |
| 411 |
|
av[ac++] = s; |
| 412 |
< |
while (*s && *s != ' ') |
| 412 |
> |
while (*s && !isspace(*s)) |
| 413 |
|
s++; |
| 414 |
< |
while (*s == ' ') |
| 414 |
> |
while (isspace(*s)) |
| 415 |
|
s++; |
| 416 |
|
} while (*s && ac < 4); |
| 417 |
|
if ((na = getviewopt(vp, ac, av)) >= 0) { |
| 432 |
|
{ |
| 433 |
|
fprintf(fp, " -vt%c", vp->type); |
| 434 |
|
fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]); |
| 435 |
< |
fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
| 435 |
> |
fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist, |
| 436 |
> |
vp->vdir[1]*vp->vdist, |
| 437 |
> |
vp->vdir[2]*vp->vdist); |
| 438 |
|
fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]); |
| 439 |
|
fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert); |
| 440 |
|
fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft); |
| 449 |
|
static char vwstr[128]; |
| 450 |
|
register char *cp = vwstr; |
| 451 |
|
|
| 452 |
+ |
*cp = '\0'; |
| 453 |
|
if (vp->type != stdview.type) { |
| 454 |
|
sprintf(cp, " -vt%c", vp->type); |
| 455 |
|
cp += strlen(cp); |
| 459 |
|
vp->vp[0], vp->vp[1], vp->vp[2]); |
| 460 |
|
cp += strlen(cp); |
| 461 |
|
} |
| 462 |
< |
if (!VEQ(vp->vdir,stdview.vdir)) { |
| 462 |
> |
if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) { |
| 463 |
|
sprintf(cp, " -vd %.6g %.6g %.6g", |
| 464 |
< |
vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
| 464 |
> |
vp->vdir[0]*vp->vdist, |
| 465 |
> |
vp->vdir[1]*vp->vdist, |
| 466 |
> |
vp->vdir[2]*vp->vdist); |
| 467 |
|
cp += strlen(cp); |
| 468 |
|
} |
| 469 |
|
if (!VEQ(vp->vup,stdview.vup)) { |
