| 9 |
|
|
| 10 |
|
#include "copyright.h" |
| 11 |
|
|
| 12 |
< |
#include "standard.h" |
| 13 |
< |
|
| 12 |
> |
#include "rtio.h" |
| 13 |
> |
#include "rtmath.h" |
| 14 |
> |
#include "paths.h" |
| 15 |
|
#include "view.h" |
| 16 |
|
|
| 16 |
– |
#include "paths.h" |
| 17 |
|
|
| 18 |
|
#define FEQ(x,y) (fabs((x)-(y)) <= FTINY) |
| 19 |
|
#define VEQ(v,w) (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \ |
| 21 |
|
|
| 22 |
|
VIEW stdview = STDVIEW; /* default view parameters */ |
| 23 |
|
|
| 24 |
+ |
static gethfunc gethview; |
| 25 |
|
|
| 26 |
+ |
|
| 27 |
|
char * |
| 28 |
|
setview(v) /* set hvec and vvec, return message on error */ |
| 29 |
|
register VIEW *v; |
| 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 */ |
| 274 |
|
|
| 275 |
|
void |
| 276 |
|
pix2loc(loc, rp, px, py) /* compute image location from pixel pos. */ |
| 277 |
< |
FLOAT loc[2]; |
| 277 |
> |
RREAL loc[2]; |
| 278 |
|
register RESOLU *rp; |
| 279 |
|
int px, py; |
| 280 |
|
{ |
| 397 |
|
int na; |
| 398 |
|
int nvopts = 0; |
| 399 |
|
|
| 400 |
+ |
while (*s == ' ') |
| 401 |
+ |
s++; |
| 402 |
|
if (*s != '-') |
| 403 |
|
s = sskip2(s,1); |
| 404 |
|
while (*s) { |
| 405 |
|
ac = 0; |
| 406 |
|
do { |
| 407 |
< |
av[ac++] = s; |
| 407 |
> |
if (ac || *s == '-') |
| 408 |
> |
av[ac++] = s; |
| 409 |
|
while (*s && *s != ' ') |
| 410 |
|
s++; |
| 411 |
|
while (*s == ' ') |
| 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)) { |
| 499 |
|
isview(s) /* is this a view string? */ |
| 500 |
|
char *s; |
| 501 |
|
{ |
| 502 |
< |
static char *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL}; |
| 502 |
> |
static char *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL}; |
| 503 |
|
extern char *progname; |
| 504 |
|
register char *cp; |
| 505 |
|
register char **an; |
| 531 |
|
|
| 532 |
|
|
| 533 |
|
static int |
| 534 |
< |
gethview(s, v) /* get view from header */ |
| 535 |
< |
char *s; |
| 536 |
< |
register struct myview *v; |
| 534 |
> |
gethview( /* get view from header */ |
| 535 |
> |
char *s, |
| 536 |
> |
void *v |
| 537 |
> |
) |
| 538 |
|
{ |
| 539 |
< |
if (isview(s) && sscanview(v->hv, s) > 0) |
| 540 |
< |
v->ok++; |
| 539 |
> |
if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0) |
| 540 |
> |
((struct myview*)v)->ok++; |
| 541 |
|
return(0); |
| 542 |
|
} |
| 543 |
|
|
| 559 |
|
mvs.hv = vp; |
| 560 |
|
mvs.ok = 0; |
| 561 |
|
|
| 562 |
< |
getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs); |
| 562 |
> |
getheader(fp, gethview, &mvs); |
| 563 |
|
|
| 564 |
|
if (rp != NULL && !fgetsresolu(rp, fp)) |
| 565 |
|
mvs.ok = 0; |
