10 |
|
|
11 |
|
#include "standard.h" |
12 |
|
|
13 |
< |
#include <sys/fcntl.h> |
13 |
> |
#include <fcntl.h> |
14 |
|
|
15 |
|
#include "view.h" |
16 |
|
|
28 |
|
|
29 |
|
#define PACKSIZ 42 /* calculation packet size */ |
30 |
|
|
31 |
< |
#define RTCOM "rtrace -h -ovl -fff -x %d %s" |
31 |
> |
#define RTCOM "rtrace -h -ovl -fff %s" |
32 |
|
|
33 |
|
#define ABS(x) ((x)>0?(x):-(x)) |
34 |
|
|
46 |
|
|
47 |
|
char *progname; |
48 |
|
|
49 |
< |
int fill = F_FORE|F_BACK; /* selected fill algorithm */ |
49 |
> |
int fillo = F_FORE|F_BACK; /* selected fill options */ |
50 |
> |
int fillsamp = 0; /* sample separation (0 == inf) */ |
51 |
|
extern int backfill(), rcalfill(); /* fill functions */ |
52 |
< |
int (*deffill)() = backfill; /* selected fill function */ |
52 |
> |
int (*fillfunc)() = backfill; /* selected fill function */ |
53 |
|
COLR backcolr = BLKCOLR; /* background color */ |
54 |
|
double backz = 0.0; /* background z value */ |
55 |
|
int normdist = 1; /* normalized distance? */ |
57 |
|
|
58 |
|
VIEW theirview = STDVIEW; /* input view */ |
59 |
|
int gotview; /* got input view? */ |
60 |
+ |
int wrongformat = 0; /* input in another format? */ |
61 |
|
int thresolu, tvresolu; /* input resolution */ |
62 |
|
double theirexp; /* input picture exposure */ |
63 |
|
double theirs2ours[4][4]; /* transformation matrix */ |
64 |
+ |
int hasmatrix = 0; /* has transformation matrix */ |
65 |
|
|
66 |
|
int childpid = -1; /* id of fill process */ |
67 |
|
FILE *psend, *precv; /* pipes to/from fill calculation */ |
101 |
|
switch (argv[i][2]) { |
102 |
|
case '0': /* none */ |
103 |
|
check(3,0); |
104 |
< |
fill = 0; |
104 |
> |
fillo = 0; |
105 |
|
break; |
106 |
|
case 'f': /* foreground */ |
107 |
|
check(3,0); |
108 |
< |
fill = F_FORE; |
108 |
> |
fillo = F_FORE; |
109 |
|
break; |
110 |
|
case 'b': /* background */ |
111 |
|
check(3,0); |
112 |
< |
fill = F_BACK; |
112 |
> |
fillo = F_BACK; |
113 |
|
break; |
114 |
|
case 'a': /* all */ |
115 |
|
check(3,0); |
116 |
< |
fill = F_FORE|F_BACK; |
116 |
> |
fillo = F_FORE|F_BACK; |
117 |
|
break; |
118 |
+ |
case 's': /* sample */ |
119 |
+ |
check(3,1); |
120 |
+ |
fillsamp = atoi(argv[++i]); |
121 |
+ |
break; |
122 |
|
case 'c': /* color */ |
123 |
|
check(3,3); |
124 |
< |
deffill = backfill; |
124 |
> |
fillfunc = backfill; |
125 |
|
setcolr(backcolr, atof(argv[i+1]), |
126 |
|
atof(argv[i+2]), atof(argv[i+3])); |
127 |
|
i += 3; |
128 |
|
break; |
129 |
|
case 'z': /* z value */ |
130 |
|
check(3,1); |
131 |
< |
deffill = backfill; |
131 |
> |
fillfunc = backfill; |
132 |
|
backz = atof(argv[++i]); |
133 |
|
break; |
134 |
|
case 'r': /* rtrace */ |
135 |
|
check(3,1); |
136 |
< |
deffill = rcalfill; |
136 |
> |
fillfunc = rcalfill; |
137 |
|
calstart(RTCOM, argv[++i]); |
138 |
|
break; |
139 |
|
default: |
195 |
|
for ( ; i < argc; i += 2) |
196 |
|
addpicture(argv[i], argv[i+1]); |
197 |
|
/* fill in spaces */ |
198 |
< |
if (fill&F_BACK) |
199 |
< |
backpicture(); |
198 |
> |
if (fillo&F_BACK) |
199 |
> |
backpicture(fillfunc, fillsamp); |
200 |
|
else |
201 |
< |
fillpicture(); |
201 |
> |
fillpicture(fillfunc); |
202 |
|
/* close calculation */ |
203 |
|
caldone(); |
204 |
|
/* add to header */ |
205 |
|
printargs(argc, argv, stdout); |
206 |
|
if (gotvfile) { |
207 |
< |
printf(VIEWSTR); |
207 |
> |
fputs(VIEWSTR, stdout); |
208 |
|
fprintview(&ourview, stdout); |
209 |
< |
printf("\n"); |
209 |
> |
putc('\n', stdout); |
210 |
|
} |
211 |
|
if (pixaspect < .99 || pixaspect > 1.01) |
212 |
|
fputaspect(pixaspect, stdout); |
213 |
|
if (ourexp > 0 && (ourexp < .995 || ourexp > 1.005)) |
214 |
|
fputexpos(ourexp, stdout); |
215 |
< |
printf("\n"); |
215 |
> |
fputformat(COLRFMT, stdout); |
216 |
> |
putc('\n', stdout); |
217 |
|
/* write picture */ |
218 |
|
writepicture(); |
219 |
|
/* write z file */ |
233 |
|
headline(s) /* process header string */ |
234 |
|
char *s; |
235 |
|
{ |
236 |
< |
static char *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL}; |
236 |
> |
static char *altname[] = {VIEWSTR,"rpict","rview","pinterp",NULL}; |
237 |
|
register char **an; |
238 |
+ |
char fmt[32]; |
239 |
|
|
240 |
< |
printf("\t%s", s); |
240 |
> |
if (isformat(s)) { |
241 |
> |
formatval(fmt, s); |
242 |
> |
wrongformat = strcmp(fmt, COLRFMT); |
243 |
> |
return; |
244 |
> |
} |
245 |
> |
putc('\t', stdout); |
246 |
> |
fputs(s, stdout); |
247 |
|
|
248 |
|
if (isexpos(s)) { |
249 |
|
theirexp *= exposval(s); |
278 |
|
theirexp = 1.0; |
279 |
|
gotview = 0; |
280 |
|
printf("%s:\n", pfile); |
281 |
< |
getheader(pfp, headline); |
282 |
< |
if (!gotview || fgetresolu(&thresolu, &tvresolu, pfp) |
283 |
< |
!= (YMAJOR|YDECR)) { |
284 |
< |
fprintf(stderr, "%s: picture view error\n", pfile); |
281 |
> |
getheader(pfp, headline, NULL); |
282 |
> |
if (wrongformat || !gotview || |
283 |
> |
fgetresolu(&thresolu, &tvresolu, pfp) != (YMAJOR|YDECR)) { |
284 |
> |
|
285 |
> |
fprintf(stderr, "%s: picture format error\n", pfile); |
286 |
|
exit(1); |
287 |
|
} |
288 |
|
if (ourexp <= 0) |
294 |
|
exit(1); |
295 |
|
} |
296 |
|
/* compute transformation */ |
297 |
< |
pixform(theirs2ours, &theirview, &ourview); |
297 |
> |
hasmatrix = pixform(theirs2ours, &theirview, &ourview); |
298 |
|
/* allocate scanlines */ |
299 |
|
scanin = (COLR *)malloc(thresolu*sizeof(COLR)); |
300 |
|
zin = (float *)malloc(thresolu*sizeof(float)); |
318 |
|
fprintf(stderr, "%s: read error\n", pfile); |
319 |
|
exit(1); |
320 |
|
} |
321 |
< |
if (zfd != -1 && read(zfd,zin,thresolu*sizeof(float)) |
321 |
> |
if (zfd != -1 && read(zfd,(char *)zin,thresolu*sizeof(float)) |
322 |
|
< thresolu*sizeof(float)) { |
323 |
|
fprintf(stderr, "%s: read error\n", zspec); |
324 |
|
exit(1); |
341 |
|
{ |
342 |
|
double m4t[4][4]; |
343 |
|
|
344 |
+ |
if (vw1->type != VT_PER && vw1->type != VT_PAR) |
345 |
+ |
return(0); |
346 |
+ |
if (vw2->type != VT_PER && vw2->type != VT_PAR) |
347 |
+ |
return(0); |
348 |
|
setident4(xfmat); |
349 |
|
xfmat[0][0] = vw1->hvec[0]; |
350 |
|
xfmat[0][1] = vw1->hvec[1]; |
372 |
|
m4t[2][2] = vw2->vdir[2]; |
373 |
|
m4t[3][2] = -DOT(vw2->vp,vw2->vdir); |
374 |
|
multmat4(xfmat, xfmat, m4t); |
375 |
+ |
return(1); |
376 |
|
} |
377 |
|
|
378 |
|
|
383 |
|
struct position *lasty; /* input/output */ |
384 |
|
{ |
385 |
|
extern double sqrt(); |
386 |
< |
double pos[3]; |
386 |
> |
FVECT pos; |
387 |
|
struct position lastx, newpos; |
388 |
|
register int x; |
389 |
|
|
390 |
|
lastx.z = 0; |
391 |
|
for (x = thresolu-1; x >= 0; x--) { |
392 |
< |
pos[0] = (x+.5)/thresolu + theirview.hoff - .5; |
393 |
< |
pos[1] = (y+.5)/tvresolu + theirview.voff - .5; |
392 |
> |
pos[0] = (x+.5)/thresolu; |
393 |
> |
pos[1] = (y+.5)/tvresolu; |
394 |
|
pos[2] = zline[x]; |
395 |
< |
if (theirview.type == VT_PER) { |
375 |
< |
if (normdist) /* adjust for eye-ray distance */ |
376 |
< |
pos[2] /= sqrt( 1. |
377 |
< |
+ pos[0]*pos[0]*theirview.hn2 |
378 |
< |
+ pos[1]*pos[1]*theirview.vn2 ); |
379 |
< |
pos[0] *= pos[2]; |
380 |
< |
pos[1] *= pos[2]; |
381 |
< |
} |
382 |
< |
multp3(pos, pos, theirs2ours); |
383 |
< |
if (pos[2] <= 0) { |
395 |
> |
if (movepixel(pos) < 0) { |
396 |
|
lasty[x].z = lastx.z = 0; /* mark invalid */ |
397 |
|
continue; |
398 |
|
} |
387 |
– |
if (ourview.type == VT_PER) { |
388 |
– |
pos[0] /= pos[2]; |
389 |
– |
pos[1] /= pos[2]; |
390 |
– |
} |
391 |
– |
pos[0] += .5 - ourview.hoff; |
392 |
– |
pos[1] += .5 - ourview.voff; |
399 |
|
newpos.x = pos[0] * hresolu; |
400 |
|
newpos.y = pos[1] * vresolu; |
401 |
|
newpos.z = zline[x]; |
425 |
|
register int x, y; /* final position */ |
426 |
|
|
427 |
|
/* compute vector p0p1 */ |
428 |
< |
if (fill&F_FORE && ABS(p1->z-p0->z) <= zt) { |
428 |
> |
if (fillo&F_FORE && ABS(p1->z-p0->z) <= zt) { |
429 |
|
s1x = p1->x - p0->x; |
430 |
|
s1y = p1->y - p0->y; |
431 |
|
l1 = ABS(s1x); |
436 |
|
p1isy = -1; |
437 |
|
} |
438 |
|
/* compute vector p0p2 */ |
439 |
< |
if (fill&F_FORE && ABS(p2->z-p0->z) <= zt) { |
439 |
> |
if (fillo&F_FORE && ABS(p2->z-p0->z) <= zt) { |
440 |
|
s2x = p2->x - p0->x; |
441 |
|
s2y = p2->y - p0->y; |
442 |
|
if (p1isy == 1) |
454 |
|
y1 = p0->y + c1*s1y/l1; |
455 |
|
for (c2 = l2; c2-- > 0; ) { |
456 |
|
x = x1 + c2*s2x/l2; |
457 |
+ |
if (x < 0 || x >= hresolu) |
458 |
+ |
continue; |
459 |
|
y = y1 + c2*s2y/l2; |
460 |
+ |
if (y < 0 || y >= vresolu) |
461 |
+ |
continue; |
462 |
|
if (zscan(y)[x] <= 0 || zscan(y)[x]-z |
463 |
|
> zeps*zscan(y)[x]) { |
464 |
|
zscan(y)[x] = z; |
469 |
|
} |
470 |
|
|
471 |
|
|
472 |
< |
backpicture() /* background fill algorithm */ |
472 |
> |
movepixel(pos) /* reposition image point */ |
473 |
> |
FVECT pos; |
474 |
|
{ |
475 |
+ |
FVECT pt, direc; |
476 |
+ |
|
477 |
+ |
if (pos[2] <= 0) /* empty pixel */ |
478 |
+ |
return(-1); |
479 |
+ |
if (hasmatrix) { |
480 |
+ |
pos[0] += theirview.hoff - .5; |
481 |
+ |
pos[1] += theirview.voff - .5; |
482 |
+ |
if (theirview.type == VT_PER) { |
483 |
+ |
if (normdist) /* adjust for eye-ray distance */ |
484 |
+ |
pos[2] /= sqrt( 1. |
485 |
+ |
+ pos[0]*pos[0]*theirview.hn2 |
486 |
+ |
+ pos[1]*pos[1]*theirview.vn2 ); |
487 |
+ |
pos[0] *= pos[2]; |
488 |
+ |
pos[1] *= pos[2]; |
489 |
+ |
} |
490 |
+ |
multp3(pos, pos, theirs2ours); |
491 |
+ |
if (pos[2] <= 0) |
492 |
+ |
return(-1); |
493 |
+ |
if (ourview.type == VT_PER) { |
494 |
+ |
pos[0] /= pos[2]; |
495 |
+ |
pos[1] /= pos[2]; |
496 |
+ |
} |
497 |
+ |
pos[0] += .5 - ourview.hoff; |
498 |
+ |
pos[1] += .5 - ourview.voff; |
499 |
+ |
return(0); |
500 |
+ |
} |
501 |
+ |
if (viewray(pt, direc, &theirview, pos[0], pos[1]) < 0) |
502 |
+ |
return(-1); |
503 |
+ |
pt[0] += direc[0]*pos[2]; |
504 |
+ |
pt[1] += direc[1]*pos[2]; |
505 |
+ |
pt[2] += direc[2]*pos[2]; |
506 |
+ |
viewpixel(&pos[0], &pos[1], &pos[2], &ourview, pt); |
507 |
+ |
if (pos[2] <= 0) |
508 |
+ |
return(-1); |
509 |
+ |
return(0); |
510 |
+ |
} |
511 |
+ |
|
512 |
+ |
|
513 |
+ |
backpicture(fill, samp) /* background fill algorithm */ |
514 |
+ |
int (*fill)(); |
515 |
+ |
int samp; |
516 |
+ |
{ |
517 |
|
int *yback, xback; |
518 |
|
int y; |
466 |
– |
COLR pfill; |
519 |
|
register int x, i; |
520 |
|
/* get back buffer */ |
521 |
|
yback = (int *)malloc(hresolu*sizeof(int)); |
562 |
|
xback = x-1; |
563 |
|
} |
564 |
|
/* |
565 |
< |
* Check to see if we have no background for |
566 |
< |
* this pixel. If not, use background color. |
565 |
> |
* If we have no background for this pixel, |
566 |
> |
* use the given fill function. |
567 |
|
*/ |
568 |
< |
if (xback < 0 && yback[x] < 0) { |
569 |
< |
(*deffill)(x,y); |
518 |
< |
continue; |
519 |
< |
} |
568 |
> |
if (xback < 0 && yback[x] < 0) |
569 |
> |
goto fillit; |
570 |
|
/* |
571 |
|
* Compare, and use the background that is |
572 |
|
* farther, unless one of them is next to us. |
573 |
+ |
* If the background is too distant, call |
574 |
+ |
* the fill function. |
575 |
|
*/ |
576 |
|
if ( yback[x] < 0 |
577 |
|
|| (xback >= 0 && ABS(x-xback) <= 1) |
578 |
|
|| ( ABS(y-yback[x]) > 1 |
579 |
|
&& zscan(yback[x])[x] |
580 |
|
< zscan(y)[xback] ) ) { |
581 |
+ |
if (samp > 0 && ABS(x-xback) >= samp) |
582 |
+ |
goto fillit; |
583 |
|
copycolr(pscan(y)[x],pscan(y)[xback]); |
584 |
|
zscan(y)[x] = zscan(y)[xback]; |
585 |
|
} else { |
586 |
+ |
if (samp > 0 && ABS(y-yback[x]) > samp) |
587 |
+ |
goto fillit; |
588 |
|
copycolr(pscan(y)[x],pscan(yback[x])[x]); |
589 |
|
zscan(y)[x] = zscan(yback[x])[x]; |
590 |
|
} |
591 |
+ |
continue; |
592 |
+ |
fillit: |
593 |
+ |
(*fill)(x,y); |
594 |
+ |
if (fill == rcalfill) { /* use it */ |
595 |
+ |
clearqueue(); |
596 |
+ |
xback = x; |
597 |
+ |
yback[x] = y; |
598 |
+ |
} |
599 |
|
} else { /* full pixel */ |
600 |
|
yback[x] = -2; |
601 |
|
xback = -2; |
605 |
|
} |
606 |
|
|
607 |
|
|
608 |
< |
fillpicture() /* paint in empty pixels with default */ |
608 |
> |
fillpicture(fill) /* paint in empty pixels using fill */ |
609 |
> |
int (*fill)(); |
610 |
|
{ |
611 |
|
register int x, y; |
612 |
|
|
613 |
|
for (y = 0; y < vresolu; y++) |
614 |
|
for (x = 0; x < hresolu; x++) |
615 |
|
if (zscan(y)[x] <= 0) |
616 |
< |
(*deffill)(x,y); |
616 |
> |
(*fill)(x,y); |
617 |
|
} |
618 |
|
|
619 |
|
|
648 |
|
if (donorm) { |
649 |
|
double vx, yzn2; |
650 |
|
register int x; |
651 |
< |
yzn2 = y - .5*(vresolu-1); |
651 |
> |
yzn2 = (y+.5)/vresolu + ourview.voff - .5; |
652 |
|
yzn2 = 1. + yzn2*yzn2*ourview.vn2; |
653 |
|
for (x = 0; x < hresolu; x++) { |
654 |
< |
vx = x - .5*(hresolu-1); |
654 |
> |
vx = (x+.5)/hresolu + ourview.hoff - .5; |
655 |
|
zout[x] = zscan(y)[x] |
656 |
|
* sqrt(vx*vx*ourview.hn2 + yzn2); |
657 |
|
} |
658 |
|
} else |
659 |
|
zout = zscan(y); |
660 |
< |
if (write(fd, zout, hresolu*sizeof(float)) |
660 |
> |
if (write(fd, (char *)zout, hresolu*sizeof(float)) |
661 |
|
< hresolu*sizeof(float)) { |
662 |
|
perror(fname); |
663 |
|
exit(1); |
700 |
|
fprintf(stderr, "%s: too many calculations\n", progname); |
701 |
|
exit(1); |
702 |
|
} |
703 |
< |
sprintf(combuf, prog, PACKSIZ, args); |
703 |
> |
sprintf(combuf, prog, args); |
704 |
|
if (pipe(p0) < 0 || pipe(p1) < 0) |
705 |
|
syserror(); |
706 |
|
if ((childpid = vfork()) == 0) { /* fork calculation */ |
736 |
|
|
737 |
|
if (childpid == -1) |
738 |
|
return; |
674 |
– |
if (fclose(psend) == EOF) |
675 |
– |
syserror(); |
739 |
|
clearqueue(); |
740 |
+ |
fclose(psend); |
741 |
|
fclose(precv); |
742 |
|
while ((pid = wait(0)) != -1 && pid != childpid) |
743 |
|
; |
748 |
|
rcalfill(x, y) /* fill with ray-calculated pixel */ |
749 |
|
int x, y; |
750 |
|
{ |
751 |
< |
FVECT orig, dir; |
688 |
< |
float outbuf[6]; |
689 |
< |
|
690 |
< |
if (queuesiz >= PACKSIZ) { /* flush queue */ |
691 |
< |
if (fflush(psend) == EOF) |
692 |
< |
syserror(); |
751 |
> |
if (queuesiz >= PACKSIZ) /* flush queue if needed */ |
752 |
|
clearqueue(); |
753 |
< |
} |
695 |
< |
/* send new ray */ |
696 |
< |
viewray(orig, dir, &ourview, (x+.5)/hresolu, (y+.5)/vresolu); |
697 |
< |
outbuf[0] = orig[0]; outbuf[1] = orig[1]; outbuf[2] = orig[2]; |
698 |
< |
outbuf[3] = dir[0]; outbuf[4] = dir[1]; outbuf[5] = dir[2]; |
699 |
< |
if (fwrite(outbuf, sizeof(float), 6, psend) < 6) |
700 |
< |
syserror(); |
701 |
< |
/* remember it */ |
753 |
> |
/* add position to queue */ |
754 |
|
queue[queuesiz][0] = x; |
755 |
|
queue[queuesiz][1] = y; |
756 |
|
queuesiz++; |
757 |
|
} |
758 |
|
|
759 |
|
|
760 |
< |
clearqueue() /* get results from queue */ |
760 |
> |
clearqueue() /* process queue */ |
761 |
|
{ |
762 |
< |
float inbuf[4]; |
762 |
> |
FVECT orig, dir; |
763 |
> |
float fbuf[6]; |
764 |
|
register int i; |
765 |
|
|
766 |
|
for (i = 0; i < queuesiz; i++) { |
767 |
< |
if (fread(inbuf, sizeof(float), 4, precv) < 4) { |
767 |
> |
viewray(orig, dir, &ourview, |
768 |
> |
(queue[i][0]+.5)/hresolu, |
769 |
> |
(queue[i][1]+.5)/vresolu); |
770 |
> |
fbuf[0] = orig[0]; fbuf[1] = orig[1]; fbuf[2] = orig[2]; |
771 |
> |
fbuf[3] = dir[0]; fbuf[4] = dir[1]; fbuf[5] = dir[2]; |
772 |
> |
fwrite((char *)fbuf, sizeof(float), 6, psend); |
773 |
> |
} |
774 |
> |
/* flush output and get results */ |
775 |
> |
fbuf[3] = fbuf[4] = fbuf[5] = 0.0; /* mark */ |
776 |
> |
fwrite((char *)fbuf, sizeof(float), 6, psend); |
777 |
> |
if (fflush(psend) == EOF) |
778 |
> |
syserror(); |
779 |
> |
for (i = 0; i < queuesiz; i++) { |
780 |
> |
if (fread((char *)fbuf, sizeof(float), 4, precv) < 4) { |
781 |
|
fprintf(stderr, "%s: read error in clearqueue\n", |
782 |
|
progname); |
783 |
|
exit(1); |
784 |
|
} |
785 |
|
if (ourexp > 0 && ourexp != 1.0) { |
786 |
< |
inbuf[0] *= ourexp; |
787 |
< |
inbuf[1] *= ourexp; |
788 |
< |
inbuf[2] *= ourexp; |
786 |
> |
fbuf[0] *= ourexp; |
787 |
> |
fbuf[1] *= ourexp; |
788 |
> |
fbuf[2] *= ourexp; |
789 |
|
} |
790 |
|
setcolr(pscan(queue[i][1])[queue[i][0]], |
791 |
< |
inbuf[0], inbuf[1], inbuf[2]); |
792 |
< |
zscan(queue[i][1])[queue[i][0]] = inbuf[3]; |
791 |
> |
fbuf[0], fbuf[1], fbuf[2]); |
792 |
> |
zscan(queue[i][1])[queue[i][0]] = fbuf[3]; |
793 |
|
} |
794 |
|
queuesiz = 0; |
795 |
|
} |