1 |
+ |
/* Copyright (c) 1991 Regents of the University of California */ |
2 |
+ |
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
5 |
|
#endif |
12 |
|
|
13 |
|
#include "standard.h" |
14 |
|
|
15 |
< |
#include <sys/fcntl.h> |
15 |
> |
#include <fcntl.h> |
16 |
|
|
17 |
+ |
#include <ctype.h> |
18 |
+ |
|
19 |
|
#include "view.h" |
20 |
|
|
21 |
|
#include "color.h" |
22 |
|
|
23 |
+ |
#include "resolu.h" |
24 |
+ |
|
25 |
|
#ifndef BSD |
26 |
|
#define vfork fork |
27 |
|
#endif |
32 |
|
#define F_FORE 1 /* fill foreground */ |
33 |
|
#define F_BACK 2 /* fill background */ |
34 |
|
|
35 |
< |
#define PACKSIZ 42 /* calculation packet size */ |
35 |
> |
#define PACKSIZ 256 /* max. calculation packet size */ |
36 |
|
|
37 |
< |
#define RTCOM "rtrace -h -ovl -fff -x %d %s" |
37 |
> |
#define RTCOM "rtrace -h- -ovl -fff" |
38 |
|
|
39 |
|
#define ABS(x) ((x)>0?(x):-(x)) |
40 |
|
|
52 |
|
|
53 |
|
char *progname; |
54 |
|
|
55 |
< |
int fill = F_FORE|F_BACK; /* selected fill algorithm */ |
55 |
> |
int fillo = F_FORE|F_BACK; /* selected fill options */ |
56 |
> |
int fillsamp = 0; /* sample separation (0 == inf) */ |
57 |
|
extern int backfill(), rcalfill(); /* fill functions */ |
58 |
< |
int (*deffill)() = backfill; /* selected fill function */ |
58 |
> |
int (*fillfunc)() = backfill; /* selected fill function */ |
59 |
|
COLR backcolr = BLKCOLR; /* background color */ |
60 |
|
double backz = 0.0; /* background z value */ |
61 |
|
int normdist = 1; /* normalized distance? */ |
63 |
|
|
64 |
|
VIEW theirview = STDVIEW; /* input view */ |
65 |
|
int gotview; /* got input view? */ |
66 |
< |
int thresolu, tvresolu; /* input resolution */ |
66 |
> |
int wrongformat = 0; /* input in another format? */ |
67 |
> |
RESOLU tresolu; /* input resolution */ |
68 |
|
double theirexp; /* input picture exposure */ |
69 |
|
double theirs2ours[4][4]; /* transformation matrix */ |
70 |
+ |
int hasmatrix = 0; /* has transformation matrix */ |
71 |
|
|
72 |
< |
int childpid = -1; /* id of fill process */ |
73 |
< |
FILE *psend, *precv; /* pipes to/from fill calculation */ |
74 |
< |
int queue[PACKSIZ][2]; /* pending pixels */ |
72 |
> |
int PDesc[3] = {-1,-1,-1}; /* rtrace process descriptor */ |
73 |
> |
#define childpid (PDesc[2]) |
74 |
> |
unsigned short queue[PACKSIZ][2]; /* pending pixels */ |
75 |
> |
int packsiz; /* actual packet size */ |
76 |
|
int queuesiz; /* number of pixels pending */ |
77 |
|
|
78 |
|
|
80 |
|
int argc; |
81 |
|
char *argv[]; |
82 |
|
{ |
83 |
< |
#define check(olen,narg) if (argv[i][olen] || narg >= argc-i) goto badopt |
84 |
< |
extern double atof(); |
83 |
> |
#define check(ol,al) if (argv[i][ol] || \ |
84 |
> |
badarg(argc-i-1,argv+i+1,al)) \ |
85 |
> |
goto badopt |
86 |
|
int gotvfile = 0; |
87 |
|
char *zfile = NULL; |
88 |
|
char *err; |
98 |
|
} |
99 |
|
switch (argv[i][1]) { |
100 |
|
case 't': /* threshold */ |
101 |
< |
check(2,1); |
101 |
> |
check(2,"f"); |
102 |
|
zeps = atof(argv[++i]); |
103 |
|
break; |
104 |
|
case 'n': /* dist. normalized? */ |
105 |
< |
check(2,0); |
105 |
> |
check(2,NULL); |
106 |
|
normdist = !normdist; |
107 |
|
break; |
108 |
|
case 'f': /* fill type */ |
109 |
|
switch (argv[i][2]) { |
110 |
|
case '0': /* none */ |
111 |
< |
check(3,0); |
112 |
< |
fill = 0; |
111 |
> |
check(3,NULL); |
112 |
> |
fillo = 0; |
113 |
|
break; |
114 |
|
case 'f': /* foreground */ |
115 |
< |
check(3,0); |
116 |
< |
fill = F_FORE; |
115 |
> |
check(3,NULL); |
116 |
> |
fillo = F_FORE; |
117 |
|
break; |
118 |
|
case 'b': /* background */ |
119 |
< |
check(3,0); |
120 |
< |
fill = F_BACK; |
119 |
> |
check(3,NULL); |
120 |
> |
fillo = F_BACK; |
121 |
|
break; |
122 |
|
case 'a': /* all */ |
123 |
< |
check(3,0); |
124 |
< |
fill = F_FORE|F_BACK; |
123 |
> |
check(3,NULL); |
124 |
> |
fillo = F_FORE|F_BACK; |
125 |
|
break; |
126 |
+ |
case 's': /* sample */ |
127 |
+ |
check(3,"i"); |
128 |
+ |
fillsamp = atoi(argv[++i]); |
129 |
+ |
break; |
130 |
|
case 'c': /* color */ |
131 |
< |
check(3,3); |
132 |
< |
deffill = backfill; |
131 |
> |
check(3,"fff"); |
132 |
> |
fillfunc = backfill; |
133 |
|
setcolr(backcolr, atof(argv[i+1]), |
134 |
|
atof(argv[i+2]), atof(argv[i+3])); |
135 |
|
i += 3; |
136 |
|
break; |
137 |
|
case 'z': /* z value */ |
138 |
< |
check(3,1); |
139 |
< |
deffill = backfill; |
138 |
> |
check(3,"f"); |
139 |
> |
fillfunc = backfill; |
140 |
|
backz = atof(argv[++i]); |
141 |
|
break; |
142 |
|
case 'r': /* rtrace */ |
143 |
< |
check(3,1); |
144 |
< |
deffill = rcalfill; |
143 |
> |
check(3,"s"); |
144 |
> |
fillfunc = rcalfill; |
145 |
|
calstart(RTCOM, argv[++i]); |
146 |
|
break; |
147 |
|
default: |
149 |
|
} |
150 |
|
break; |
151 |
|
case 'z': /* z file */ |
152 |
< |
check(2,1); |
152 |
> |
check(2,"s"); |
153 |
|
zfile = argv[++i]; |
154 |
|
break; |
155 |
|
case 'x': /* x resolution */ |
156 |
< |
check(2,1); |
156 |
> |
check(2,"i"); |
157 |
|
hresolu = atoi(argv[++i]); |
158 |
|
break; |
159 |
|
case 'y': /* y resolution */ |
160 |
< |
check(2,1); |
160 |
> |
check(2,"i"); |
161 |
|
vresolu = atoi(argv[++i]); |
162 |
|
break; |
163 |
|
case 'p': /* pixel aspect */ |
164 |
< |
check(2,1); |
164 |
> |
check(2,"f"); |
165 |
|
pixaspect = atof(argv[++i]); |
166 |
|
break; |
167 |
|
case 'v': /* view file */ |
168 |
|
if (argv[i][2] != 'f') |
169 |
|
goto badopt; |
170 |
< |
check(3,1); |
170 |
> |
check(3,"s"); |
171 |
|
gotvfile = viewfile(argv[++i], &ourview, 0, 0); |
172 |
|
if (gotvfile < 0) { |
173 |
|
perror(argv[i]); |
188 |
|
/* check arguments */ |
189 |
|
if ((argc-i)%2) |
190 |
|
goto userr; |
191 |
+ |
if (fillsamp == 1) |
192 |
+ |
fillo &= ~F_BACK; |
193 |
|
/* set view */ |
194 |
|
if (err = setview(&ourview)) { |
195 |
|
fprintf(stderr, "%s: %s\n", progname, err); |
205 |
|
for ( ; i < argc; i += 2) |
206 |
|
addpicture(argv[i], argv[i+1]); |
207 |
|
/* fill in spaces */ |
208 |
< |
if (fill&F_BACK) |
209 |
< |
backpicture(); |
208 |
> |
if (fillo&F_BACK) |
209 |
> |
backpicture(fillfunc, fillsamp); |
210 |
|
else |
211 |
< |
fillpicture(); |
211 |
> |
fillpicture(fillfunc); |
212 |
|
/* close calculation */ |
213 |
|
caldone(); |
214 |
|
/* add to header */ |
215 |
|
printargs(argc, argv, stdout); |
216 |
|
if (gotvfile) { |
217 |
< |
printf(VIEWSTR); |
217 |
> |
fputs(VIEWSTR, stdout); |
218 |
|
fprintview(&ourview, stdout); |
219 |
< |
printf("\n"); |
219 |
> |
putc('\n', stdout); |
220 |
|
} |
221 |
|
if (pixaspect < .99 || pixaspect > 1.01) |
222 |
|
fputaspect(pixaspect, stdout); |
223 |
|
if (ourexp > 0 && (ourexp < .995 || ourexp > 1.005)) |
224 |
|
fputexpos(ourexp, stdout); |
225 |
< |
printf("\n"); |
225 |
> |
fputformat(COLRFMT, stdout); |
226 |
> |
putc('\n', stdout); |
227 |
|
/* write picture */ |
228 |
|
writepicture(); |
229 |
|
/* write z file */ |
243 |
|
headline(s) /* process header string */ |
244 |
|
char *s; |
245 |
|
{ |
246 |
< |
static char *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL}; |
246 |
> |
static char *altname[] = {VIEWSTR,"rpict","rview","pinterp",NULL}; |
247 |
|
register char **an; |
248 |
+ |
char fmt[32]; |
249 |
|
|
250 |
< |
printf("\t%s", s); |
250 |
> |
if (isformat(s)) { |
251 |
> |
formatval(fmt, s); |
252 |
> |
wrongformat = strcmp(fmt, COLRFMT); |
253 |
> |
return; |
254 |
> |
} |
255 |
> |
putc('\t', stdout); |
256 |
> |
fputs(s, stdout); |
257 |
|
|
258 |
|
if (isexpos(s)) { |
259 |
|
theirexp *= exposval(s); |
271 |
|
addpicture(pfile, zspec) /* add picture to output */ |
272 |
|
char *pfile, *zspec; |
273 |
|
{ |
249 |
– |
extern double atof(); |
274 |
|
FILE *pfp; |
275 |
|
int zfd; |
276 |
|
char *err; |
287 |
|
theirexp = 1.0; |
288 |
|
gotview = 0; |
289 |
|
printf("%s:\n", pfile); |
290 |
< |
getheader(pfp, headline); |
291 |
< |
if (!gotview || fgetresolu(&thresolu, &tvresolu, pfp) |
292 |
< |
!= (YMAJOR|YDECR)) { |
269 |
< |
fprintf(stderr, "%s: picture view error\n", pfile); |
290 |
> |
getheader(pfp, headline, NULL); |
291 |
> |
if (wrongformat || !gotview || !fgetsresolu(&tresolu, pfp)) { |
292 |
> |
fprintf(stderr, "%s: picture format error\n", pfile); |
293 |
|
exit(1); |
294 |
|
} |
295 |
|
if (ourexp <= 0) |
301 |
|
exit(1); |
302 |
|
} |
303 |
|
/* compute transformation */ |
304 |
< |
pixform(theirs2ours, &theirview, &ourview); |
304 |
> |
hasmatrix = pixform(theirs2ours, &theirview, &ourview); |
305 |
|
/* allocate scanlines */ |
306 |
< |
scanin = (COLR *)malloc(thresolu*sizeof(COLR)); |
307 |
< |
zin = (float *)malloc(thresolu*sizeof(float)); |
308 |
< |
plast = (struct position *)calloc(thresolu, sizeof(struct position)); |
306 |
> |
scanin = (COLR *)malloc(scanlen(&tresolu)*sizeof(COLR)); |
307 |
> |
zin = (float *)malloc(scanlen(&tresolu)*sizeof(float)); |
308 |
> |
plast = (struct position *)calloc(scanlen(&tresolu), |
309 |
> |
sizeof(struct position)); |
310 |
|
if (scanin == NULL || zin == NULL || plast == NULL) |
311 |
|
syserror(); |
312 |
|
/* get z specification or file */ |
317 |
|
perror(zspec); |
318 |
|
exit(1); |
319 |
|
} |
320 |
< |
for (x = 0; x < thresolu; x++) |
320 |
> |
for (x = scanlen(&tresolu); x-- > 0; ) |
321 |
|
zin[x] = zvalue; |
322 |
|
} |
323 |
|
/* load image */ |
324 |
< |
for (y = tvresolu-1; y >= 0; y--) { |
325 |
< |
if (freadcolrs(scanin, thresolu, pfp) < 0) { |
324 |
> |
for (y = 0; y < numscans(&tresolu); y++) { |
325 |
> |
if (freadcolrs(scanin, scanlen(&tresolu), pfp) < 0) { |
326 |
|
fprintf(stderr, "%s: read error\n", pfile); |
327 |
|
exit(1); |
328 |
|
} |
329 |
< |
if (zfd != -1 && read(zfd,zin,thresolu*sizeof(float)) |
330 |
< |
< thresolu*sizeof(float)) { |
329 |
> |
if (zfd != -1 && read(zfd,(char *)zin, |
330 |
> |
scanlen(&tresolu)*sizeof(float)) |
331 |
> |
< scanlen(&tresolu)*sizeof(float)) { |
332 |
|
fprintf(stderr, "%s: read error\n", zspec); |
333 |
|
exit(1); |
334 |
|
} |
350 |
|
{ |
351 |
|
double m4t[4][4]; |
352 |
|
|
353 |
+ |
if (vw1->type != VT_PER && vw1->type != VT_PAR) |
354 |
+ |
return(0); |
355 |
+ |
if (vw2->type != VT_PER && vw2->type != VT_PAR) |
356 |
+ |
return(0); |
357 |
|
setident4(xfmat); |
358 |
|
xfmat[0][0] = vw1->hvec[0]; |
359 |
|
xfmat[0][1] = vw1->hvec[1]; |
381 |
|
m4t[2][2] = vw2->vdir[2]; |
382 |
|
m4t[3][2] = -DOT(vw2->vp,vw2->vdir); |
383 |
|
multmat4(xfmat, xfmat, m4t); |
384 |
+ |
return(1); |
385 |
|
} |
386 |
|
|
387 |
|
|
392 |
|
struct position *lasty; /* input/output */ |
393 |
|
{ |
394 |
|
extern double sqrt(); |
395 |
< |
double pos[3]; |
395 |
> |
FVECT pos; |
396 |
|
struct position lastx, newpos; |
397 |
|
register int x; |
398 |
|
|
399 |
|
lastx.z = 0; |
400 |
< |
for (x = thresolu-1; x >= 0; x--) { |
401 |
< |
pos[0] = (x+.5)/thresolu + theirview.hoff - .5; |
372 |
< |
pos[1] = (y+.5)/tvresolu + theirview.voff - .5; |
400 |
> |
for (x = scanlen(&tresolu); x-- > 0; ) { |
401 |
> |
pix2loc(pos, &tresolu, x, y); |
402 |
|
pos[2] = zline[x]; |
403 |
< |
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) { |
403 |
> |
if (movepixel(pos) < 0) { |
404 |
|
lasty[x].z = lastx.z = 0; /* mark invalid */ |
405 |
|
continue; |
406 |
|
} |
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; |
407 |
|
newpos.x = pos[0] * hresolu; |
408 |
|
newpos.y = pos[1] * vresolu; |
409 |
|
newpos.z = zline[x]; |
433 |
|
register int x, y; /* final position */ |
434 |
|
|
435 |
|
/* compute vector p0p1 */ |
436 |
< |
if (fill&F_FORE && ABS(p1->z-p0->z) <= zt) { |
436 |
> |
if (fillo&F_FORE && ABS(p1->z-p0->z) <= zt) { |
437 |
|
s1x = p1->x - p0->x; |
438 |
|
s1y = p1->y - p0->y; |
439 |
|
l1 = ABS(s1x); |
444 |
|
p1isy = -1; |
445 |
|
} |
446 |
|
/* compute vector p0p2 */ |
447 |
< |
if (fill&F_FORE && ABS(p2->z-p0->z) <= zt) { |
447 |
> |
if (fillo&F_FORE && ABS(p2->z-p0->z) <= zt) { |
448 |
|
s2x = p2->x - p0->x; |
449 |
|
s2y = p2->y - p0->y; |
450 |
|
if (p1isy == 1) |
462 |
|
y1 = p0->y + c1*s1y/l1; |
463 |
|
for (c2 = l2; c2-- > 0; ) { |
464 |
|
x = x1 + c2*s2x/l2; |
465 |
+ |
if (x < 0 || x >= hresolu) |
466 |
+ |
continue; |
467 |
|
y = y1 + c2*s2y/l2; |
468 |
+ |
if (y < 0 || y >= vresolu) |
469 |
+ |
continue; |
470 |
|
if (zscan(y)[x] <= 0 || zscan(y)[x]-z |
471 |
|
> zeps*zscan(y)[x]) { |
472 |
|
zscan(y)[x] = z; |
477 |
|
} |
478 |
|
|
479 |
|
|
480 |
< |
backpicture() /* background fill algorithm */ |
480 |
> |
movepixel(pos) /* reposition image point */ |
481 |
> |
FVECT pos; |
482 |
|
{ |
483 |
+ |
FVECT pt, direc; |
484 |
+ |
|
485 |
+ |
if (pos[2] <= 0) /* empty pixel */ |
486 |
+ |
return(-1); |
487 |
+ |
if (hasmatrix) { |
488 |
+ |
pos[0] += theirview.hoff - .5; |
489 |
+ |
pos[1] += theirview.voff - .5; |
490 |
+ |
if (theirview.type == VT_PER) { |
491 |
+ |
if (normdist) /* adjust for eye-ray distance */ |
492 |
+ |
pos[2] /= sqrt( 1. |
493 |
+ |
+ pos[0]*pos[0]*theirview.hn2 |
494 |
+ |
+ pos[1]*pos[1]*theirview.vn2 ); |
495 |
+ |
pos[0] *= pos[2]; |
496 |
+ |
pos[1] *= pos[2]; |
497 |
+ |
} |
498 |
+ |
multp3(pos, pos, theirs2ours); |
499 |
+ |
if (pos[2] <= 0) |
500 |
+ |
return(-1); |
501 |
+ |
if (ourview.type == VT_PER) { |
502 |
+ |
pos[0] /= pos[2]; |
503 |
+ |
pos[1] /= pos[2]; |
504 |
+ |
} |
505 |
+ |
pos[0] += .5 - ourview.hoff; |
506 |
+ |
pos[1] += .5 - ourview.voff; |
507 |
+ |
return(0); |
508 |
+ |
} |
509 |
+ |
if (viewray(pt, direc, &theirview, pos[0], pos[1]) < 0) |
510 |
+ |
return(-1); |
511 |
+ |
pt[0] += direc[0]*pos[2]; |
512 |
+ |
pt[1] += direc[1]*pos[2]; |
513 |
+ |
pt[2] += direc[2]*pos[2]; |
514 |
+ |
viewloc(pos, &ourview, pt); |
515 |
+ |
if (pos[2] <= 0) |
516 |
+ |
return(-1); |
517 |
+ |
return(0); |
518 |
+ |
} |
519 |
+ |
|
520 |
+ |
|
521 |
+ |
backpicture(fill, samp) /* background fill algorithm */ |
522 |
+ |
int (*fill)(); |
523 |
+ |
int samp; |
524 |
+ |
{ |
525 |
|
int *yback, xback; |
526 |
|
int y; |
466 |
– |
COLR pfill; |
527 |
|
register int x, i; |
528 |
|
/* get back buffer */ |
529 |
|
yback = (int *)malloc(hresolu*sizeof(int)); |
570 |
|
xback = x-1; |
571 |
|
} |
572 |
|
/* |
573 |
< |
* Check to see if we have no background for |
574 |
< |
* this pixel. If not, use background color. |
573 |
> |
* If we have no background for this pixel, |
574 |
> |
* use the given fill function. |
575 |
|
*/ |
576 |
< |
if (xback < 0 && yback[x] < 0) { |
577 |
< |
(*deffill)(x,y); |
518 |
< |
continue; |
519 |
< |
} |
576 |
> |
if (xback < 0 && yback[x] < 0) |
577 |
> |
goto fillit; |
578 |
|
/* |
579 |
|
* Compare, and use the background that is |
580 |
|
* farther, unless one of them is next to us. |
581 |
+ |
* If the background is too distant, call |
582 |
+ |
* the fill function. |
583 |
|
*/ |
584 |
|
if ( yback[x] < 0 |
585 |
|
|| (xback >= 0 && ABS(x-xback) <= 1) |
586 |
|
|| ( ABS(y-yback[x]) > 1 |
587 |
|
&& zscan(yback[x])[x] |
588 |
|
< zscan(y)[xback] ) ) { |
589 |
+ |
if (samp > 0 && ABS(x-xback) >= samp) |
590 |
+ |
goto fillit; |
591 |
|
copycolr(pscan(y)[x],pscan(y)[xback]); |
592 |
|
zscan(y)[x] = zscan(y)[xback]; |
593 |
|
} else { |
594 |
+ |
if (samp > 0 && ABS(y-yback[x]) > samp) |
595 |
+ |
goto fillit; |
596 |
|
copycolr(pscan(y)[x],pscan(yback[x])[x]); |
597 |
|
zscan(y)[x] = zscan(yback[x])[x]; |
598 |
|
} |
599 |
+ |
continue; |
600 |
+ |
fillit: |
601 |
+ |
(*fill)(x,y); |
602 |
+ |
if (fill == rcalfill) { /* use it */ |
603 |
+ |
clearqueue(); |
604 |
+ |
xback = x; |
605 |
+ |
yback[x] = y; |
606 |
+ |
} |
607 |
|
} else { /* full pixel */ |
608 |
|
yback[x] = -2; |
609 |
|
xback = -2; |
613 |
|
} |
614 |
|
|
615 |
|
|
616 |
< |
fillpicture() /* paint in empty pixels with default */ |
616 |
> |
fillpicture(fill) /* paint in empty pixels using fill */ |
617 |
> |
int (*fill)(); |
618 |
|
{ |
619 |
|
register int x, y; |
620 |
|
|
621 |
|
for (y = 0; y < vresolu; y++) |
622 |
|
for (x = 0; x < hresolu; x++) |
623 |
|
if (zscan(y)[x] <= 0) |
624 |
< |
(*deffill)(x,y); |
624 |
> |
(*fill)(x,y); |
625 |
|
} |
626 |
|
|
627 |
|
|
629 |
|
{ |
630 |
|
int y; |
631 |
|
|
632 |
< |
fputresolu(YMAJOR|YDECR, hresolu, vresolu, stdout); |
632 |
> |
fprtresolu(hresolu, vresolu, stdout); |
633 |
|
for (y = vresolu-1; y >= 0; y--) |
634 |
|
if (fwritecolrs(pscan(y), hresolu, stdout) < 0) |
635 |
|
syserror(); |
656 |
|
if (donorm) { |
657 |
|
double vx, yzn2; |
658 |
|
register int x; |
659 |
< |
yzn2 = y - .5*(vresolu-1); |
659 |
> |
yzn2 = (y+.5)/vresolu + ourview.voff - .5; |
660 |
|
yzn2 = 1. + yzn2*yzn2*ourview.vn2; |
661 |
|
for (x = 0; x < hresolu; x++) { |
662 |
< |
vx = x - .5*(hresolu-1); |
662 |
> |
vx = (x+.5)/hresolu + ourview.hoff - .5; |
663 |
|
zout[x] = zscan(y)[x] |
664 |
|
* sqrt(vx*vx*ourview.hn2 + yzn2); |
665 |
|
} |
666 |
|
} else |
667 |
|
zout = zscan(y); |
668 |
< |
if (write(fd, zout, hresolu*sizeof(float)) |
668 |
> |
if (write(fd, (char *)zout, hresolu*sizeof(float)) |
669 |
|
< hresolu*sizeof(float)) { |
670 |
|
perror(fname); |
671 |
|
exit(1); |
698 |
|
} |
699 |
|
|
700 |
|
|
701 |
< |
calstart(prog, args) /* start fill calculation */ |
701 |
> |
calstart(prog, args) /* start fill calculation */ |
702 |
|
char *prog, *args; |
703 |
|
{ |
704 |
|
char combuf[512]; |
705 |
< |
int p0[2], p1[2]; |
705 |
> |
char *argv[64]; |
706 |
> |
int rval; |
707 |
> |
register char **wp, *cp; |
708 |
|
|
709 |
|
if (childpid != -1) { |
710 |
|
fprintf(stderr, "%s: too many calculations\n", progname); |
711 |
|
exit(1); |
712 |
|
} |
713 |
< |
sprintf(combuf, prog, PACKSIZ, args); |
714 |
< |
if (pipe(p0) < 0 || pipe(p1) < 0) |
715 |
< |
syserror(); |
716 |
< |
if ((childpid = vfork()) == 0) { /* fork calculation */ |
717 |
< |
close(p0[1]); |
718 |
< |
close(p1[0]); |
719 |
< |
if (p0[0] != 0) { |
720 |
< |
dup2(p0[0], 0); |
721 |
< |
close(p0[0]); |
722 |
< |
} |
723 |
< |
if (p1[1] != 1) { |
649 |
< |
dup2(p1[1], 1); |
650 |
< |
close(p1[1]); |
651 |
< |
} |
652 |
< |
execl("/bin/sh", "sh", "-c", combuf, 0); |
653 |
< |
perror("/bin/sh"); |
654 |
< |
_exit(127); |
713 |
> |
strcpy(combuf, prog); |
714 |
> |
strcat(combuf, args); |
715 |
> |
cp = combuf; |
716 |
> |
wp = argv; |
717 |
> |
for ( ; ; ) { |
718 |
> |
while (isspace(*cp)) cp++; |
719 |
> |
if (!*cp) break; |
720 |
> |
*wp++ = cp; |
721 |
> |
while (!isspace(*cp)) |
722 |
> |
if (!*cp++) goto done; |
723 |
> |
*cp++ = '\0'; |
724 |
|
} |
725 |
< |
if (childpid == -1) |
725 |
> |
done: |
726 |
> |
*wp = NULL; |
727 |
> |
/* start process */ |
728 |
> |
if ((rval = open_process(PDesc, argv)) < 0) |
729 |
|
syserror(); |
730 |
< |
close(p0[0]); |
731 |
< |
close(p1[1]); |
732 |
< |
if ((psend = fdopen(p0[1], "w")) == NULL) |
733 |
< |
syserror(); |
734 |
< |
if ((precv = fdopen(p1[0], "r")) == NULL) |
735 |
< |
syserror(); |
730 |
> |
if (rval == 0) { |
731 |
> |
fprintf(stderr, "%s: command not found\n", argv[0]); |
732 |
> |
exit(1); |
733 |
> |
} |
734 |
> |
packsiz = rval/(6*sizeof(float)) - 1; |
735 |
> |
if (packsiz > PACKSIZ) |
736 |
> |
packsiz = PACKSIZ; |
737 |
|
queuesiz = 0; |
738 |
|
} |
739 |
|
|
740 |
|
|
741 |
< |
caldone() /* done with calculation */ |
741 |
> |
caldone() /* done with calculation */ |
742 |
|
{ |
670 |
– |
int pid; |
671 |
– |
|
743 |
|
if (childpid == -1) |
744 |
|
return; |
745 |
< |
clearqueue(1); |
746 |
< |
while ((pid = wait(0)) != -1 && pid != childpid) |
676 |
< |
; |
745 |
> |
clearqueue(); |
746 |
> |
close_process(PDesc); |
747 |
|
childpid = -1; |
748 |
|
} |
749 |
|
|
751 |
|
rcalfill(x, y) /* fill with ray-calculated pixel */ |
752 |
|
int x, y; |
753 |
|
{ |
754 |
< |
if (queuesiz >= PACKSIZ) /* flush queue if needed */ |
755 |
< |
clearqueue(0); |
754 |
> |
if (queuesiz >= packsiz) /* flush queue if needed */ |
755 |
> |
clearqueue(); |
756 |
|
/* add position to queue */ |
757 |
|
queue[queuesiz][0] = x; |
758 |
|
queue[queuesiz][1] = y; |
760 |
|
} |
761 |
|
|
762 |
|
|
763 |
< |
clearqueue(done) /* process queue */ |
694 |
< |
int done; |
763 |
> |
clearqueue() /* process queue */ |
764 |
|
{ |
765 |
|
FVECT orig, dir; |
766 |
< |
float fbuf[6]; |
766 |
> |
float fbuf[6*(PACKSIZ+1)]; |
767 |
> |
register float *fbp; |
768 |
|
register int i; |
769 |
|
|
770 |
+ |
fbp = fbuf; |
771 |
|
for (i = 0; i < queuesiz; i++) { |
772 |
|
viewray(orig, dir, &ourview, |
773 |
|
(queue[i][0]+.5)/hresolu, |
774 |
|
(queue[i][1]+.5)/vresolu); |
775 |
< |
fbuf[0] = orig[0]; fbuf[1] = orig[1]; fbuf[2] = orig[2]; |
776 |
< |
fbuf[3] = dir[0]; fbuf[4] = dir[1]; fbuf[5] = dir[2]; |
706 |
< |
fwrite(fbuf, sizeof(float), 6, psend); |
775 |
> |
*fbp++ = orig[0]; *fbp++ = orig[1]; *fbp++ = orig[2]; |
776 |
> |
*fbp++ = dir[0]; *fbp++ = dir[1]; *fbp++ = dir[2]; |
777 |
|
} |
778 |
< |
if ((done ? fclose(psend) : fflush(psend)) == EOF) |
779 |
< |
syserror(); |
778 |
> |
/* mark end and get results */ |
779 |
> |
bzero((char *)fbp, 6*sizeof(float)); |
780 |
> |
if (process(PDesc, fbuf, fbuf, 4*sizeof(float)*queuesiz, |
781 |
> |
6*sizeof(float)*(queuesiz+1)) != |
782 |
> |
4*sizeof(float)*queuesiz) { |
783 |
> |
fprintf(stderr, "%s: error reading from rtrace process\n", |
784 |
> |
progname); |
785 |
> |
exit(1); |
786 |
> |
} |
787 |
> |
fbp = fbuf; |
788 |
|
for (i = 0; i < queuesiz; i++) { |
711 |
– |
if (fread(fbuf, sizeof(float), 4, precv) < 4) { |
712 |
– |
fprintf(stderr, "%s: read error in clearqueue\n", |
713 |
– |
progname); |
714 |
– |
exit(1); |
715 |
– |
} |
789 |
|
if (ourexp > 0 && ourexp != 1.0) { |
790 |
< |
fbuf[0] *= ourexp; |
791 |
< |
fbuf[1] *= ourexp; |
792 |
< |
fbuf[2] *= ourexp; |
790 |
> |
fbp[0] *= ourexp; |
791 |
> |
fbp[1] *= ourexp; |
792 |
> |
fbp[2] *= ourexp; |
793 |
|
} |
794 |
|
setcolr(pscan(queue[i][1])[queue[i][0]], |
795 |
< |
fbuf[0], fbuf[1], fbuf[2]); |
796 |
< |
zscan(queue[i][1])[queue[i][0]] = fbuf[3]; |
795 |
> |
fbp[0], fbp[1], fbp[2]); |
796 |
> |
zscan(queue[i][1])[queue[i][0]] = fbp[3]; |
797 |
> |
fbp += 4; |
798 |
|
} |
725 |
– |
if (done) |
726 |
– |
fclose(precv); |
799 |
|
queuesiz = 0; |
800 |
|
} |
801 |
|
|