9 |
|
|
10 |
|
#include "copyright.h" |
11 |
|
|
12 |
< |
#include "standard.h" |
13 |
< |
|
12 |
> |
#include <ctype.h> |
13 |
> |
#include "rtio.h" |
14 |
> |
#include "rtmath.h" |
15 |
> |
#include "paths.h" |
16 |
|
#include "view.h" |
17 |
|
|
16 |
– |
#include "paths.h" |
18 |
|
|
19 |
|
#define FEQ(x,y) (fabs((x)-(y)) <= FTINY) |
20 |
|
#define VEQ(v,w) (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \ |
22 |
|
|
23 |
|
VIEW stdview = STDVIEW; /* default view parameters */ |
24 |
|
|
25 |
+ |
static gethfunc gethview; |
26 |
|
|
27 |
+ |
|
28 |
|
char * |
29 |
< |
setview(v) /* set hvec and vvec, return message on error */ |
30 |
< |
register VIEW *v; |
29 |
> |
setview( /* set hvec and vvec, return message on error */ |
30 |
> |
VIEW *v |
31 |
> |
) |
32 |
|
{ |
33 |
|
static char ill_horiz[] = "illegal horizontal view size"; |
34 |
|
static char ill_vert[] = "illegal vertical view size"; |
35 |
|
|
36 |
< |
if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore)) |
36 |
> |
if ((v->vfore < -FTINY) | (v->vaft < -FTINY) || |
37 |
> |
(v->vaft > FTINY) & (v->vaft <= v->vfore)) |
38 |
|
return("illegal fore/aft clipping plane"); |
39 |
|
|
40 |
< |
if (normalize(v->vdir) == 0.0) /* normalize direction */ |
40 |
> |
if (v->vdist <= FTINY) |
41 |
> |
return("illegal view distance"); |
42 |
> |
v->vdist *= normalize(v->vdir); /* normalize direction */ |
43 |
> |
if (v->vdist == 0.0) |
44 |
|
return("zero view direction"); |
45 |
|
|
46 |
|
if (normalize(v->vup) == 0.0) /* normalize view up */ |
95 |
|
v->hn2 = 2.0 * sin(v->horiz*(PI/180.0/2.0)); |
96 |
|
v->vn2 = 2.0 * sin(v->vert*(PI/180.0/2.0)); |
97 |
|
break; |
98 |
+ |
case VT_PLS: /* planispheric fisheye */ |
99 |
+ |
if (v->horiz >= 360.0-FTINY) |
100 |
+ |
return(ill_horiz); |
101 |
+ |
if (v->vert >= 360.0-FTINY) |
102 |
+ |
return(ill_vert); |
103 |
+ |
v->hn2 = 2.*sin(v->horiz*(PI/180.0/2.0)) / |
104 |
+ |
(1.0 + cos(v->horiz*(PI/180.0/2.0))); |
105 |
+ |
v->vn2 = 2.*sin(v->vert*(PI/180.0/2.0)) / |
106 |
+ |
(1.0 + cos(v->vert*(PI/180.0/2.0))); |
107 |
+ |
break; |
108 |
|
default: |
109 |
|
return("unknown view type"); |
110 |
|
} |
111 |
< |
if (v->type != VT_ANG) { |
111 |
> |
if (v->type != VT_ANG && v->type != VT_PLS) { |
112 |
|
if (v->type != VT_CYL) { |
113 |
|
v->hvec[0] *= v->hn2; |
114 |
|
v->hvec[1] *= v->hn2; |
126 |
|
|
127 |
|
|
128 |
|
void |
129 |
< |
normaspect(va, ap, xp, yp) /* fix pixel aspect or resolution */ |
130 |
< |
double va; /* view aspect ratio */ |
131 |
< |
double *ap; /* pixel aspect in (or out if 0) */ |
132 |
< |
int *xp, *yp; /* x and y resolution in (or out if *ap!=0) */ |
129 |
> |
normaspect( /* fix pixel aspect or resolution */ |
130 |
> |
double va, /* view aspect ratio */ |
131 |
> |
double *ap, /* pixel aspect in (or out if 0) */ |
132 |
> |
int *xp, |
133 |
> |
int *yp /* x and y resolution in (or out if *ap!=0) */ |
134 |
> |
) |
135 |
|
{ |
136 |
|
if (*ap <= FTINY) |
137 |
|
*ap = va * *xp / *yp; /* compute pixel aspect */ |
143 |
|
|
144 |
|
|
145 |
|
double |
146 |
< |
viewray(orig, direc, v, x, y) /* compute ray origin and direction */ |
147 |
< |
FVECT orig, direc; |
148 |
< |
register VIEW *v; |
149 |
< |
double x, y; |
146 |
> |
viewray( /* compute ray origin and direction */ |
147 |
> |
FVECT orig, |
148 |
> |
FVECT direc, |
149 |
> |
VIEW *v, |
150 |
> |
double x, |
151 |
> |
double y |
152 |
> |
) |
153 |
|
{ |
154 |
|
double d, z; |
155 |
|
|
170 |
|
direc[0] = v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; |
171 |
|
direc[1] = v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; |
172 |
|
direc[2] = v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; |
173 |
< |
orig[0] = v->vp[0] + v->vfore*direc[0]; |
151 |
< |
orig[1] = v->vp[1] + v->vfore*direc[1]; |
152 |
< |
orig[2] = v->vp[2] + v->vfore*direc[2]; |
173 |
> |
VSUM(orig, v->vp, direc, v->vfore); |
174 |
|
d = normalize(direc); |
175 |
|
return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0); |
176 |
|
case VT_HEM: /* hemispherical fisheye */ |
181 |
|
direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; |
182 |
|
direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; |
183 |
|
direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; |
184 |
< |
orig[0] = v->vp[0] + v->vfore*direc[0]; |
164 |
< |
orig[1] = v->vp[1] + v->vfore*direc[1]; |
165 |
< |
orig[2] = v->vp[2] + v->vfore*direc[2]; |
184 |
> |
VSUM(orig, v->vp, direc, v->vfore); |
185 |
|
return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0); |
186 |
|
case VT_CYL: /* cylindrical panorama */ |
187 |
|
d = x * v->horiz * (PI/180.0); |
190 |
|
direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; |
191 |
|
direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; |
192 |
|
direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; |
193 |
< |
orig[0] = v->vp[0] + v->vfore*direc[0]; |
175 |
< |
orig[1] = v->vp[1] + v->vfore*direc[1]; |
176 |
< |
orig[2] = v->vp[2] + v->vfore*direc[2]; |
193 |
> |
VSUM(orig, v->vp, direc, v->vfore); |
194 |
|
d = normalize(direc); |
195 |
|
return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0); |
196 |
|
case VT_ANG: /* angular fisheye */ |
197 |
< |
x *= v->horiz/180.0; |
198 |
< |
y *= v->vert/180.0; |
197 |
> |
x *= (1.0/180.0)*v->horiz; |
198 |
> |
y *= (1.0/180.0)*v->vert; |
199 |
|
d = x*x + y*y; |
200 |
|
if (d > 1.0) |
201 |
|
return(-1.0); |
202 |
|
d = sqrt(d); |
203 |
|
z = cos(PI*d); |
204 |
< |
d = d <= FTINY ? PI : sqrt(1 - z*z)/d; |
204 |
> |
d = d <= FTINY ? PI : sqrt(1.0 - z*z)/d; |
205 |
|
x *= d; |
206 |
|
y *= d; |
207 |
|
direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; |
208 |
|
direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; |
209 |
|
direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; |
210 |
< |
orig[0] = v->vp[0] + v->vfore*direc[0]; |
194 |
< |
orig[1] = v->vp[1] + v->vfore*direc[1]; |
195 |
< |
orig[2] = v->vp[2] + v->vfore*direc[2]; |
210 |
> |
VSUM(orig, v->vp, direc, v->vfore); |
211 |
|
return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0); |
212 |
+ |
case VT_PLS: /* planispheric fisheye */ |
213 |
+ |
x *= sqrt(v->hn2); |
214 |
+ |
y *= sqrt(v->vn2); |
215 |
+ |
d = x*x + y*y; |
216 |
+ |
z = (1. - d)/(1. + d); |
217 |
+ |
x *= (1. + z); |
218 |
+ |
y *= (1. + z); |
219 |
+ |
direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; |
220 |
+ |
direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; |
221 |
+ |
direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; |
222 |
+ |
VSUM(orig, v->vp, direc, v->vfore); |
223 |
+ |
return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0); |
224 |
|
} |
225 |
|
return(-1.0); |
226 |
|
} |
227 |
|
|
228 |
|
|
229 |
|
void |
230 |
< |
viewloc(ip, v, p) /* find image location for point */ |
231 |
< |
FVECT ip; |
232 |
< |
register VIEW *v; |
233 |
< |
FVECT p; |
230 |
> |
viewloc( /* find image location for point */ |
231 |
> |
FVECT ip, |
232 |
> |
VIEW *v, |
233 |
> |
FVECT p |
234 |
> |
) |
235 |
|
{ |
236 |
|
double d, d2; |
237 |
|
FVECT disp; |
238 |
|
|
239 |
< |
disp[0] = p[0] - v->vp[0]; |
212 |
< |
disp[1] = p[1] - v->vp[1]; |
213 |
< |
disp[2] = p[2] - v->vp[2]; |
239 |
> |
VSUB(disp, p, v->vp); |
240 |
|
|
241 |
|
switch (v->type) { |
242 |
|
case VT_PAR: /* parallel view */ |
285 |
|
ip[0] += 180.0/v->horiz; |
286 |
|
return; |
287 |
|
} |
288 |
< |
d = acos(d)/PI / sqrt(1.0 - d*d); |
289 |
< |
ip[0] += DOT(disp,v->hvec)*d*180.0/v->horiz; |
290 |
< |
ip[1] += DOT(disp,v->vvec)*d*180.0/v->vert; |
288 |
> |
d = (180.0/PI)*acos(d) / sqrt(1.0 - d*d); |
289 |
> |
ip[0] += DOT(disp,v->hvec)*d/v->horiz; |
290 |
> |
ip[1] += DOT(disp,v->vvec)*d/v->vert; |
291 |
|
return; |
292 |
+ |
case VT_PLS: /* planispheric fisheye */ |
293 |
+ |
ip[0] = 0.5 - v->hoff; |
294 |
+ |
ip[1] = 0.5 - v->voff; |
295 |
+ |
ip[2] = normalize(disp) - v->vfore; |
296 |
+ |
d = DOT(disp,v->vdir); |
297 |
+ |
if (d >= 1.0-FTINY) |
298 |
+ |
return; |
299 |
+ |
if (d <= -(1.0-FTINY)) |
300 |
+ |
return; /* really an error */ |
301 |
+ |
ip[0] += DOT(disp,v->hvec)/((1. + d)*sqrt(v->hn2)); |
302 |
+ |
ip[1] += DOT(disp,v->vvec)/((1. + d)*sqrt(v->vn2)); |
303 |
+ |
return; |
304 |
|
} |
305 |
|
ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff; |
306 |
|
ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff; |
308 |
|
|
309 |
|
|
310 |
|
void |
311 |
< |
pix2loc(loc, rp, px, py) /* compute image location from pixel pos. */ |
312 |
< |
RREAL loc[2]; |
313 |
< |
register RESOLU *rp; |
314 |
< |
int px, py; |
311 |
> |
pix2loc( /* compute image location from pixel pos. */ |
312 |
> |
RREAL loc[2], |
313 |
> |
RESOLU *rp, |
314 |
> |
int px, |
315 |
> |
int py |
316 |
> |
) |
317 |
|
{ |
318 |
< |
register int x, y; |
318 |
> |
int x, y; |
319 |
|
|
320 |
|
if (rp->rt & YMAJOR) { |
321 |
|
x = px; |
334 |
|
|
335 |
|
|
336 |
|
void |
337 |
< |
loc2pix(pp, rp, lx, ly) /* compute pixel pos. from image location */ |
338 |
< |
int pp[2]; |
339 |
< |
register RESOLU *rp; |
340 |
< |
double lx, ly; |
337 |
> |
loc2pix( /* compute pixel pos. from image location */ |
338 |
> |
int pp[2], |
339 |
> |
RESOLU *rp, |
340 |
> |
double lx, |
341 |
> |
double ly |
342 |
> |
) |
343 |
|
{ |
344 |
< |
register int x, y; |
344 |
> |
int x, y; |
345 |
|
|
346 |
< |
x = lx * rp->xr; |
347 |
< |
y = ly * rp->yr; |
346 |
> |
x = (int)(lx*rp->xr + .5 - (lx < 0.0)); |
347 |
> |
y = (int)(ly*rp->yr + .5 - (ly < 0.0)); |
348 |
> |
|
349 |
|
if (rp->rt & XDECR) |
350 |
|
x = rp->xr-1 - x; |
351 |
|
if (rp->rt & YDECR) |
361 |
|
|
362 |
|
|
363 |
|
int |
364 |
< |
getviewopt(v, ac, av) /* process view argument */ |
365 |
< |
register VIEW *v; |
366 |
< |
int ac; |
367 |
< |
register char *av[]; |
364 |
> |
getviewopt( /* process view argument */ |
365 |
> |
VIEW *v, |
366 |
> |
int ac, |
367 |
> |
char *av[] |
368 |
> |
) |
369 |
|
{ |
370 |
|
#define check(c,l) if ((av[0][c]&&av[0][c]!=' ') || \ |
371 |
|
badarg(ac-1,av+1,l)) return(-1) |
390 |
|
v->vdir[0] = atof(av[1]); |
391 |
|
v->vdir[1] = atof(av[2]); |
392 |
|
v->vdir[2] = atof(av[3]); |
393 |
+ |
v->vdist = 1.; |
394 |
|
return(3); |
395 |
|
case 'u': /* up */ |
396 |
|
check(3,"fff"); |
430 |
|
|
431 |
|
|
432 |
|
int |
433 |
< |
sscanview(vp, s) /* get view parameters from string */ |
434 |
< |
VIEW *vp; |
435 |
< |
register char *s; |
433 |
> |
sscanview( /* get view parameters from string */ |
434 |
> |
VIEW *vp, |
435 |
> |
char *s |
436 |
> |
) |
437 |
|
{ |
438 |
|
int ac; |
439 |
|
char *av[4]; |
440 |
|
int na; |
441 |
|
int nvopts = 0; |
442 |
|
|
443 |
< |
while (*s == ' ') |
444 |
< |
s++; |
445 |
< |
if (*s != '-') |
400 |
< |
s = sskip2(s,1); |
443 |
> |
while (isspace(*s)) |
444 |
> |
if (!*s++) |
445 |
> |
return(0); |
446 |
|
while (*s) { |
447 |
|
ac = 0; |
448 |
|
do { |
449 |
|
if (ac || *s == '-') |
450 |
|
av[ac++] = s; |
451 |
< |
while (*s && *s != ' ') |
451 |
> |
while (*s && !isspace(*s)) |
452 |
|
s++; |
453 |
< |
while (*s == ' ') |
453 |
> |
while (isspace(*s)) |
454 |
|
s++; |
455 |
|
} while (*s && ac < 4); |
456 |
|
if ((na = getviewopt(vp, ac, av)) >= 0) { |
465 |
|
|
466 |
|
|
467 |
|
void |
468 |
< |
fprintview(vp, fp) /* write out view parameters */ |
469 |
< |
register VIEW *vp; |
470 |
< |
FILE *fp; |
468 |
> |
fprintview( /* write out view parameters */ |
469 |
> |
VIEW *vp, |
470 |
> |
FILE *fp |
471 |
> |
) |
472 |
|
{ |
473 |
|
fprintf(fp, " -vt%c", vp->type); |
474 |
|
fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]); |
475 |
< |
fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
475 |
> |
fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist, |
476 |
> |
vp->vdir[1]*vp->vdist, |
477 |
> |
vp->vdir[2]*vp->vdist); |
478 |
|
fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]); |
479 |
|
fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert); |
480 |
|
fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft); |
483 |
|
|
484 |
|
|
485 |
|
char * |
486 |
< |
viewopt(vp) /* translate to minimal view string */ |
487 |
< |
register VIEW *vp; |
486 |
> |
viewopt( /* translate to minimal view string */ |
487 |
> |
VIEW *vp |
488 |
> |
) |
489 |
|
{ |
490 |
|
static char vwstr[128]; |
491 |
< |
register char *cp = vwstr; |
491 |
> |
char *cp = vwstr; |
492 |
|
|
493 |
+ |
*cp = '\0'; |
494 |
|
if (vp->type != stdview.type) { |
495 |
|
sprintf(cp, " -vt%c", vp->type); |
496 |
|
cp += strlen(cp); |
500 |
|
vp->vp[0], vp->vp[1], vp->vp[2]); |
501 |
|
cp += strlen(cp); |
502 |
|
} |
503 |
< |
if (!VEQ(vp->vdir,stdview.vdir)) { |
503 |
> |
if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) { |
504 |
|
sprintf(cp, " -vd %.6g %.6g %.6g", |
505 |
< |
vp->vdir[0], vp->vdir[1], vp->vdir[2]); |
505 |
> |
vp->vdir[0]*vp->vdist, |
506 |
> |
vp->vdir[1]*vp->vdist, |
507 |
> |
vp->vdir[2]*vp->vdist); |
508 |
|
cp += strlen(cp); |
509 |
|
} |
510 |
|
if (!VEQ(vp->vup,stdview.vup)) { |
541 |
|
|
542 |
|
|
543 |
|
int |
544 |
< |
isview(s) /* is this a view string? */ |
545 |
< |
char *s; |
544 |
> |
isview( /* is this a view string? */ |
545 |
> |
char *s |
546 |
> |
) |
547 |
|
{ |
548 |
< |
static char *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL}; |
548 |
> |
static char *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL}; |
549 |
|
extern char *progname; |
550 |
< |
register char *cp; |
551 |
< |
register char **an; |
550 |
> |
char *cp; |
551 |
> |
char **an; |
552 |
|
/* add program name to list */ |
553 |
|
if (altname[0] == NULL) { |
554 |
|
for (cp = progname; *cp; cp++) |
577 |
|
|
578 |
|
|
579 |
|
static int |
580 |
< |
gethview(s, v) /* get view from header */ |
581 |
< |
char *s; |
582 |
< |
register struct myview *v; |
580 |
> |
gethview( /* get view from header */ |
581 |
> |
char *s, |
582 |
> |
void *v |
583 |
> |
) |
584 |
|
{ |
585 |
< |
if (isview(s) && sscanview(v->hv, s) > 0) |
586 |
< |
v->ok++; |
585 |
> |
if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0) |
586 |
> |
((struct myview*)v)->ok++; |
587 |
|
return(0); |
588 |
|
} |
589 |
|
|
590 |
|
|
591 |
|
int |
592 |
< |
viewfile(fname, vp, rp) /* get view from file */ |
593 |
< |
char *fname; |
594 |
< |
VIEW *vp; |
595 |
< |
RESOLU *rp; |
592 |
> |
viewfile( /* get view from file */ |
593 |
> |
char *fname, |
594 |
> |
VIEW *vp, |
595 |
> |
RESOLU *rp |
596 |
> |
) |
597 |
|
{ |
598 |
|
struct myview mvs; |
599 |
|
FILE *fp; |
606 |
|
mvs.hv = vp; |
607 |
|
mvs.ok = 0; |
608 |
|
|
609 |
< |
getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs); |
609 |
> |
getheader(fp, gethview, &mvs); |
610 |
|
|
611 |
|
if (rp != NULL && !fgetsresolu(rp, fp)) |
612 |
|
mvs.ok = 0; |