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 */ |
349 |
|
v->vdir[0] = atof(av[1]); |
350 |
|
v->vdir[1] = atof(av[2]); |
351 |
|
v->vdir[2] = atof(av[3]); |
352 |
+ |
v->vdist = 1.; |
353 |
|
return(3); |
354 |
|
case 'u': /* up */ |
355 |
|
check(3,"fff"); |
398 |
|
int na; |
399 |
|
int nvopts = 0; |
400 |
|
|
401 |
< |
while (*s && *s != ' ') |
401 |
> |
while (*s == ' ') |
402 |
|
s++; |
403 |
+ |
if (*s != '-') |
404 |
+ |
s = sskip2(s,1); |
405 |
|
while (*s) { |
406 |
|
ac = 0; |
407 |
|
do { |
408 |
< |
av[ac++] = s; |
408 |
> |
if (ac || *s == '-') |
409 |
> |
av[ac++] = s; |
410 |
|
while (*s && *s != ' ') |
411 |
|
s++; |
412 |
|
while (*s == ' ') |
430 |
|
{ |
431 |
|
fprintf(fp, " -vt%c", vp->type); |
432 |
|
fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]); |
433 |
< |
fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
433 |
> |
fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist, |
434 |
> |
vp->vdir[1]*vp->vdist, |
435 |
> |
vp->vdir[2]*vp->vdist); |
436 |
|
fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]); |
437 |
|
fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert); |
438 |
|
fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft); |
456 |
|
vp->vp[0], vp->vp[1], vp->vp[2]); |
457 |
|
cp += strlen(cp); |
458 |
|
} |
459 |
< |
if (!VEQ(vp->vdir,stdview.vdir)) { |
459 |
> |
if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) { |
460 |
|
sprintf(cp, " -vd %.6g %.6g %.6g", |
461 |
< |
vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
461 |
> |
vp->vdir[0]*vp->vdist, |
462 |
> |
vp->vdir[1]*vp->vdist, |
463 |
> |
vp->vdir[2]*vp->vdist); |
464 |
|
cp += strlen(cp); |
465 |
|
} |
466 |
|
if (!VEQ(vp->vup,stdview.vup)) { |
500 |
|
isview(s) /* is this a view string? */ |
501 |
|
char *s; |
502 |
|
{ |
503 |
< |
static char *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL}; |
503 |
> |
static char *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL}; |
504 |
|
extern char *progname; |
505 |
|
register char *cp; |
506 |
|
register char **an; |
532 |
|
|
533 |
|
|
534 |
|
static int |
535 |
< |
gethview(s, v) /* get view from header */ |
536 |
< |
char *s; |
537 |
< |
register struct myview *v; |
535 |
> |
gethview( /* get view from header */ |
536 |
> |
char *s, |
537 |
> |
void *v |
538 |
> |
) |
539 |
|
{ |
540 |
< |
if (isview(s) && sscanview(v->hv, s) > 0) |
541 |
< |
v->ok++; |
540 |
> |
if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0) |
541 |
> |
((struct myview*)v)->ok++; |
542 |
|
return(0); |
543 |
|
} |
544 |
|
|
560 |
|
mvs.hv = vp; |
561 |
|
mvs.ok = 0; |
562 |
|
|
563 |
< |
getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs); |
563 |
> |
getheader(fp, gethview, &mvs); |
564 |
|
|
565 |
|
if (rp != NULL && !fgetsresolu(rp, fp)) |
566 |
|
mvs.ok = 0; |