| 10 |
|
#include "copyright.h" |
| 11 |
|
|
| 12 |
|
#include "rtio.h" |
| 13 |
+ |
#include "rtmath.h" |
| 14 |
+ |
#include "paths.h" |
| 15 |
|
#include "view.h" |
| 16 |
|
|
| 17 |
|
|
| 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 |
> |
v->vdist *= normalize(v->vdir); /* normalize direction */ |
| 38 |
> |
if (v->vdist == 0.0) |
| 39 |
|
return("zero view direction"); |
| 40 |
|
|
| 41 |
|
if (normalize(v->vup) == 0.0) /* normalize view up */ |
| 429 |
|
{ |
| 430 |
|
fprintf(fp, " -vt%c", vp->type); |
| 431 |
|
fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]); |
| 432 |
< |
fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
| 432 |
> |
fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist, |
| 433 |
> |
vp->vdir[1]*vp->vdist, |
| 434 |
> |
vp->vdir[2]*vp->vdist); |
| 435 |
|
fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]); |
| 436 |
|
fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert); |
| 437 |
|
fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft); |
| 455 |
|
vp->vp[0], vp->vp[1], vp->vp[2]); |
| 456 |
|
cp += strlen(cp); |
| 457 |
|
} |
| 458 |
< |
if (!VEQ(vp->vdir,stdview.vdir)) { |
| 458 |
> |
if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) { |
| 459 |
|
sprintf(cp, " -vd %.6g %.6g %.6g", |
| 460 |
< |
vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
| 460 |
> |
vp->vdir[0]*vp->vdist, |
| 461 |
> |
vp->vdir[1]*vp->vdist, |
| 462 |
> |
vp->vdir[2]*vp->vdist); |
| 463 |
|
cp += strlen(cp); |
| 464 |
|
} |
| 465 |
|
if (!VEQ(vp->vup,stdview.vup)) { |
