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 <ctype.h> |
16 |
+ |
|
17 |
|
#include "view.h" |
18 |
|
|
19 |
|
#include "color.h" |
20 |
|
|
21 |
+ |
#include "resolu.h" |
22 |
+ |
|
23 |
+ |
#ifndef BSD |
24 |
+ |
#define vfork fork |
25 |
+ |
#endif |
26 |
+ |
|
27 |
|
#define pscan(y) (ourpict+(y)*hresolu) |
28 |
|
#define zscan(y) (ourzbuf+(y)*hresolu) |
29 |
|
|
30 |
|
#define F_FORE 1 /* fill foreground */ |
31 |
|
#define F_BACK 2 /* fill background */ |
32 |
|
|
33 |
< |
#define PACKSIZ 42 /* calculation packet size */ |
33 |
> |
#define PACKSIZ 256 /* max. calculation packet size */ |
34 |
|
|
35 |
< |
#define RTCOM "rtrace -h -ovl -fff -x %d %s" |
35 |
> |
#define RTCOM "rtrace -h- -ovl -fff " |
36 |
|
|
37 |
|
#define ABS(x) ((x)>0?(x):-(x)) |
38 |
|
|
50 |
|
|
51 |
|
char *progname; |
52 |
|
|
53 |
< |
int fill = F_FORE|F_BACK; /* selected fill algorithm */ |
53 |
> |
int fillo = F_FORE|F_BACK; /* selected fill options */ |
54 |
> |
int fillsamp = 0; /* sample separation (0 == inf) */ |
55 |
|
extern int backfill(), rcalfill(); /* fill functions */ |
56 |
< |
int (*deffill)() = backfill; /* selected fill function */ |
56 |
> |
int (*fillfunc)() = backfill; /* selected fill function */ |
57 |
|
COLR backcolr = BLKCOLR; /* background color */ |
58 |
|
double backz = 0.0; /* background z value */ |
59 |
|
int normdist = 1; /* normalized distance? */ |
61 |
|
|
62 |
|
VIEW theirview = STDVIEW; /* input view */ |
63 |
|
int gotview; /* got input view? */ |
64 |
< |
int thresolu, tvresolu; /* input resolution */ |
64 |
> |
int wrongformat = 0; /* input in another format? */ |
65 |
> |
RESOLU tresolu; /* input resolution */ |
66 |
|
double theirexp; /* input picture exposure */ |
67 |
|
double theirs2ours[4][4]; /* transformation matrix */ |
68 |
+ |
int hasmatrix = 0; /* has transformation matrix */ |
69 |
|
|
70 |
< |
int childpid = -1; /* id of fill process */ |
71 |
< |
FILE *psend, *precv; /* pipes to/from fill calculation */ |
72 |
< |
int queue[PACKSIZ][2]; /* pending pixels */ |
70 |
> |
int PDesc[3] = {-1,-1,-1}; /* rtrace process descriptor */ |
71 |
> |
#define childpid (PDesc[2]) |
72 |
> |
unsigned short queue[PACKSIZ][2]; /* pending pixels */ |
73 |
> |
int packsiz; /* actual packet size */ |
74 |
|
int queuesiz; /* number of pixels pending */ |
75 |
|
|
76 |
|
|
78 |
|
int argc; |
79 |
|
char *argv[]; |
80 |
|
{ |
81 |
< |
#define check(olen,narg) if (argv[i][olen] || narg >= argc-i) goto badopt |
82 |
< |
extern double atof(); |
81 |
> |
#define check(ol,al) if (argv[i][ol] || \ |
82 |
> |
badarg(argc-i-1,argv+i+1,al)) \ |
83 |
> |
goto badopt |
84 |
|
int gotvfile = 0; |
85 |
|
char *zfile = NULL; |
86 |
|
char *err; |
96 |
|
} |
97 |
|
switch (argv[i][1]) { |
98 |
|
case 't': /* threshold */ |
99 |
< |
check(2,1); |
99 |
> |
check(2,"f"); |
100 |
|
zeps = atof(argv[++i]); |
101 |
|
break; |
102 |
|
case 'n': /* dist. normalized? */ |
103 |
< |
check(2,0); |
103 |
> |
check(2,NULL); |
104 |
|
normdist = !normdist; |
105 |
|
break; |
106 |
|
case 'f': /* fill type */ |
107 |
|
switch (argv[i][2]) { |
108 |
|
case '0': /* none */ |
109 |
< |
check(3,0); |
110 |
< |
fill = 0; |
109 |
> |
check(3,NULL); |
110 |
> |
fillo = 0; |
111 |
|
break; |
112 |
|
case 'f': /* foreground */ |
113 |
< |
check(3,0); |
114 |
< |
fill = F_FORE; |
113 |
> |
check(3,NULL); |
114 |
> |
fillo = F_FORE; |
115 |
|
break; |
116 |
|
case 'b': /* background */ |
117 |
< |
check(3,0); |
118 |
< |
fill = F_BACK; |
117 |
> |
check(3,NULL); |
118 |
> |
fillo = F_BACK; |
119 |
|
break; |
120 |
|
case 'a': /* all */ |
121 |
< |
check(3,0); |
122 |
< |
fill = F_FORE|F_BACK; |
121 |
> |
check(3,NULL); |
122 |
> |
fillo = F_FORE|F_BACK; |
123 |
|
break; |
124 |
+ |
case 's': /* sample */ |
125 |
+ |
check(3,"i"); |
126 |
+ |
fillsamp = atoi(argv[++i]); |
127 |
+ |
break; |
128 |
|
case 'c': /* color */ |
129 |
< |
check(3,3); |
130 |
< |
deffill = backfill; |
129 |
> |
check(3,"fff"); |
130 |
> |
fillfunc = backfill; |
131 |
|
setcolr(backcolr, atof(argv[i+1]), |
132 |
|
atof(argv[i+2]), atof(argv[i+3])); |
133 |
|
i += 3; |
134 |
|
break; |
135 |
|
case 'z': /* z value */ |
136 |
< |
check(3,1); |
137 |
< |
deffill = backfill; |
136 |
> |
check(3,"f"); |
137 |
> |
fillfunc = backfill; |
138 |
|
backz = atof(argv[++i]); |
139 |
|
break; |
140 |
|
case 'r': /* rtrace */ |
141 |
< |
check(3,1); |
142 |
< |
deffill = rcalfill; |
141 |
> |
check(3,"s"); |
142 |
> |
fillfunc = rcalfill; |
143 |
|
calstart(RTCOM, argv[++i]); |
144 |
|
break; |
145 |
|
default: |
147 |
|
} |
148 |
|
break; |
149 |
|
case 'z': /* z file */ |
150 |
< |
check(2,1); |
150 |
> |
check(2,"s"); |
151 |
|
zfile = argv[++i]; |
152 |
|
break; |
153 |
|
case 'x': /* x resolution */ |
154 |
< |
check(2,1); |
154 |
> |
check(2,"i"); |
155 |
|
hresolu = atoi(argv[++i]); |
156 |
|
break; |
157 |
|
case 'y': /* y resolution */ |
158 |
< |
check(2,1); |
158 |
> |
check(2,"i"); |
159 |
|
vresolu = atoi(argv[++i]); |
160 |
|
break; |
161 |
|
case 'p': /* pixel aspect */ |
162 |
< |
check(2,1); |
162 |
> |
if (argv[i][2] != 'a') |
163 |
> |
goto badopt; |
164 |
> |
check(3,"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); |
171 |
< |
gotvfile = viewfile(argv[++i], &ourview); |
170 |
> |
check(3,"s"); |
171 |
> |
gotvfile = viewfile(argv[++i], &ourview, 0, 0); |
172 |
|
if (gotvfile < 0) { |
173 |
|
perror(argv[i]); |
174 |
|
exit(1); |
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); |
197 |
|
} |
198 |
|
normaspect(viewaspect(&ourview), &pixaspect, &hresolu, &vresolu); |
199 |
|
/* allocate frame */ |
200 |
< |
ourpict = (COLR *)malloc(hresolu*vresolu*sizeof(COLR)); |
201 |
< |
ourzbuf = (float *)calloc(hresolu*vresolu,sizeof(float)); |
200 |
> |
ourpict = (COLR *)bmalloc(hresolu*vresolu*sizeof(COLR)); |
201 |
> |
ourzbuf = (float *)bmalloc(hresolu*vresolu*sizeof(float)); |
202 |
|
if (ourpict == NULL || ourzbuf == NULL) |
203 |
|
syserror(); |
204 |
+ |
bzero((char *)ourzbuf, hresolu*vresolu*sizeof(float)); |
205 |
|
/* get input */ |
206 |
|
for ( ; i < argc; i += 2) |
207 |
|
addpicture(argv[i], argv[i+1]); |
208 |
|
/* fill in spaces */ |
209 |
< |
if (fill&F_BACK) |
210 |
< |
backpicture(); |
209 |
> |
if (fillo&F_BACK) |
210 |
> |
backpicture(fillfunc, fillsamp); |
211 |
|
else |
212 |
< |
fillpicture(); |
212 |
> |
fillpicture(fillfunc); |
213 |
|
/* close calculation */ |
214 |
|
caldone(); |
215 |
|
/* add to header */ |
216 |
|
printargs(argc, argv, stdout); |
217 |
|
if (gotvfile) { |
218 |
< |
printf(VIEWSTR); |
218 |
> |
fputs(VIEWSTR, stdout); |
219 |
|
fprintview(&ourview, stdout); |
220 |
< |
printf("\n"); |
220 |
> |
putc('\n', stdout); |
221 |
|
} |
222 |
|
if (pixaspect < .99 || pixaspect > 1.01) |
223 |
|
fputaspect(pixaspect, stdout); |
224 |
|
if (ourexp > 0 && (ourexp < .995 || ourexp > 1.005)) |
225 |
|
fputexpos(ourexp, stdout); |
226 |
< |
printf("\n"); |
226 |
> |
fputformat(COLRFMT, stdout); |
227 |
> |
putc('\n', stdout); |
228 |
|
/* write picture */ |
229 |
|
writepicture(); |
230 |
|
/* write z file */ |
244 |
|
headline(s) /* process header string */ |
245 |
|
char *s; |
246 |
|
{ |
247 |
< |
static char *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL}; |
223 |
< |
register char **an; |
247 |
> |
char fmt[32]; |
248 |
|
|
249 |
< |
printf("\t%s", s); |
249 |
> |
if (isformat(s)) { |
250 |
> |
formatval(fmt, s); |
251 |
> |
wrongformat = strcmp(fmt, COLRFMT); |
252 |
> |
return; |
253 |
> |
} |
254 |
> |
putc('\t', stdout); |
255 |
> |
fputs(s, stdout); |
256 |
|
|
257 |
|
if (isexpos(s)) { |
258 |
|
theirexp *= exposval(s); |
259 |
|
return; |
260 |
|
} |
261 |
< |
for (an = altname; *an != NULL; an++) |
262 |
< |
if (!strncmp(*an, s, strlen(*an))) { |
233 |
< |
if (sscanview(&theirview, s+strlen(*an)) > 0) |
234 |
< |
gotview++; |
235 |
< |
break; |
236 |
< |
} |
261 |
> |
if (isview(s) && sscanview(&theirview, s) > 0) |
262 |
> |
gotview++; |
263 |
|
} |
264 |
|
|
265 |
|
|
266 |
|
addpicture(pfile, zspec) /* add picture to output */ |
267 |
|
char *pfile, *zspec; |
268 |
|
{ |
269 |
< |
extern double atof(); |
270 |
< |
FILE *pfp, *zfp; |
269 |
> |
FILE *pfp; |
270 |
> |
int zfd; |
271 |
|
char *err; |
272 |
|
COLR *scanin; |
273 |
|
float *zin; |
282 |
|
theirexp = 1.0; |
283 |
|
gotview = 0; |
284 |
|
printf("%s:\n", pfile); |
285 |
< |
getheader(pfp, headline); |
286 |
< |
if (!gotview || fgetresolu(&thresolu, &tvresolu, pfp) |
287 |
< |
!= (YMAJOR|YDECR)) { |
262 |
< |
fprintf(stderr, "%s: picture view error\n", pfile); |
285 |
> |
getheader(pfp, headline, NULL); |
286 |
> |
if (wrongformat || !gotview || !fgetsresolu(&tresolu, pfp)) { |
287 |
> |
fprintf(stderr, "%s: picture format error\n", pfile); |
288 |
|
exit(1); |
289 |
|
} |
290 |
|
if (ourexp <= 0) |
296 |
|
exit(1); |
297 |
|
} |
298 |
|
/* compute transformation */ |
299 |
< |
pixform(theirs2ours, &theirview, &ourview); |
299 |
> |
hasmatrix = pixform(theirs2ours, &theirview, &ourview); |
300 |
|
/* allocate scanlines */ |
301 |
< |
scanin = (COLR *)malloc(thresolu*sizeof(COLR)); |
302 |
< |
zin = (float *)malloc(thresolu*sizeof(float)); |
303 |
< |
plast = (struct position *)calloc(thresolu, sizeof(struct position)); |
301 |
> |
scanin = (COLR *)malloc(scanlen(&tresolu)*sizeof(COLR)); |
302 |
> |
zin = (float *)malloc(scanlen(&tresolu)*sizeof(float)); |
303 |
> |
plast = (struct position *)calloc(scanlen(&tresolu), |
304 |
> |
sizeof(struct position)); |
305 |
|
if (scanin == NULL || zin == NULL || plast == NULL) |
306 |
|
syserror(); |
307 |
|
/* get z specification or file */ |
308 |
< |
if ((zfp = fopen(zspec, "r")) == NULL) { |
308 |
> |
if ((zfd = open(zspec, O_RDONLY)) == -1) { |
309 |
|
double zvalue; |
310 |
|
register int x; |
311 |
|
if (!isfloat(zspec) || (zvalue = atof(zspec)) <= 0.0) { |
312 |
|
perror(zspec); |
313 |
|
exit(1); |
314 |
|
} |
315 |
< |
for (x = 0; x < thresolu; x++) |
315 |
> |
for (x = scanlen(&tresolu); x-- > 0; ) |
316 |
|
zin[x] = zvalue; |
317 |
|
} |
318 |
|
/* load image */ |
319 |
< |
for (y = tvresolu-1; y >= 0; y--) { |
320 |
< |
if (freadcolrs(scanin, thresolu, pfp) < 0) { |
319 |
> |
for (y = 0; y < numscans(&tresolu); y++) { |
320 |
> |
if (freadcolrs(scanin, scanlen(&tresolu), pfp) < 0) { |
321 |
|
fprintf(stderr, "%s: read error\n", pfile); |
322 |
|
exit(1); |
323 |
|
} |
324 |
< |
if (zfp != NULL |
325 |
< |
&& fread(zin,sizeof(float),thresolu,zfp) < thresolu) { |
324 |
> |
if (zfd != -1 && read(zfd,(char *)zin, |
325 |
> |
scanlen(&tresolu)*sizeof(float)) |
326 |
> |
< scanlen(&tresolu)*sizeof(float)) { |
327 |
|
fprintf(stderr, "%s: read error\n", zspec); |
328 |
|
exit(1); |
329 |
|
} |
334 |
|
free((char *)zin); |
335 |
|
free((char *)plast); |
336 |
|
fclose(pfp); |
337 |
< |
if (zfp != NULL) |
338 |
< |
fclose(zfp); |
337 |
> |
if (zfd != -1) |
338 |
> |
close(zfd); |
339 |
|
} |
340 |
|
|
341 |
|
|
345 |
|
{ |
346 |
|
double m4t[4][4]; |
347 |
|
|
348 |
+ |
if (vw1->type != VT_PER && vw1->type != VT_PAR) |
349 |
+ |
return(0); |
350 |
+ |
if (vw2->type != VT_PER && vw2->type != VT_PAR) |
351 |
+ |
return(0); |
352 |
|
setident4(xfmat); |
353 |
|
xfmat[0][0] = vw1->hvec[0]; |
354 |
|
xfmat[0][1] = vw1->hvec[1]; |
376 |
|
m4t[2][2] = vw2->vdir[2]; |
377 |
|
m4t[3][2] = -DOT(vw2->vp,vw2->vdir); |
378 |
|
multmat4(xfmat, xfmat, m4t); |
379 |
+ |
return(1); |
380 |
|
} |
381 |
|
|
382 |
|
|
387 |
|
struct position *lasty; /* input/output */ |
388 |
|
{ |
389 |
|
extern double sqrt(); |
390 |
< |
double pos[3]; |
390 |
> |
FVECT pos; |
391 |
|
struct position lastx, newpos; |
392 |
|
register int x; |
393 |
|
|
394 |
< |
for (x = thresolu-1; x >= 0; x--) { |
395 |
< |
pos[0] = (x+.5)/thresolu + theirview.hoff - .5; |
396 |
< |
pos[1] = (y+.5)/tvresolu + theirview.voff - .5; |
394 |
> |
lastx.z = 0; |
395 |
> |
for (x = scanlen(&tresolu); x-- > 0; ) { |
396 |
> |
pix2loc(pos, &tresolu, x, y); |
397 |
|
pos[2] = zline[x]; |
398 |
< |
if (theirview.type == VT_PER) { |
367 |
< |
if (normdist) /* adjust for eye-ray distance */ |
368 |
< |
pos[2] /= sqrt( 1. |
369 |
< |
+ pos[0]*pos[0]*theirview.hn2 |
370 |
< |
+ pos[1]*pos[1]*theirview.vn2 ); |
371 |
< |
pos[0] *= pos[2]; |
372 |
< |
pos[1] *= pos[2]; |
373 |
< |
} |
374 |
< |
multp3(pos, pos, theirs2ours); |
375 |
< |
if (pos[2] <= 0) { |
398 |
> |
if (movepixel(pos) < 0) { |
399 |
|
lasty[x].z = lastx.z = 0; /* mark invalid */ |
400 |
|
continue; |
401 |
|
} |
379 |
– |
if (ourview.type == VT_PER) { |
380 |
– |
pos[0] /= pos[2]; |
381 |
– |
pos[1] /= pos[2]; |
382 |
– |
} |
383 |
– |
pos[0] += .5 - ourview.hoff; |
384 |
– |
pos[1] += .5 - ourview.voff; |
402 |
|
newpos.x = pos[0] * hresolu; |
403 |
|
newpos.y = pos[1] * vresolu; |
404 |
|
newpos.z = zline[x]; |
428 |
|
register int x, y; /* final position */ |
429 |
|
|
430 |
|
/* compute vector p0p1 */ |
431 |
< |
if (fill&F_FORE && ABS(p1->z-p0->z) <= zt) { |
431 |
> |
if (fillo&F_FORE && ABS(p1->z-p0->z) <= zt) { |
432 |
|
s1x = p1->x - p0->x; |
433 |
|
s1y = p1->y - p0->y; |
434 |
|
l1 = ABS(s1x); |
439 |
|
p1isy = -1; |
440 |
|
} |
441 |
|
/* compute vector p0p2 */ |
442 |
< |
if (fill&F_FORE && ABS(p2->z-p0->z) <= zt) { |
442 |
> |
if (fillo&F_FORE && ABS(p2->z-p0->z) <= zt) { |
443 |
|
s2x = p2->x - p0->x; |
444 |
|
s2y = p2->y - p0->y; |
445 |
|
if (p1isy == 1) |
457 |
|
y1 = p0->y + c1*s1y/l1; |
458 |
|
for (c2 = l2; c2-- > 0; ) { |
459 |
|
x = x1 + c2*s2x/l2; |
460 |
+ |
if (x < 0 || x >= hresolu) |
461 |
+ |
continue; |
462 |
|
y = y1 + c2*s2y/l2; |
463 |
+ |
if (y < 0 || y >= vresolu) |
464 |
+ |
continue; |
465 |
|
if (zscan(y)[x] <= 0 || zscan(y)[x]-z |
466 |
|
> zeps*zscan(y)[x]) { |
467 |
|
zscan(y)[x] = z; |
472 |
|
} |
473 |
|
|
474 |
|
|
475 |
< |
backpicture() /* background fill algorithm */ |
475 |
> |
movepixel(pos) /* reposition image point */ |
476 |
> |
FVECT pos; |
477 |
|
{ |
478 |
+ |
FVECT pt, direc; |
479 |
+ |
|
480 |
+ |
if (pos[2] <= 0) /* empty pixel */ |
481 |
+ |
return(-1); |
482 |
+ |
if (hasmatrix) { |
483 |
+ |
pos[0] += theirview.hoff - .5; |
484 |
+ |
pos[1] += theirview.voff - .5; |
485 |
+ |
if (theirview.type == VT_PER) { |
486 |
+ |
if (normdist) /* adjust for eye-ray distance */ |
487 |
+ |
pos[2] /= sqrt( 1. |
488 |
+ |
+ pos[0]*pos[0]*theirview.hn2 |
489 |
+ |
+ pos[1]*pos[1]*theirview.vn2 ); |
490 |
+ |
pos[0] *= pos[2]; |
491 |
+ |
pos[1] *= pos[2]; |
492 |
+ |
} |
493 |
+ |
multp3(pos, pos, theirs2ours); |
494 |
+ |
if (pos[2] <= 0) |
495 |
+ |
return(-1); |
496 |
+ |
if (ourview.type == VT_PER) { |
497 |
+ |
pos[0] /= pos[2]; |
498 |
+ |
pos[1] /= pos[2]; |
499 |
+ |
} |
500 |
+ |
pos[0] += .5 - ourview.hoff; |
501 |
+ |
pos[1] += .5 - ourview.voff; |
502 |
+ |
return(0); |
503 |
+ |
} |
504 |
+ |
if (viewray(pt, direc, &theirview, pos[0], pos[1]) < 0) |
505 |
+ |
return(-1); |
506 |
+ |
pt[0] += direc[0]*pos[2]; |
507 |
+ |
pt[1] += direc[1]*pos[2]; |
508 |
+ |
pt[2] += direc[2]*pos[2]; |
509 |
+ |
viewloc(pos, &ourview, pt); |
510 |
+ |
if (pos[2] <= 0) |
511 |
+ |
return(-1); |
512 |
+ |
return(0); |
513 |
+ |
} |
514 |
+ |
|
515 |
+ |
|
516 |
+ |
backpicture(fill, samp) /* background fill algorithm */ |
517 |
+ |
int (*fill)(); |
518 |
+ |
int samp; |
519 |
+ |
{ |
520 |
|
int *yback, xback; |
521 |
|
int y; |
458 |
– |
COLR pfill; |
522 |
|
register int x, i; |
523 |
|
/* get back buffer */ |
524 |
|
yback = (int *)malloc(hresolu*sizeof(int)); |
565 |
|
xback = x-1; |
566 |
|
} |
567 |
|
/* |
568 |
< |
* Check to see if we have no background for |
569 |
< |
* this pixel. If not, use background color. |
568 |
> |
* If we have no background for this pixel, |
569 |
> |
* use the given fill function. |
570 |
|
*/ |
571 |
< |
if (xback < 0 && yback[x] < 0) { |
572 |
< |
(*deffill)(x,y); |
510 |
< |
continue; |
511 |
< |
} |
571 |
> |
if (xback < 0 && yback[x] < 0) |
572 |
> |
goto fillit; |
573 |
|
/* |
574 |
|
* Compare, and use the background that is |
575 |
|
* farther, unless one of them is next to us. |
576 |
+ |
* If the background is too distant, call |
577 |
+ |
* the fill function. |
578 |
|
*/ |
579 |
|
if ( yback[x] < 0 |
580 |
|
|| (xback >= 0 && ABS(x-xback) <= 1) |
581 |
|
|| ( ABS(y-yback[x]) > 1 |
582 |
|
&& zscan(yback[x])[x] |
583 |
|
< zscan(y)[xback] ) ) { |
584 |
+ |
if (samp > 0 && ABS(x-xback) >= samp) |
585 |
+ |
goto fillit; |
586 |
|
copycolr(pscan(y)[x],pscan(y)[xback]); |
587 |
|
zscan(y)[x] = zscan(y)[xback]; |
588 |
|
} else { |
589 |
+ |
if (samp > 0 && ABS(y-yback[x]) > samp) |
590 |
+ |
goto fillit; |
591 |
|
copycolr(pscan(y)[x],pscan(yback[x])[x]); |
592 |
|
zscan(y)[x] = zscan(yback[x])[x]; |
593 |
|
} |
594 |
+ |
continue; |
595 |
+ |
fillit: |
596 |
+ |
(*fill)(x,y); |
597 |
+ |
if (fill == rcalfill) { /* use it */ |
598 |
+ |
clearqueue(); |
599 |
+ |
xback = x; |
600 |
+ |
yback[x] = y; |
601 |
+ |
} |
602 |
|
} else { /* full pixel */ |
603 |
|
yback[x] = -2; |
604 |
|
xback = -2; |
608 |
|
} |
609 |
|
|
610 |
|
|
611 |
< |
fillpicture() /* paint in empty pixels with default */ |
611 |
> |
fillpicture(fill) /* paint in empty pixels using fill */ |
612 |
> |
int (*fill)(); |
613 |
|
{ |
614 |
|
register int x, y; |
615 |
|
|
616 |
|
for (y = 0; y < vresolu; y++) |
617 |
|
for (x = 0; x < hresolu; x++) |
618 |
|
if (zscan(y)[x] <= 0) |
619 |
< |
(*deffill)(x,y); |
619 |
> |
(*fill)(x,y); |
620 |
|
} |
621 |
|
|
622 |
|
|
624 |
|
{ |
625 |
|
int y; |
626 |
|
|
627 |
< |
fputresolu(YMAJOR|YDECR, hresolu, vresolu, stdout); |
627 |
> |
fprtresolu(hresolu, vresolu, stdout); |
628 |
|
for (y = vresolu-1; y >= 0; y--) |
629 |
|
if (fwritecolrs(pscan(y), hresolu, stdout) < 0) |
630 |
|
syserror(); |
636 |
|
{ |
637 |
|
extern double sqrt(); |
638 |
|
int donorm = normdist && ourview.type == VT_PER; |
639 |
< |
FILE *fp; |
639 |
> |
int fd; |
640 |
|
int y; |
641 |
|
float *zout; |
642 |
|
|
643 |
< |
if ((fp = fopen(fname, "w")) == NULL) { |
643 |
> |
if ((fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) == -1) { |
644 |
|
perror(fname); |
645 |
|
exit(1); |
646 |
|
} |
651 |
|
if (donorm) { |
652 |
|
double vx, yzn2; |
653 |
|
register int x; |
654 |
< |
yzn2 = y - .5*(vresolu-1); |
654 |
> |
yzn2 = (y+.5)/vresolu + ourview.voff - .5; |
655 |
|
yzn2 = 1. + yzn2*yzn2*ourview.vn2; |
656 |
|
for (x = 0; x < hresolu; x++) { |
657 |
< |
vx = x - .5*(hresolu-1); |
657 |
> |
vx = (x+.5)/hresolu + ourview.hoff - .5; |
658 |
|
zout[x] = zscan(y)[x] |
659 |
|
* sqrt(vx*vx*ourview.hn2 + yzn2); |
660 |
|
} |
661 |
|
} else |
662 |
|
zout = zscan(y); |
663 |
< |
if (fwrite(zout, sizeof(float), hresolu, fp) < hresolu) { |
663 |
> |
if (write(fd, (char *)zout, hresolu*sizeof(float)) |
664 |
> |
< hresolu*sizeof(float)) { |
665 |
|
perror(fname); |
666 |
|
exit(1); |
667 |
|
} |
668 |
|
} |
669 |
|
if (donorm) |
670 |
|
free((char *)zout); |
671 |
< |
fclose(fp); |
671 |
> |
close(fd); |
672 |
|
} |
673 |
|
|
674 |
|
|
693 |
|
} |
694 |
|
|
695 |
|
|
696 |
< |
calstart(prog, args) /* start fill calculation */ |
696 |
> |
calstart(prog, args) /* start fill calculation */ |
697 |
|
char *prog, *args; |
698 |
|
{ |
699 |
|
char combuf[512]; |
700 |
< |
int p0[2], p1[2]; |
700 |
> |
char *argv[64]; |
701 |
> |
int rval; |
702 |
> |
register char **wp, *cp; |
703 |
|
|
704 |
|
if (childpid != -1) { |
705 |
|
fprintf(stderr, "%s: too many calculations\n", progname); |
706 |
|
exit(1); |
707 |
|
} |
708 |
< |
sprintf(combuf, prog, PACKSIZ, args); |
709 |
< |
if (pipe(p0) < 0 || pipe(p1) < 0) |
710 |
< |
syserror(); |
711 |
< |
if ((childpid = vfork()) == 0) { /* fork calculation */ |
712 |
< |
close(p0[1]); |
713 |
< |
close(p1[0]); |
714 |
< |
if (p0[0] != 0) { |
715 |
< |
dup2(p0[0], 0); |
716 |
< |
close(p0[0]); |
717 |
< |
} |
718 |
< |
if (p1[1] != 1) { |
640 |
< |
dup2(p1[1], 1); |
641 |
< |
close(p1[1]); |
642 |
< |
} |
643 |
< |
execl("/bin/sh", "sh", "-c", combuf, 0); |
644 |
< |
perror("/bin/sh"); |
645 |
< |
_exit(127); |
708 |
> |
strcpy(combuf, prog); |
709 |
> |
strcat(combuf, args); |
710 |
> |
cp = combuf; |
711 |
> |
wp = argv; |
712 |
> |
for ( ; ; ) { |
713 |
> |
while (isspace(*cp)) cp++; |
714 |
> |
if (!*cp) break; |
715 |
> |
*wp++ = cp; |
716 |
> |
while (!isspace(*cp)) |
717 |
> |
if (!*cp++) goto done; |
718 |
> |
*cp++ = '\0'; |
719 |
|
} |
720 |
< |
if (childpid == -1) |
720 |
> |
done: |
721 |
> |
*wp = NULL; |
722 |
> |
/* start process */ |
723 |
> |
if ((rval = open_process(PDesc, argv)) < 0) |
724 |
|
syserror(); |
725 |
< |
close(p0[0]); |
726 |
< |
close(p1[1]); |
727 |
< |
if ((psend = fdopen(p0[1], "w")) == NULL) |
728 |
< |
syserror(); |
729 |
< |
if ((precv = fdopen(p1[0], "r")) == NULL) |
730 |
< |
syserror(); |
725 |
> |
if (rval == 0) { |
726 |
> |
fprintf(stderr, "%s: command not found\n", argv[0]); |
727 |
> |
exit(1); |
728 |
> |
} |
729 |
> |
packsiz = rval/(6*sizeof(float)) - 1; |
730 |
> |
if (packsiz > PACKSIZ) |
731 |
> |
packsiz = PACKSIZ; |
732 |
|
queuesiz = 0; |
733 |
|
} |
734 |
|
|
735 |
|
|
736 |
< |
caldone() /* done with calculation */ |
736 |
> |
caldone() /* done with calculation */ |
737 |
|
{ |
661 |
– |
int pid; |
662 |
– |
|
738 |
|
if (childpid == -1) |
739 |
|
return; |
665 |
– |
if (fclose(psend) == EOF) |
666 |
– |
syserror(); |
740 |
|
clearqueue(); |
741 |
< |
fclose(precv); |
669 |
< |
while ((pid = wait(0)) != -1 && pid != childpid) |
670 |
< |
; |
741 |
> |
close_process(PDesc); |
742 |
|
childpid = -1; |
743 |
|
} |
744 |
|
|
746 |
|
rcalfill(x, y) /* fill with ray-calculated pixel */ |
747 |
|
int x, y; |
748 |
|
{ |
749 |
< |
FVECT orig, dir; |
679 |
< |
float outbuf[6]; |
680 |
< |
|
681 |
< |
if (queuesiz >= PACKSIZ) { /* flush queue */ |
682 |
< |
if (fflush(psend) == EOF) |
683 |
< |
syserror(); |
749 |
> |
if (queuesiz >= packsiz) /* flush queue if needed */ |
750 |
|
clearqueue(); |
751 |
< |
} |
686 |
< |
/* send new ray */ |
687 |
< |
viewray(orig, dir, &ourview, (x+.5)/hresolu, (y+.5)/vresolu); |
688 |
< |
outbuf[0] = orig[0]; outbuf[1] = orig[1]; outbuf[2] = orig[2]; |
689 |
< |
outbuf[3] = dir[0]; outbuf[4] = dir[1]; outbuf[5] = dir[2]; |
690 |
< |
if (fwrite(outbuf, sizeof(float), 6, psend) < 6) |
691 |
< |
syserror(); |
692 |
< |
/* remember it */ |
751 |
> |
/* add position to queue */ |
752 |
|
queue[queuesiz][0] = x; |
753 |
|
queue[queuesiz][1] = y; |
754 |
|
queuesiz++; |
755 |
|
} |
756 |
|
|
757 |
|
|
758 |
< |
clearqueue() /* get results from queue */ |
758 |
> |
clearqueue() /* process queue */ |
759 |
|
{ |
760 |
< |
float inbuf[4]; |
760 |
> |
FVECT orig, dir; |
761 |
> |
float fbuf[6*(PACKSIZ+1)]; |
762 |
> |
register float *fbp; |
763 |
|
register int i; |
764 |
|
|
765 |
+ |
fbp = fbuf; |
766 |
|
for (i = 0; i < queuesiz; i++) { |
767 |
< |
if (fread(inbuf, sizeof(float), 4, precv) < 4) { |
768 |
< |
fprintf(stderr, "%s: read error in clearqueue\n", |
769 |
< |
progname); |
770 |
< |
exit(1); |
771 |
< |
} |
767 |
> |
viewray(orig, dir, &ourview, |
768 |
> |
(queue[i][0]+.5)/hresolu, |
769 |
> |
(queue[i][1]+.5)/vresolu); |
770 |
> |
*fbp++ = orig[0]; *fbp++ = orig[1]; *fbp++ = orig[2]; |
771 |
> |
*fbp++ = dir[0]; *fbp++ = dir[1]; *fbp++ = dir[2]; |
772 |
> |
} |
773 |
> |
/* mark end and get results */ |
774 |
> |
bzero((char *)fbp, 6*sizeof(float)); |
775 |
> |
if (process(PDesc, fbuf, fbuf, 4*sizeof(float)*queuesiz, |
776 |
> |
6*sizeof(float)*(queuesiz+1)) != |
777 |
> |
4*sizeof(float)*queuesiz) { |
778 |
> |
fprintf(stderr, "%s: error reading from rtrace process\n", |
779 |
> |
progname); |
780 |
> |
exit(1); |
781 |
> |
} |
782 |
> |
fbp = fbuf; |
783 |
> |
for (i = 0; i < queuesiz; i++) { |
784 |
|
if (ourexp > 0 && ourexp != 1.0) { |
785 |
< |
inbuf[0] *= ourexp; |
786 |
< |
inbuf[1] *= ourexp; |
787 |
< |
inbuf[2] *= ourexp; |
785 |
> |
fbp[0] *= ourexp; |
786 |
> |
fbp[1] *= ourexp; |
787 |
> |
fbp[2] *= ourexp; |
788 |
|
} |
789 |
|
setcolr(pscan(queue[i][1])[queue[i][0]], |
790 |
< |
inbuf[0], inbuf[1], inbuf[2]); |
791 |
< |
zscan(queue[i][1])[queue[i][0]] = inbuf[3]; |
790 |
> |
fbp[0], fbp[1], fbp[2]); |
791 |
> |
zscan(queue[i][1])[queue[i][0]] = fbp[3]; |
792 |
> |
fbp += 4; |
793 |
|
} |
794 |
|
queuesiz = 0; |
795 |
|
} |