46 |
|
char vbrtout[] = "lo"; |
47 |
|
char vcolexp[3][4] = {"re", "ge", "be"}; |
48 |
|
char vbrtexp[] = "le"; |
49 |
+ |
char vpixaspect[] = "pa"; |
50 |
|
|
51 |
< |
char vray[6][4] = {"Ox", "Oy", "Oz", "Dx", "Dy", "Dz"}; |
51 |
> |
char vray[7][4] = {"Ox", "Oy", "Oz", "Dx", "Dy", "Dz", "T"}; |
52 |
|
|
53 |
|
char vpsize[] = "S"; |
54 |
|
|
55 |
|
char vnfiles[] = "nfiles"; |
56 |
+ |
char vwhteff[] = "WE"; |
57 |
|
char vxmax[] = "xmax"; |
58 |
|
char vymax[] = "ymax"; |
59 |
|
char vxres[] = "xres"; |
250 |
|
} else if (iscolcor(s)) { /* color correction */ |
251 |
|
colcorval(ctmp, s); |
252 |
|
multcolor(input[nfiles].expos, ctmp); |
253 |
< |
} else if (isaspect(s)) { |
253 |
> |
} else if (isaspect(s)) |
254 |
|
input[nfiles].pa *= aspectval(s); |
255 |
< |
} else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0) |
255 |
> |
else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0) |
256 |
|
gotview++; |
257 |
|
/* echo line */ |
258 |
|
putchar('\t'); |
316 |
|
|
317 |
|
init() /* perform final setup */ |
318 |
|
{ |
319 |
< |
double l_colin(), l_expos(), l_ray(), l_psize(); |
319 |
> |
double l_colin(), l_expos(), l_pixaspect(), l_ray(), l_psize(); |
320 |
|
register int i; |
321 |
|
/* define constants */ |
322 |
|
varset(vnfiles, ':', (double)nfiles); |
329 |
|
} |
330 |
|
funset(vbrtexp, 1, ':', l_expos); |
331 |
|
funset(vbrtin, 1, '=', l_colin); |
332 |
< |
for (i = 0; i < 6; i++) |
332 |
> |
funset(vpixaspect, 1, ':', l_pixaspect); |
333 |
> |
for (i = 0; i < 7; i++) |
334 |
|
funset(vray[i], 1, '=', l_ray); |
335 |
|
funset(vpsize, 1, '=', l_psize); |
336 |
|
/* set brightness function */ |
337 |
< |
if (!strcmp(ourfmt, CIEFMT)) |
337 |
> |
if (!strcmp(ourfmt, CIEFMT)) { |
338 |
> |
varset(vwhteff, ':', 1.0); |
339 |
|
ourbright = xyz_bright; |
340 |
+ |
} else |
341 |
+ |
varset(vwhteff, ':', WHTEFFICACY); |
342 |
|
} |
343 |
|
|
344 |
|
|
449 |
|
|
450 |
|
|
451 |
|
double |
452 |
+ |
l_pixaspect() /* return pixel aspect ratio */ |
453 |
+ |
{ |
454 |
+ |
register int fn; |
455 |
+ |
|
456 |
+ |
fn = argument(1) - .5; |
457 |
+ |
if (fn < 0 || fn >= nfiles) |
458 |
+ |
return(1.0); |
459 |
+ |
return(input[fn].pa); |
460 |
+ |
} |
461 |
+ |
|
462 |
+ |
|
463 |
+ |
double |
464 |
|
l_colin(nam) /* return color value for picture */ |
465 |
|
register char *nam; |
466 |
|
{ |
468 |
|
register int n, xoff, yoff; |
469 |
|
double d; |
470 |
|
|
471 |
< |
d = argument(1); |
454 |
< |
if (d > -.5 && d < .5) |
455 |
< |
return((double)nfiles); |
456 |
< |
fn = d - .5; |
471 |
> |
fn = argument(1) - .5; |
472 |
|
if (fn < 0 || fn >= nfiles) { |
473 |
|
errno = EDOM; |
474 |
|
return(0.0); |
520 |
|
{ |
521 |
|
static unsigned long ltick[MAXINP]; |
522 |
|
static FVECT lorg[MAXINP], ldir[MAXINP]; |
523 |
+ |
static double ldist[MAXINP]; |
524 |
|
FLOAT loc[2]; |
509 |
– |
double d; |
525 |
|
int fn; |
526 |
|
register int i; |
527 |
|
|
528 |
< |
d = argument(1); |
514 |
< |
if (d > -.5 && d < .5) |
515 |
< |
return((double)nfiles); |
516 |
< |
fn = d - .5; |
528 |
> |
fn = argument(1) - .5; |
529 |
|
if (fn < 0 || fn >= nfiles) { |
530 |
|
errno = EDOM; |
531 |
|
return(0.0); |
537 |
|
errno = EDOM; |
538 |
|
else { |
539 |
|
pix2loc(loc, &input[fn].rs, xscan, ymax-1-yscan); |
540 |
< |
if (viewray(lorg[fn], ldir[fn], |
541 |
< |
&input[fn].vw, loc[0], loc[1]) < 0) |
530 |
< |
errno = ERANGE; |
531 |
< |
ltick[fn] = eclock; |
540 |
> |
ldist[fn] = viewray(lorg[fn], ldir[fn], |
541 |
> |
&input[fn].vw, loc[0], loc[1]); |
542 |
|
} |
543 |
+ |
ltick[fn] = eclock; |
544 |
|
} |
545 |
< |
i = 6; |
545 |
> |
if (nam == vray[i=6]) |
546 |
> |
return(ldist[fn]); |
547 |
|
while (i--) |
548 |
|
if (nam == vray[i]) |
549 |
|
return(i < 3 ? lorg[fn][i] : ldir[fn][i-3]); |
557 |
|
{ |
558 |
|
static unsigned long ltick[MAXINP]; |
559 |
|
static double psize[MAXINP]; |
560 |
< |
FVECT dir0, org1, dir1; |
561 |
< |
FLOAT loc[2]; |
560 |
> |
FVECT dir0, org, dirx, diry; |
561 |
> |
FLOAT locx[2], locy[2]; |
562 |
|
double d; |
563 |
|
int fn; |
564 |
+ |
register int i; |
565 |
|
|
566 |
|
d = argument(1); |
567 |
< |
if (d > -.5 && d < .5) |
555 |
< |
return((double)nfiles); |
556 |
< |
fn = d - .5; |
557 |
< |
if (fn < 0 || fn >= nfiles) { |
567 |
> |
if (d < .5 || d >= nfiles+.5) { |
568 |
|
errno = EDOM; |
569 |
|
return(0.0); |
570 |
|
} |
571 |
< |
if (ltick[fn] < eclock) /* need to compute? */ |
572 |
< |
if (input[fn].vw.type == 0 || input[fn].vw.type == VT_PAR) |
571 |
> |
fn = d - .5; |
572 |
> |
if (ltick[fn] < eclock) { /* need to compute? */ |
573 |
> |
psize[fn] = 0.0; |
574 |
> |
if (input[fn].vw.type == 0) |
575 |
|
errno = EDOM; |
576 |
< |
else { |
577 |
< |
errno = 0; |
578 |
< |
dir0[0] = funvalue(vray[3], 1, &d); |
579 |
< |
if (errno) |
580 |
< |
return(0.0); |
581 |
< |
dir0[1] = funvalue(vray[4], 1, &d); |
582 |
< |
if (errno) |
583 |
< |
return(0.0); |
584 |
< |
dir0[2] = funvalue(vray[5], 1, &d); |
585 |
< |
if (errno) |
574 |
< |
return(0.0); |
575 |
< |
pix2loc(loc, &input[fn].rs, xscan+1, ymax-yscan); |
576 |
< |
psize[fn] = 0.0; |
577 |
< |
if (viewray(org1, dir1, |
578 |
< |
&input[fn].vw, loc[0], loc[1]) < 0) |
579 |
< |
errno = ERANGE; |
580 |
< |
else { |
576 |
> |
else if (input[fn].vw.type != VT_PAR && |
577 |
> |
funvalue(vray[6], 1, &d) >= 0) { |
578 |
> |
for (i = 0; i < 3; i++) |
579 |
> |
dir0[i] = funvalue(vray[3+i], 1, &d); |
580 |
> |
pix2loc(locx, &input[fn].rs, xscan+1, ymax-1-yscan); |
581 |
> |
pix2loc(locy, &input[fn].rs, xscan, ymax-yscan); |
582 |
> |
if (viewray(org, dirx, &input[fn].vw, |
583 |
> |
locx[0], locx[1]) >= 0 && |
584 |
> |
viewray(org, diry, &input[fn].vw, |
585 |
> |
locy[0], locy[1]) >= 0) { |
586 |
|
/* approximate solid angle */ |
587 |
< |
psize[fn] = dist2(dir0, dir1) * input[fn].pa / |
588 |
< |
(1.0 + input[fn].pa*input[fn].pa); |
589 |
< |
ltick[fn] = eclock; |
587 |
> |
for (i = 0; i < 3; i++) { |
588 |
> |
dirx[i] -= dir0[i]; |
589 |
> |
diry[i] -= dir0[i]; |
590 |
> |
} |
591 |
> |
fcross(dir0, dirx, diry); |
592 |
> |
psize[fn] = 0.5 * sqrt(DOT(dir0,dir0)); |
593 |
|
} |
594 |
|
} |
595 |
+ |
ltick[fn] = eclock; |
596 |
+ |
} |
597 |
|
return(psize[fn]); |
598 |
|
} |
599 |
|
|