10 |
|
#include "copyright.h" |
11 |
|
|
12 |
|
#include "rtio.h" |
13 |
+ |
#include "rtmath.h" |
14 |
|
#include "paths.h" |
15 |
|
#include "view.h" |
16 |
|
|
34 |
|
if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore)) |
35 |
|
return("illegal fore/aft clipping plane"); |
36 |
|
|
37 |
< |
if (normalize(v->vdir) == 0.0) /* normalize direction */ |
37 |
> |
if (v->vdist <= FTINY) |
38 |
> |
return("illegal view distance"); |
39 |
> |
v->vdist *= normalize(v->vdir); /* normalize direction */ |
40 |
> |
if (v->vdist == 0.0) |
41 |
|
return("zero view direction"); |
42 |
|
|
43 |
|
if (normalize(v->vup) == 0.0) /* normalize view up */ |
351 |
|
v->vdir[0] = atof(av[1]); |
352 |
|
v->vdir[1] = atof(av[2]); |
353 |
|
v->vdir[2] = atof(av[3]); |
354 |
+ |
v->vdist = 1.; |
355 |
|
return(3); |
356 |
|
case 'u': /* up */ |
357 |
|
check(3,"fff"); |
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); |
458 |
|
vp->vp[0], vp->vp[1], vp->vp[2]); |
459 |
|
cp += strlen(cp); |
460 |
|
} |
461 |
< |
if (!VEQ(vp->vdir,stdview.vdir)) { |
461 |
> |
if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) { |
462 |
|
sprintf(cp, " -vd %.6g %.6g %.6g", |
463 |
< |
vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
463 |
> |
vp->vdir[0]*vp->vdist, |
464 |
> |
vp->vdir[1]*vp->vdist, |
465 |
> |
vp->vdir[2]*vp->vdist); |
466 |
|
cp += strlen(cp); |
467 |
|
} |
468 |
|
if (!VEQ(vp->vup,stdview.vup)) { |