ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/radiance/ray/src/px/pinterp.c

Comparing ray/src/px/pinterp.c (file contents):
Revision 1.13 by greg, Thu Jan 4 16:52:05 1990 UTC vs.
Revision 2.31 by gwlarson, Tue Oct 27 09:08:26 1998 UTC

#	Line 1 | Line 1
1	+	/* Copyright (c) 1995 Regents of the University of California */
2	+
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
5		#endif
#	Line 10 | Line 12 | static char SCCSid[] = "$SunId$ LBL";
12
13		#include "standard.h"
14
15	+	#include <ctype.h>
16	+
17		#include "view.h"
18
19		#include "color.h"
20
21	<	#define pscan(y)        (ourpict+(y)*ourview.hresolu)
18	<	#define zscan(y)        (ourzbuf+(y)*ourview.hresolu)
21	>	#include "resolu.h"
22
23	+	#define LOG2            0.69314718055994530942
24	+
25	+	#define pscan(y)        (ourpict+(y)*hresolu)
26	+	#define sscan(y)        (ourspict+(y)*hresolu)
27	+	#define wscan(y)        (ourweigh+(y)*hresolu)
28	+	#define zscan(y)        (ourzbuf+(y)*hresolu)
29	+	#define bscan(y)        (ourbpict+(y)*hresolu)
30	+	#define averaging       (ourweigh != NULL)
31	+	#define blurring        (ourbpict != NULL)
32	+	#define usematrix       (hasmatrix & !averaging)
33	+	#define zisnorm         (!usematrix | ourview.type != VT_PER)
34	+
35	+	#define MAXWT           1000.           /* maximum pixel weight (averaging) */
36	+
37		#define F_FORE          1               /* fill foreground */
38		#define F_BACK          2               /* fill background */
39
40	<	#define PACKSIZ         42              /* calculation packet size */
40	>	#define PACKSIZ         256             /* max. calculation packet size */
41
42	<	#define RTCOM           "rtrace -h -ovl -fff -x %d %s"
42	>	#define RTCOM           "rtrace -h- -ovl -fff -ld- -i- -I- "
43
44		#define ABS(x)          ((x)>0?(x):-(x))
45
46	<	VIEW    ourview = STDVIEW(512);         /* desired view */
46	>	struct position {int x,y; float z;};
47
48	+	#define NSTEPS          64              /* number steps in overlap prescan */
49	+	#define MINSTEP         4               /* minimum worthwhile preview step */
50	+
51	+	struct bound {int min,max;};
52	+
53	+	VIEW    ourview = STDVIEW;              /* desired view */
54	+	int     hresolu = 512;                  /* horizontal resolution */
55	+	int     vresolu = 512;                  /* vertical resolution */
56	+	double  pixaspect = 1.0;                /* pixel aspect ratio */
57	+
58		double  zeps = .02;                     /* allowed z epsilon */
59
60	<	COLR    *ourpict;                       /* output picture */
60	>	COLR    *ourpict;                       /* output picture (COLR's) */
61	>	COLOR   *ourspict;                      /* output pixel sums (averaging) */
62	>	float   *ourweigh = NULL;               /* output pixel weights (averaging) */
63		float   *ourzbuf;                       /* corresponding z-buffer */
64	+	COLOR   *ourbpict = NULL;               /* blurred picture (view averaging) */
65
66	+	VIEW    avgview;                        /* average view for -B option */
67	+	int     nvavg;                          /* number of views averaged */
68	+
69		char    *progname;
70
71	<	VIEW    theirview = STDVIEW(512);       /* input view */
72	<	int     gotview;                        /* got input view? */
73	<
74	<	int     fill = F_FORE|F_BACK;           /* selected fill algorithm */
42	<	extern int      backfill(), calfill();  /* fill functions */
43	<	int     (*deffill)() = backfill;        /* selected fill function */
71	>	int     fillo = F_FORE|F_BACK;          /* selected fill options */
72	>	int     fillsamp = 0;                   /* sample separation (0 == inf) */
73	>	extern int      backfill(), rcalfill(); /* fill functions */
74	>	int     (*fillfunc)() = backfill;       /* selected fill function */
75		COLR    backcolr = BLKCOLR;             /* background color */
76	+	COLOR   backcolor = BLKCOLOR;           /* background color (float) */
77		double  backz = 0.0;                    /* background z value */
78	+	int     normdist = 1;                   /* i/o normalized distance? */
79	+	char    ourfmt[LPICFMT+1] = PICFMT;     /* original picture format */
80	+	double  ourexp = -1;                    /* original picture exposure */
81	+	int     expadj = 0;                     /* exposure adjustment (f-stops) */
82	+	double  rexpadj = 1;                    /* real exposure adjustment */
83
84	<	double  theirs2ours[4][4];              /* transformation matrix */
85	<	int     normdist = 1;                   /* normalized distance? */
84	>	VIEW    theirview;                      /* input view */
85	>	int     gotview;                        /* got input view? */
86	>	int     wrongformat = 0;                /* input in another format? */
87	>	RESOLU  tresolu;                        /* input resolution */
88	>	double  theirexp;                       /* input picture exposure */
89	>	MAT4    theirs2ours;                    /* transformation matrix */
90	>	int     hasmatrix = 0;                  /* has transformation matrix */
91
92	<	FILE    *psend, *precv;                 /* pipes to/from fill calculation */
93	<	int     childpid;                       /* child's process id */
94	<	int     queue[PACKSIZ][2];              /* pending pixels */
95	<	int     queuesiz;                       /* number of pixels pending */
92	>	int     PDesc[3] = {-1,-1,-1};          /* rtrace process descriptor */
93	>	#define childpid        (PDesc[2])
94	>	unsigned short  queue[PACKSIZ][2];      /* pending pixels */
95	>	int     packsiz;                        /* actual packet size */
96	>	int     queuesiz = 0;                   /* number of pixels pending */
97
98	+	extern double   movepixel();
99
100	+
101		main(argc, argv)                        /* interpolate pictures */
102		int     argc;
103		char    *argv[];
104		{
105	<	#define check(olen,narg)        if (argv[i][olen] || narg >= argc-i) goto badopt
106	<	extern double   atof();
105	>	#define  check(ol,al)           if (argv[an][ol] || \
106	>	badarg(argc-an-1,argv+an+1,al)) \
107	>	goto badopt
108		int     gotvfile = 0;
109	+	int     doavg = -1;
110	+	int     doblur = 0;
111		char    *zfile = NULL;
112	<	char    *err;
113	<	int     i;
112	>	char    *expcomp = NULL;
113	>	int     i, an, rval;
114
115		progname = argv[0];
116
117	<	for (i = 1; i < argc && argv[i][0] == '-'; i++)
118	<	switch (argv[i][1]) {
117	>	for (an = 1; an < argc && argv[an][0] == '-'; an++) {
118	>	rval = getviewopt(&ourview, argc-an, argv+an);
119	>	if (rval >= 0) {
120	>	an += rval;
121	>	continue;
122	>	}
123	>	switch (argv[an][1]) {
124	>	case 'e':                               /* exposure */
125	>	check(2,"f");
126	>	expcomp = argv[++an];
127	>	break;
128		case 't':                               /* threshold */
129	<	check(2,1);
130	<	zeps = atof(argv[++i]);
129	>	check(2,"f");
130	>	zeps = atof(argv[++an]);
131		break;
132	+	case 'a':                               /* average */
133	+	check(2,NULL);
134	+	doavg = 1;
135	+	break;
136	+	case 'B':                               /* blur views */
137	+	check(2,NULL);
138	+	doblur = 1;
139	+	break;
140	+	case 'q':                               /* quick (no avg.) */
141	+	check(2,NULL);
142	+	doavg = 0;
143	+	break;
144		case 'n':                               /* dist. normalized? */
145	<	check(2,0);
145	>	check(2,NULL);
146		normdist = !normdist;
147		break;
148		case 'f':                               /* fill type */
149	<	switch (argv[i][2]) {
149	>	switch (argv[an][2]) {
150		case '0':                               /* none */
151	<	check(3,0);
152	<	fill = 0;
151	>	check(3,NULL);
152	>	fillo = 0;
153		break;
154		case 'f':                               /* foreground */
155	<	check(3,0);
156	<	fill = F_FORE;
155	>	check(3,NULL);
156	>	fillo = F_FORE;
157		break;
158		case 'b':                               /* background */
159	<	check(3,0);
160	<	fill = F_BACK;
159	>	check(3,NULL);
160	>	fillo = F_BACK;
161		break;
162		case 'a':                               /* all */
163	<	check(3,0);
164	<	fill = F_FORE|F_BACK;
163	>	check(3,NULL);
164	>	fillo = F_FORE|F_BACK;
165		break;
166	+	case 's':                               /* sample */
167	+	check(3,"i");
168	+	fillsamp = atoi(argv[++an]);
169	+	break;
170		case 'c':                               /* color */
171	<	check(3,3);
172	<	deffill = backfill;
173	<	setcolr(backcolr, atof(argv[i+1]),
174	<	atof(argv[i+2]), atof(argv[i+3]));
175	<	i += 3;
171	>	check(3,"fff");
172	>	fillfunc = backfill;
173	>	setcolor(backcolor, atof(argv[an+1]),
174	>	atof(argv[an+2]), atof(argv[an+3]));
175	>	setcolr(backcolr, colval(backcolor,RED),
176	>	colval(backcolor,GRN),
177	>	colval(backcolor,BLU));
178	>	an += 3;
179		break;
180		case 'z':                               /* z value */
181	<	check(3,1);
182	<	deffill = backfill;
183	<	backz = atof(argv[++i]);
181	>	check(3,"f");
182	>	fillfunc = backfill;
183	>	backz = atof(argv[++an]);
184		break;
185		case 'r':                               /* rtrace */
186	<	check(3,1);
187	<	deffill = calfill;
188	<	calstart(RTCOM, argv[++i]);
186	>	check(3,"s");
187	>	fillfunc = rcalfill;
188	>	calstart(RTCOM, argv[++an]);
189		break;
190		default:
191		goto badopt;
192		}
193		break;
194		case 'z':                               /* z file */
195	<	check(2,1);
196	<	zfile = argv[++i];
195	>	check(2,"s");
196	>	zfile = argv[++an];
197		break;
198		case 'x':                               /* x resolution */
199	<	check(2,1);
200	<	ourview.hresolu = atoi(argv[++i]);
199	>	check(2,"i");
200	>	hresolu = atoi(argv[++an]);
201		break;
202		case 'y':                               /* y resolution */
203	<	check(2,1);
204	<	ourview.vresolu = atoi(argv[++i]);
203	>	check(2,"i");
204	>	vresolu = atoi(argv[++an]);
205		break;
206	<	case 'v':                               /* view */
207	<	switch (argv[i][2]) {
132	<	case 't':                               /* type */
133	<	check(4,0);
134	<	ourview.type = argv[i][3];
135	<	break;
136	<	case 'p':                               /* point */
137	<	check(3,3);
138	<	ourview.vp[0] = atof(argv[++i]);
139	<	ourview.vp[1] = atof(argv[++i]);
140	<	ourview.vp[2] = atof(argv[++i]);
141	<	break;
142	<	case 'd':                               /* direction */
143	<	check(3,3);
144	<	ourview.vdir[0] = atof(argv[++i]);
145	<	ourview.vdir[1] = atof(argv[++i]);
146	<	ourview.vdir[2] = atof(argv[++i]);
147	<	break;
148	<	case 'u':                               /* up */
149	<	check(3,3);
150	<	ourview.vup[0] = atof(argv[++i]);
151	<	ourview.vup[1] = atof(argv[++i]);
152	<	ourview.vup[2] = atof(argv[++i]);
153	<	break;
154	<	case 'h':                               /* horizontal */
155	<	check(3,1);
156	<	ourview.horiz = atof(argv[++i]);
157	<	break;
158	<	case 'v':                               /* vertical */
159	<	check(3,1);
160	<	ourview.vert = atof(argv[++i]);
161	<	break;
162	<	case 'f':                               /* file */
163	<	check(3,1);
164	<	gotvfile = viewfile(argv[++i], &ourview);
165	<	if (gotvfile < 0) {
166	<	perror(argv[i]);
167	<	exit(1);
168	<	} else if (gotvfile == 0) {
169	<	fprintf(stderr, "%s: bad view file\n",
170	<	argv[i]);
171	<	exit(1);
172	<	}
173	<	break;
174	<	default:
206	>	case 'p':                               /* pixel aspect */
207	>	if (argv[an][2] != 'a')
208		goto badopt;
209	+	check(3,"f");
210	+	pixaspect = atof(argv[++an]);
211	+	break;
212	+	case 'v':                               /* view file */
213	+	if (argv[an][2] != 'f')
214	+	goto badopt;
215	+	check(3,"s");
216	+	gotvfile = viewfile(argv[++an], &ourview, 0, 0);
217	+	if (gotvfile < 0)
218	+	syserror(argv[an]);
219	+	else if (gotvfile == 0) {
220	+	fprintf(stderr, "%s: bad view file\n",
221	+	argv[an]);
222	+	exit(1);
223		}
224		break;
225		default:
226		badopt:
227		fprintf(stderr, "%s: command line error at '%s'\n",
228	<	progname, argv[i]);
228	>	progname, argv[an]);
229		goto userr;
230		}
231	+	}
232		/* check arguments */
233	<	if ((argc-i)%2)
233	>	if ((argc-an)%2)
234		goto userr;
235	+	if (fillsamp == 1)
236	+	fillo &= ~F_BACK;
237	+	if (doavg < 0)
238	+	doavg = (argc-an) > 2;
239	+	if (expcomp != NULL)
240	+	if (expcomp[0] == '+' | expcomp[0] == '-') {
241	+	expadj = atof(expcomp) + (expcomp[0]=='+' ? .5 : -.5);
242	+	if (doavg | doblur)
243	+	rexpadj = pow(2.0, atof(expcomp));
244	+	else
245	+	rexpadj = pow(2.0, (double)expadj);
246	+	} else {
247	+	if (!isflt(expcomp))
248	+	goto userr;
249	+	rexpadj = atof(expcomp);
250	+	expadj = log(rexpadj)/LOG2 + (rexpadj>1 ? .5 : -.5);
251	+	if (!(doavg | doblur))
252	+	rexpadj = pow(2.0, (double)expadj);
253	+	}
254		/* set view */
255	<	if (err = setview(&ourview)) {
256	<	fprintf(stderr, "%s: %s\n", progname, err);
255	>	if (nextview(doblur ? stdin : (FILE *)NULL) == EOF) {
256	>	fprintf(stderr, "%s: no view on standard input!\n",
257	>	progname);
258		exit(1);
259		}
260	+	normaspect(viewaspect(&ourview), &pixaspect, &hresolu, &vresolu);
261		/* allocate frame */
262	<	ourpict = (COLR *)malloc(ourview.hresolu*ourview.vresolu*sizeof(COLR));
263	<	ourzbuf = (float *)calloc(ourview.hresolu*ourview.vresolu,sizeof(float));
264	<	if (ourpict == NULL || ourzbuf == NULL) {
265	<	perror(progname);
266	<	exit(1);
262	>	if (doavg) {
263	>	ourspict = (COLOR *)bmalloc(hresolu*vresolu*sizeof(COLOR));
264	>	ourweigh = (float *)bmalloc(hresolu*vresolu*sizeof(float));
265	>	if (ourspict == NULL | ourweigh == NULL)
266	>	syserror(progname);
267	>	} else {
268	>	ourpict = (COLR *)bmalloc(hresolu*vresolu*sizeof(COLR));
269	>	if (ourpict == NULL)
270	>	syserror(progname);
271		}
272	<	/* get input */
273	<	for ( ; i < argc; i += 2)
274	<	addpicture(argv[i], argv[i+1]);
275	<	/* fill in spaces */
276	<	if (fill&F_BACK)
277	<	backpicture();
278	<	else
279	<	fillpicture();
272	>	if (doblur) {
273	>	ourbpict = (COLOR *)bmalloc(hresolu*vresolu*sizeof(COLOR));
274	>	if (ourbpict == NULL)
275	>	syserror(progname);
276	>	}
277	>	ourzbuf = (float *)bmalloc(hresolu*vresolu*sizeof(float));
278	>	if (ourzbuf == NULL)
279	>	syserror(progname);
280	>	/* new header */
281	>	newheader("RADIANCE", stdout);
282	>	/* run pictures */
283	>	do {
284	>	bzero((char *)ourzbuf, hresolu*vresolu*sizeof(float));
285	>	for (i = an; i < argc; i += 2)
286	>	addpicture(argv[i], argv[i+1]);
287	>	if (fillo&F_BACK)                       /* fill in spaces */
288	>	backpicture(fillfunc, fillsamp);
289	>	else
290	>	fillpicture(fillfunc);
291	>	/* aft clipping */
292	>	clipaft();
293	>	} while (addblur() && nextview(stdin) != EOF);
294		/* close calculation */
295	<	if (deffill == calfill)
209	<	caldone();
295	>	caldone();
296		/* add to header */
297		printargs(argc, argv, stdout);
298	<	if (gotvfile) {
299	<	printf(VIEWSTR);
300	<	fprintview(&ourview, stdout);
301	<	printf("\n");
298	>	compavgview();
299	>	if (doblur | gotvfile) {
300	>	fputs(VIEWSTR, stdout);
301	>	fprintview(&avgview, stdout);
302	>	putc('\n', stdout);
303		}
304	<	printf("\n");
304	>	if (pixaspect < .99 | pixaspect > 1.01)
305	>	fputaspect(pixaspect, stdout);
306	>	if (ourexp > 0)
307	>	ourexp *= rexpadj;
308	>	else
309	>	ourexp = rexpadj;
310	>	if (ourexp < .995 | ourexp > 1.005)
311	>	fputexpos(ourexp, stdout);
312	>	if (strcmp(ourfmt, PICFMT))             /* print format if known */
313	>	fputformat(ourfmt, stdout);
314	>	putc('\n', stdout);
315		/* write picture */
316		writepicture();
317		/* write z file */
#	Line 224 | Line 321 | char   *argv[];
321		exit(0);
322		userr:
323		fprintf(stderr,
324	<	"Usage: %s [view opts][-t zthresh][-z zout][-fT][-n] pfile zspec ..\n",
324	>	"Usage: %s [view opts][-t eps][-z zout][-e spec][-B][-a|-q][-fT][-n] pfile zspec ..\n",
325		progname);
326		exit(1);
327		#undef check
328		}
329
330
331	+	int
332		headline(s)                             /* process header string */
333		char    *s;
334		{
335	<	static char     *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL};
238	<	register char   **an;
335	>	char    fmt[32];
336
337	<	printf("\t%s", s);
337	>	if (isheadid(s))
338	>	return(0);
339	>	if (formatval(fmt, s)) {
340	>	if (globmatch(ourfmt, fmt)) {
341	>	wrongformat = 0;
342	>	strcpy(ourfmt, fmt);
343	>	} else
344	>	wrongformat = 1;
345	>	return(0);
346	>	}
347	>	if (nvavg < 2) {
348	>	putc('\t', stdout);
349	>	fputs(s, stdout);
350	>	}
351	>	if (isexpos(s)) {
352	>	theirexp *= exposval(s);
353	>	return(0);
354	>	}
355	>	if (isview(s) && sscanview(&theirview, s) > 0)
356	>	gotview++;
357	>	return(0);
358	>	}
359
360	<	for (an = altname; *an != NULL; an++)
361	<	if (!strncmp(*an, s, strlen(*an))) {
362	<	if (sscanview(&theirview, s+strlen(*an)) == 0)
363	<	gotview++;
364	<	break;
365	<	}
360	>
361	>	nextview(fp)                            /* get and set next view */
362	>	FILE    *fp;
363	>	{
364	>	char    linebuf[256];
365	>	char    *err;
366	>	register int    i;
367	>
368	>	if (fp != NULL) {
369	>	do                      /* get new view */
370	>	if (fgets(linebuf, sizeof(linebuf), fp) == NULL)
371	>	return(EOF);
372	>	while (!isview(linebuf) || !sscanview(&ourview, linebuf));
373	>	}
374	>	/* set new view */
375	>	if ((err = setview(&ourview)) != NULL) {
376	>	fprintf(stderr, "%s: %s\n", progname, err);
377	>	exit(1);
378	>	}
379	>	if (!nvavg) {                   /* first view */
380	>	copystruct(&avgview, &ourview);
381	>	return(nvavg++);
382	>	}
383	>	/* add to average view */
384	>	for (i = 0; i < 3; i++) {
385	>	avgview.vp[i] += ourview.vp[i];
386	>	avgview.vdir[i] += ourview.vdir[i];
387	>	avgview.vup[i] += ourview.vup[i];
388	>	}
389	>	avgview.horiz += ourview.horiz;
390	>	avgview.vert += ourview.vert;
391	>	avgview.hoff += ourview.hoff;
392	>	avgview.voff += ourview.voff;
393	>	avgview.vfore += ourview.vfore;
394	>	avgview.vaft += ourview.vaft;
395	>	return(nvavg++);
396		}
397
398
399	+	compavgview()                           /* compute average view */
400	+	{
401	+	register int    i;
402	+	double  f;
403	+
404	+	if (nvavg < 2)
405	+	return;
406	+	f = 1.0/nvavg;
407	+	for (i = 0; i < 3; i++) {
408	+	avgview.vp[i] *= f;
409	+	avgview.vdir[i] *= f;
410	+	avgview.vup[i] *= f;
411	+	}
412	+	avgview.horiz *= f;
413	+	avgview.vert *= f;
414	+	avgview.hoff *= f;
415	+	avgview.voff *= f;
416	+	avgview.vfore *= f;
417	+	avgview.vaft *= f;
418	+	if (setview(&avgview) != NULL)          /* in case of emergency... */
419	+	copystruct(&avgview, &ourview);
420	+	pixaspect = viewaspect(&avgview) * hresolu / vresolu;
421	+	}
422	+
423	+
424		addpicture(pfile, zspec)                /* add picture to output */
425		char    *pfile, *zspec;
426		{
427	<	extern double   atof();
428	<	FILE    *pfp, *zfp;
427	>	FILE    *pfp;
428	>	int     zfd;
429		char    *err;
430		COLR    *scanin;
431	<	float   *zin, *zlast;
432	<	int     *plast;
431	>	float   *zin;
432	>	struct position *plast;
433	>	struct bound    *xlim, ylim;
434		int     y;
435		/* open picture file */
436	<	if ((pfp = fopen(pfile, "r")) == NULL) {
437	<	perror(pfile);
438	<	exit(1);
439	<	}
440	<	/* get header and view */
267	<	printf("%s:\n", pfile);
436	>	if ((pfp = fopen(pfile, "r")) == NULL)
437	>	syserror(pfile);
438	>	/* get header with exposure and view */
439	>	theirexp = 1.0;
440	>	copystruct(&theirview, &stdview);
441		gotview = 0;
442	<	getheader(pfp, headline);
443	<	if (!gotview || fgetresolu(&theirview.hresolu, &theirview.vresolu, pfp)
444	<	!= (YMAJOR|YDECR)) {
445	<	fprintf(stderr, "%s: picture view error\n", pfile);
442	>	if (nvavg < 2)
443	>	printf("%s:\n", pfile);
444	>	getheader(pfp, headline, NULL);
445	>	if (wrongformat || !gotview || !fgetsresolu(&tresolu, pfp)) {
446	>	fprintf(stderr, "%s: picture format error\n", pfile);
447		exit(1);
448		}
449	+	if (ourexp <= 0)
450	+	ourexp = theirexp;
451	+	else if (ABS(theirexp-ourexp) > .01*ourexp)
452	+	fprintf(stderr, "%s: different exposure (warning)\n", pfile);
453		if (err = setview(&theirview)) {
454		fprintf(stderr, "%s: %s\n", pfile, err);
455		exit(1);
456		}
457		/* compute transformation */
458	<	pixform(theirs2ours, &theirview, &ourview);
281	<	/* allocate scanlines */
282	<	scanin = (COLR *)malloc(theirview.hresolu*sizeof(COLR));
283	<	zin = (float *)malloc(theirview.hresolu*sizeof(float));
284	<	plast = (int *)calloc(theirview.hresolu, sizeof(int));
285	<	zlast = (float *)calloc(theirview.hresolu, sizeof(float));
286	<	if (scanin == NULL || zin == NULL || plast == NULL || zlast == NULL) {
287	<	perror(progname);
288	<	exit(1);
289	<	}
458	>	hasmatrix = pixform(theirs2ours, &theirview, &ourview);
459		/* get z specification or file */
460	<	if ((zfp = fopen(zspec, "r")) == NULL) {
460	>	zin = (float *)malloc(scanlen(&tresolu)*sizeof(float));
461	>	if (zin == NULL)
462	>	syserror(progname);
463	>	if ((zfd = open(zspec, O_RDONLY)) == -1) {
464		double  zvalue;
465		register int    x;
466	<	if (!isfloat(zspec) || (zvalue = atof(zspec)) <= 0.0) {
467	<	perror(zspec);
468	<	exit(1);
297	<	}
298	<	for (x = 0; x < theirview.hresolu; x++)
466	>	if (!isflt(zspec) || (zvalue = atof(zspec)) <= 0.0)
467	>	syserror(zspec);
468	>	for (x = scanlen(&tresolu); x-- > 0; )
469		zin[x] = zvalue;
470		}
471	<	/* load image */
472	<	for (y = theirview.vresolu-1; y >= 0; y--) {
473	<	if (freadcolrs(scanin, theirview.hresolu, pfp) < 0) {
471	>	/* compute transferrable perimeter */
472	>	xlim = (struct bound *)malloc(numscans(&tresolu)*sizeof(struct bound));
473	>	if (xlim == NULL)
474	>	syserror(progname);
475	>	if (!getperim(xlim, &ylim, zin, zfd)) { /* overlapping area? */
476	>	free((char *)zin);
477	>	free((char *)xlim);
478	>	if (zfd != -1)
479	>	close(zfd);
480	>	fclose(pfp);
481	>	return;
482	>	}
483	>	/* allocate scanlines */
484	>	scanin = (COLR *)malloc(scanlen(&tresolu)*sizeof(COLR));
485	>	plast = (struct position *)calloc(scanlen(&tresolu),
486	>	sizeof(struct position));
487	>	if (scanin == NULL | plast == NULL)
488	>	syserror(progname);
489	>	/* skip to starting point */
490	>	for (y = 0; y < ylim.min; y++)
491	>	if (freadcolrs(scanin, scanlen(&tresolu), pfp) < 0) {
492		fprintf(stderr, "%s: read error\n", pfile);
493		exit(1);
494		}
495	<	if (zfp != NULL
496	<	&& fread(zin,sizeof(float),theirview.hresolu,zfp)
497	<	< theirview.hresolu) {
498	<	fprintf(stderr, "%s: read error\n", zspec);
495	>	if (zfd != -1 && lseek(zfd,
496	>	(long)ylim.min*scanlen(&tresolu)*sizeof(float), 0) < 0)
497	>	syserror(zspec);
498	>	/* load image */
499	>	for (y = ylim.min; y <= ylim.max; y++) {
500	>	if (freadcolrs(scanin, scanlen(&tresolu), pfp) < 0) {
501	>	fprintf(stderr, "%s: read error\n", pfile);
502		exit(1);
503		}
504	<	addscanline(y, scanin, zin, plast, zlast);
504	>	if (zfd != -1 && read(zfd, (char *)zin,
505	>	scanlen(&tresolu)*sizeof(float))
506	>	< scanlen(&tresolu)*sizeof(float))
507	>	syserror(zspec);
508	>	addscanline(xlim+y, y, scanin, zin, plast);
509		}
510		/* clean up */
511	+	free((char *)xlim);
512		free((char *)scanin);
513		free((char *)zin);
514		free((char *)plast);
319	–	free((char *)zlast);
515		fclose(pfp);
516	<	if (zfp != NULL)
517	<	fclose(zfp);
516	>	if (zfd != -1)
517	>	close(zfd);
518		}
519
520
521		pixform(xfmat, vw1, vw2)                /* compute view1 to view2 matrix */
522	<	register double xfmat[4][4];
522	>	register MAT4   xfmat;
523		register VIEW   *vw1, *vw2;
524		{
525		double  m4t[4][4];
526
527	+	if (vw1->type != VT_PER & vw1->type != VT_PAR)
528	+	return(0);
529	+	if (vw2->type != VT_PER & vw2->type != VT_PAR)
530	+	return(0);
531		setident4(xfmat);
532	<	xfmat[0][0] = vw1->vhinc[0];
533	<	xfmat[0][1] = vw1->vhinc[1];
534	<	xfmat[0][2] = vw1->vhinc[2];
535	<	xfmat[1][0] = vw1->vvinc[0];
536	<	xfmat[1][1] = vw1->vvinc[1];
537	<	xfmat[1][2] = vw1->vvinc[2];
532	>	xfmat[0][0] = vw1->hvec[0];
533	>	xfmat[0][1] = vw1->hvec[1];
534	>	xfmat[0][2] = vw1->hvec[2];
535	>	xfmat[1][0] = vw1->vvec[0];
536	>	xfmat[1][1] = vw1->vvec[1];
537	>	xfmat[1][2] = vw1->vvec[2];
538		xfmat[2][0] = vw1->vdir[0];
539		xfmat[2][1] = vw1->vdir[1];
540		xfmat[2][2] = vw1->vdir[2];
#	Line 343 | Line 542 | register VIEW  *vw1, *vw2;
542		xfmat[3][1] = vw1->vp[1];
543		xfmat[3][2] = vw1->vp[2];
544		setident4(m4t);
545	<	m4t[0][0] = vw2->vhinc[0]/vw2->vhn2;
546	<	m4t[1][0] = vw2->vhinc[1]/vw2->vhn2;
547	<	m4t[2][0] = vw2->vhinc[2]/vw2->vhn2;
548	<	m4t[3][0] = -DOT(vw2->vp,vw2->vhinc)/vw2->vhn2;
549	<	m4t[0][1] = vw2->vvinc[0]/vw2->vvn2;
550	<	m4t[1][1] = vw2->vvinc[1]/vw2->vvn2;
551	<	m4t[2][1] = vw2->vvinc[2]/vw2->vvn2;
552	<	m4t[3][1] = -DOT(vw2->vp,vw2->vvinc)/vw2->vvn2;
545	>	m4t[0][0] = vw2->hvec[0]/vw2->hn2;
546	>	m4t[1][0] = vw2->hvec[1]/vw2->hn2;
547	>	m4t[2][0] = vw2->hvec[2]/vw2->hn2;
548	>	m4t[3][0] = -DOT(vw2->vp,vw2->hvec)/vw2->hn2;
549	>	m4t[0][1] = vw2->vvec[0]/vw2->vn2;
550	>	m4t[1][1] = vw2->vvec[1]/vw2->vn2;
551	>	m4t[2][1] = vw2->vvec[2]/vw2->vn2;
552	>	m4t[3][1] = -DOT(vw2->vp,vw2->vvec)/vw2->vn2;
553		m4t[0][2] = vw2->vdir[0];
554		m4t[1][2] = vw2->vdir[1];
555		m4t[2][2] = vw2->vdir[2];
556		m4t[3][2] = -DOT(vw2->vp,vw2->vdir);
557		multmat4(xfmat, xfmat, m4t);
558	+	return(1);
559		}
560
561
562	<	addscanline(y, pline, zline, lasty, lastyz)     /* add scanline to output */
562	>	addscanline(xl, y, pline, zline, lasty) /* add scanline to output */
563	>	struct bound    *xl;
564		int     y;
565		COLR    *pline;
566		float   *zline;
567	<	int     *lasty;                 /* input/output */
367	<	float   *lastyz;                /* input/output */
567	>	struct position *lasty;         /* input/output */
568		{
569	<	extern double   sqrt();
570	<	double  pos[3];
571	<	int     lastx = 0;
372	<	double  lastxz = 0;
373	<	double  zt;
374	<	int     xpos, ypos;
569	>	FVECT   pos;
570	>	struct position lastx, newpos;
571	>	double  wt;
572		register int    x;
573
574	<	for (x = theirview.hresolu-1; x >= 0; x--) {
575	<	pos[0] = x - .5*(theirview.hresolu-1);
576	<	pos[1] = y - .5*(theirview.vresolu-1);
574	>	lastx.z = 0;
575	>	for (x = xl->max; x >= xl->min; x--) {
576	>	pix2loc(pos, &tresolu, x, y);
577		pos[2] = zline[x];
578	+	if ((wt = movepixel(pos)) <= FTINY) {
579	+	lasty[x].z = lastx.z = 0;       /* mark invalid */
580	+	continue;
581	+	}
582	+	/* add pixel to our image */
583	+	newpos.x = pos[0] * hresolu;
584	+	newpos.y = pos[1] * vresolu;
585	+	newpos.z = zline[x];
586	+	addpixel(&newpos, &lastx, &lasty[x], pline[x], wt, pos[2]);
587	+	lasty[x].x = lastx.x = newpos.x;
588	+	lasty[x].y = lastx.y = newpos.y;
589	+	lasty[x].z = lastx.z = newpos.z;
590	+	}
591	+	}
592	+
593	+
594	+	addpixel(p0, p1, p2, pix, w, z)         /* fill in pixel parallelogram */
595	+	struct position *p0, *p1, *p2;
596	+	COLR    pix;
597	+	double  w;
598	+	double  z;
599	+	{
600	+	double  zt = 2.*zeps*p0->z;             /* threshold */
601	+	COLOR   pval;                           /* converted+weighted pixel */
602	+	int     s1x, s1y, s2x, s2y;             /* step sizes */
603	+	int     l1, l2, c1, c2;                 /* side lengths and counters */
604	+	int     p1isy;                          /* p0p1 along y? */
605	+	int     x1, y1;                         /* p1 position */
606	+	register int    x, y;                   /* final position */
607	+
608	+	/* compute vector p0p1 */
609	+	if (fillo&F_FORE && ABS(p1->z-p0->z) <= zt) {
610	+	s1x = p1->x - p0->x;
611	+	s1y = p1->y - p0->y;
612	+	l1 = ABS(s1x);
613	+	if (p1isy = (ABS(s1y) > l1))
614	+	l1 = ABS(s1y);
615	+	else if (l1 < 1)
616	+	l1 = 1;
617	+	} else {
618	+	l1 = s1x = s1y = 1;
619	+	p1isy = -1;
620	+	}
621	+	/* compute vector p0p2 */
622	+	if (fillo&F_FORE && ABS(p2->z-p0->z) <= zt) {
623	+	s2x = p2->x - p0->x;
624	+	s2y = p2->y - p0->y;
625	+	if (p1isy == 1)
626	+	l2 = ABS(s2x);
627	+	else {
628	+	l2 = ABS(s2y);
629	+	if (p1isy != 0 && ABS(s2x) > l2)
630	+	l2 = ABS(s2x);
631	+	}
632	+	if (l2 < 1)
633	+	l2 = 1;
634	+	} else
635	+	l2 = s2x = s2y = 1;
636	+	/* fill the parallelogram */
637	+	if (averaging) {
638	+	colr_color(pval, pix);
639	+	scalecolor(pval, w);
640	+	}
641	+	for (c1 = l1; c1-- > 0; ) {
642	+	x1 = p0->x + c1*s1x/l1;
643	+	y1 = p0->y + c1*s1y/l1;
644	+	for (c2 = l2; c2-- > 0; ) {
645	+	x = x1 + c2*s2x/l2;
646	+	if (x < 0 | x >= hresolu)
647	+	continue;
648	+	y = y1 + c2*s2y/l2;
649	+	if (y < 0 | y >= vresolu)
650	+	continue;
651	+	if (averaging) {
652	+	if (zscan(y)[x] <= 0 || zscan(y)[x]-z
653	+	> zeps*zscan(y)[x]) {
654	+	copycolor(sscan(y)[x], pval);
655	+	wscan(y)[x] = w;
656	+	zscan(y)[x] = z;
657	+	} else if (z-zscan(y)[x] <= zeps*zscan(y)[x]) {
658	+	addcolor(sscan(y)[x], pval);
659	+	wscan(y)[x] += w;
660	+	}
661	+	} else if (zscan(y)[x] <= 0 || zscan(y)[x]-z
662	+	> zeps*zscan(y)[x]) {
663	+	copycolr(pscan(y)[x], pix);
664	+	zscan(y)[x] = z;
665	+	}
666	+	}
667	+	}
668	+	}
669	+
670	+
671	+	double
672	+	movepixel(pos)                          /* reposition image point */
673	+	register FVECT  pos;
674	+	{
675	+	FVECT   pt, tdir, odir;
676	+	double  d;
677	+	register int    i;
678	+
679	+	if (pos[2] <= 0)                /* empty pixel */
680	+	return(0);
681	+	if (usematrix) {
682	+	pos[0] += theirview.hoff - .5;
683	+	pos[1] += theirview.voff - .5;
684	+	if (normdist & theirview.type == VT_PER)
685	+	d = sqrt(1. + pos[0]*pos[0]*theirview.hn2
686	+	+ pos[1]*pos[1]*theirview.vn2);
687	+	else
688	+	d = 1.;
689	+	pos[2] += d*theirview.vfore;
690		if (theirview.type == VT_PER) {
691	<	if (normdist)   /* adjust for eye-ray distance */
383	<	pos[2] /= sqrt( 1.
384	<	+ pos[0]*pos[0]*theirview.vhn2
385	<	+ pos[1]*pos[1]*theirview.vvn2 );
691	>	pos[2] /= d;
692		pos[0] *= pos[2];
693		pos[1] *= pos[2];
694		}
695		multp3(pos, pos, theirs2ours);
696	<	if (pos[2] <= 0)
697	<	continue;
696	>	if (pos[2] <= ourview.vfore)
697	>	return(0);
698		if (ourview.type == VT_PER) {
699		pos[0] /= pos[2];
700		pos[1] /= pos[2];
701		}
702	<	pos[0] += .5*ourview.hresolu;
703	<	pos[1] += .5*ourview.vresolu;
704	<	if (pos[0] < 0 || (xpos = pos[0]) >= ourview.hresolu
705	<	|| pos[1] < 0 || (ypos = pos[1]) >= ourview.vresolu)
706	<	continue;
707	<	/* add pixel to our image */
708	<	zt = 2.*zeps*zline[x];
709	<	addpixel(xpos, ypos,
710	<	(fill&F_FORE && ABS(zline[x]-lastxz) <= zt)
711	<	? lastx - xpos : 1,
712	<	(fill&F_FORE && ABS(zline[x]-lastyz[x]) <= zt)
713	<	? lasty[x] - ypos : 1,
714	<	pline[x], pos[2]);
715	<	lastx = xpos;
716	<	lasty[x] = ypos;
411	<	lastxz = lastyz[x] = zline[x];
702	>	pos[0] += .5 - ourview.hoff;
703	>	pos[1] += .5 - ourview.voff;
704	>	pos[2] -= ourview.vfore;
705	>	} else {
706	>	if (viewray(pt, tdir, &theirview, pos[0], pos[1]) < -FTINY)
707	>	return(0);
708	>	if (!normdist & theirview.type == VT_PER)       /* adjust */
709	>	pos[2] *= sqrt(1. + pos[0]*pos[0]*theirview.hn2
710	>	+ pos[1]*pos[1]*theirview.vn2);
711	>	pt[0] += tdir[0]*pos[2];
712	>	pt[1] += tdir[1]*pos[2];
713	>	pt[2] += tdir[2]*pos[2];
714	>	viewloc(pos, &ourview, pt);
715	>	if (pos[2] <= 0)
716	>	return(0);
717		}
718	+	if (pos[0] < 0 | pos[0] >= 1-FTINY | pos[1] < 0 | pos[1] >= 1-FTINY)
719	+	return(0);
720	+	if (!averaging)
721	+	return(1);
722	+	if (ourview.type == VT_PAR)             /* compute our direction */
723	+	VCOPY(odir, ourview.vdir);
724	+	else
725	+	for (i = 0; i < 3; i++)
726	+	odir[i] = (pt[i] - ourview.vp[i])/pos[2];
727	+	d = DOT(odir,tdir);                     /* compute pixel weight */
728	+	if (d >= 1.-1./MAXWT/MAXWT)
729	+	return(MAXWT);          /* clip to maximum weight */
730	+	return(1./sqrt(1.-d));
731		}
732
733
734	<	addpixel(xstart, ystart, width, height, pix, z) /* fill in area for pixel */
735	<	int     xstart, ystart;
736	<	int     width, height;
737	<	COLR    pix;
738	<	double  z;
734	>	getperim(xl, yl, zline, zfd)            /* compute overlapping image area */
735	>	register struct bound   *xl;
736	>	struct bound    *yl;
737	>	float   *zline;
738	>	int     zfd;
739		{
740	+	int     step;
741	+	FVECT   pos;
742		register int    x, y;
743	<	/* make width and height positive */
744	<	if (width < 0) {
745	<	width = -width;
746	<	xstart = xstart-width+1;
747	<	} else if (width == 0)
748	<	width = 1;
749	<	if (height < 0) {
750	<	height = -height;
751	<	ystart = ystart-height+1;
752	<	} else if (height == 0)
753	<	height = 1;
754	<	/* fill pixel(s) within rectangle */
755	<	for (y = ystart; y < ystart+height; y++)
756	<	for (x = xstart; x < xstart+width; x++)
757	<	if (zscan(y)[x] <= 0
758	<	|| zscan(y)[x]-z > zeps*zscan(y)[x]) {
759	<	zscan(y)[x] = z;
760	<	copycolr(pscan(y)[x], pix);
743	>	/* set up step size */
744	>	if (scanlen(&tresolu) < numscans(&tresolu))
745	>	step = scanlen(&tresolu)/NSTEPS;
746	>	else
747	>	step = numscans(&tresolu)/NSTEPS;
748	>	if (step < MINSTEP) {                   /* not worth cropping? */
749	>	yl->min = 0;
750	>	yl->max = numscans(&tresolu) - 1;
751	>	x = scanlen(&tresolu) - 1;
752	>	for (y = numscans(&tresolu); y--; ) {
753	>	xl[y].min = 0;
754	>	xl[y].max = x;
755	>	}
756	>	return(1);
757	>	}
758	>	yl->min = 32000; yl->max = 0;           /* search for points on image */
759	>	for (y = step - 1; y < numscans(&tresolu); y += step) {
760	>	if (zfd != -1) {
761	>	if (lseek(zfd, (long)y*scanlen(&tresolu)*sizeof(float),
762	>	0) < 0)
763	>	syserror("lseek");
764	>	if (read(zfd, (char *)zline,
765	>	scanlen(&tresolu)*sizeof(float))
766	>	< scanlen(&tresolu)*sizeof(float))
767	>	syserror("read");
768	>	}
769	>	xl[y].min = 32000; xl[y].max = 0;               /* x max */
770	>	for (x = scanlen(&tresolu); (x -= step) > 0; ) {
771	>	pix2loc(pos, &tresolu, x, y);
772	>	pos[2] = zline[x];
773	>	if (movepixel(pos) > FTINY) {
774	>	xl[y].max = x + step - 1;
775	>	xl[y].min = x - step + 1;       /* x min */
776	>	if (xl[y].min < 0)
777	>	xl[y].min = 0;
778	>	for (x = step - 1; x < xl[y].max; x += step) {
779	>	pix2loc(pos, &tresolu, x, y);
780	>	pos[2] = zline[x];
781	>	if (movepixel(pos) > FTINY) {
782	>	xl[y].min = x - step + 1;
783	>	break;
784	>	}
785	>	}
786	>	if (y < yl->min)                /* y limits */
787	>	yl->min = y - step + 1;
788	>	yl->max = y + step - 1;
789	>	break;
790		}
791	+	}
792	+	/* fill in between */
793	+	if (y < step) {
794	+	xl[y-1].min = xl[y].min;
795	+	xl[y-1].max = xl[y].max;
796	+	} else {
797	+	if (xl[y].min < xl[y-step].min)
798	+	xl[y-1].min = xl[y].min;
799	+	else
800	+	xl[y-1].min = xl[y-step].min;
801	+	if (xl[y].max > xl[y-step].max)
802	+	xl[y-1].max = xl[y].max;
803	+	else
804	+	xl[y-1].max = xl[y-step].max;
805	+	}
806	+	for (x = 2; x < step; x++)
807	+	copystruct(xl+y-x, xl+y-1);
808	+	}
809	+	if (yl->max >= numscans(&tresolu))
810	+	yl->max = numscans(&tresolu) - 1;
811	+	y -= step;
812	+	for (x = numscans(&tresolu) - 1; x > y; x--)    /* fill bottom rows */
813	+	copystruct(xl+x, xl+y);
814	+	return(yl->max >= yl->min);
815		}
816
817
818	<	backpicture()                           /* background fill algorithm */
818	>	backpicture(fill, samp)                 /* background fill algorithm */
819	>	int     (*fill)();
820	>	int     samp;
821		{
822		int     *yback, xback;
823		int     y;
449	–	COLR    pfill;
824		register int    x, i;
825		/* get back buffer */
826	<	yback = (int *)malloc(ourview.hresolu*sizeof(int));
827	<	if (yback == NULL) {
828	<	perror(progname);
829	<	return;
456	<	}
457	<	for (x = 0; x < ourview.hresolu; x++)
826	>	yback = (int *)malloc(hresolu*sizeof(int));
827	>	if (yback == NULL)
828	>	syserror(progname);
829	>	for (x = 0; x < hresolu; x++)
830		yback[x] = -2;
831		/*
832		* Xback and yback are the pixel locations of suitable
#	Line 463 | Line 835 | backpicture()                          /* background fill algorithm */
835		* that there is no suitable background in this direction.
836		*/
837		/* fill image */
838	<	for (y = 0; y < ourview.vresolu; y++) {
838	>	for (y = 0; y < vresolu; y++) {
839		xback = -2;
840	<	for (x = 0; x < ourview.hresolu; x++)
840	>	for (x = 0; x < hresolu; x++)
841		if (zscan(y)[x] <= 0) {         /* empty pixel */
842		/*
843		* First, find background from above or below.
844		* (farthest assigned pixel)
845		*/
846		if (yback[x] == -2) {
847	<	for (i = y+1; i < ourview.vresolu; i++)
847	>	for (i = y+1; i < vresolu; i++)
848		if (zscan(i)[x] > 0)
849		break;
850	<	if (i < ourview.vresolu
850	>	if (i < vresolu
851		&& (y <= 0 || zscan(y-1)[x] < zscan(i)[x]))
852		yback[x] = i;
853		else
#	Line 485 | Line 857 | backpicture()                          /* background fill algorithm */
857		* Next, find background from left or right.
858		*/
859		if (xback == -2) {
860	<	for (i = x+1; i < ourview.hresolu; i++)
860	>	for (i = x+1; i < hresolu; i++)
861		if (zscan(y)[i] > 0)
862		break;
863	<	if (i < ourview.hresolu
863	>	if (i < hresolu
864		&& (x <= 0 || zscan(y)[x-1] < zscan(y)[i]))
865		xback = i;
866		else
867		xback = x-1;
868		}
869		/*
870	<	* Check to see if we have no background for
871	<	* this pixel.  If not, use background color.
870	>	* If we have no background for this pixel,
871	>	* use the given fill function.
872		*/
873	<	if (xback < 0 && yback[x] < 0) {
874	<	(*deffill)(x,y);
503	<	continue;
504	<	}
873	>	if (xback < 0 && yback[x] < 0)
874	>	goto fillit;
875		/*
876		* Compare, and use the background that is
877		* farther, unless one of them is next to us.
878	+	* If the background is too distant, call
879	+	* the fill function.
880		*/
881		if ( yback[x] < 0
882		|| (xback >= 0 && ABS(x-xback) <= 1)
883		|| ( ABS(y-yback[x]) > 1
884		&& zscan(yback[x])[x]
885		< zscan(y)[xback] ) ) {
886	<	copycolr(pscan(y)[x],pscan(y)[xback]);
886	>	if (samp > 0 && ABS(x-xback) >= samp)
887	>	goto fillit;
888	>	if (averaging) {
889	>	copycolor(sscan(y)[x],
890	>	sscan(y)[xback]);
891	>	wscan(y)[x] = wscan(y)[xback];
892	>	} else
893	>	copycolr(pscan(y)[x],
894	>	pscan(y)[xback]);
895		zscan(y)[x] = zscan(y)[xback];
896		} else {
897	<	copycolr(pscan(y)[x],pscan(yback[x])[x]);
897	>	if (samp > 0 && ABS(y-yback[x]) > samp)
898	>	goto fillit;
899	>	if (averaging) {
900	>	copycolor(sscan(y)[x],
901	>	sscan(yback[x])[x]);
902	>	wscan(y)[x] =
903	>	wscan(yback[x])[x];
904	>	} else
905	>	copycolr(pscan(y)[x],
906	>	pscan(yback[x])[x]);
907		zscan(y)[x] = zscan(yback[x])[x];
908		}
909	+	continue;
910	+	fillit:
911	+	(*fill)(x,y);
912	+	if (fill == rcalfill) {         /* use it */
913	+	clearqueue();
914	+	xback = x;
915	+	yback[x] = y;
916	+	}
917		} else {                                /* full pixel */
918		yback[x] = -2;
919		xback = -2;
#	Line 526 | Line 923 | backpicture()                          /* background fill algorithm */
923		}
924
925
926	<	fillpicture()                           /* paint in empty pixels with default */
926	>	fillpicture(fill)               /* paint in empty pixels using fill */
927	>	int     (*fill)();
928		{
929		register int    x, y;
930
931	<	for (y = 0; y < ourview.vresolu; y++)
932	<	for (x = 0; x < ourview.hresolu; x++)
931	>	for (y = 0; y < vresolu; y++)
932	>	for (x = 0; x < hresolu; x++)
933		if (zscan(y)[x] <= 0)
934	<	(*deffill)(x,y);
934	>	(*fill)(x,y);
935	>	if (fill == rcalfill)
936	>	clearqueue();
937		}
938
939
940	<	writepicture()                          /* write out picture */
940	>	clipaft()                       /* perform aft clipping as indicated */
941		{
942	+	register int    x, y;
943	+	int     adjtest = ourview.type == VT_PER & zisnorm;
944	+	double  tstdist;
945	+	double  yzn2, vx;
946	+
947	+	if (ourview.vaft <= FTINY)
948	+	return(0);
949	+	tstdist = ourview.vaft - ourview.vfore;
950	+	for (y = 0; y < vresolu; y++) {
951	+	if (adjtest) {                          /* adjust test */
952	+	yzn2 = (y+.5)/vresolu + ourview.voff - .5;
953	+	yzn2 = 1. + yzn2*yzn2*ourview.vn2;
954	+	tstdist = (ourview.vaft - ourview.vfore)*sqrt(yzn2);
955	+	}
956	+	for (x = 0; x < hresolu; x++)
957	+	if (zscan(y)[x] > tstdist) {
958	+	if (adjtest) {
959	+	vx = (x+.5)/hresolu + ourview.hoff - .5;
960	+	if (zscan(y)[x] <= (ourview.vaft -
961	+	ourview.vfore) *
962	+	sqrt(vx*vx*ourview.hn2 + yzn2))
963	+	continue;
964	+	}
965	+	if (averaging)
966	+	bzero(sscan(y)[x], sizeof(COLOR));
967	+	else
968	+	bzero(pscan(y)[x], sizeof(COLR));
969	+	zscan(y)[x] = 0.0;
970	+	}
971	+	}
972	+	return(1);
973	+	}
974	+
975	+
976	+	addblur()                               /* add to blurred picture */
977	+	{
978	+	COLOR   cval;
979	+	double  d;
980	+	register int    i;
981	+
982	+	if (!blurring)
983	+	return(0);
984	+	i = hresolu*vresolu;
985	+	if (nvavg < 2)
986	+	if (averaging)
987	+	while (i--) {
988	+	copycolor(ourbpict[i], ourspict[i]);
989	+	d = 1.0/ourweigh[i];
990	+	scalecolor(ourbpict[i], d);
991	+	}
992	+	else
993	+	while (i--)
994	+	colr_color(ourbpict[i], ourpict[i]);
995	+	else
996	+	if (averaging)
997	+	while (i--) {
998	+	copycolor(cval, ourspict[i]);
999	+	d = 1.0/ourweigh[i];
1000	+	scalecolor(cval, d);
1001	+	addcolor(ourbpict[i], cval);
1002	+	}
1003	+	else
1004	+	while (i--) {
1005	+	colr_color(cval, ourpict[i]);
1006	+	addcolor(ourbpict[i], cval);
1007	+	}
1008	+	/* print view */
1009	+	printf("VIEW%d:", nvavg);
1010	+	fprintview(&ourview, stdout);
1011	+	putchar('\n');
1012	+	return(1);
1013	+	}
1014	+
1015	+
1016	+	writepicture()                          /* write out picture (alters buffer) */
1017	+	{
1018		int     y;
1019	+	register int    x;
1020	+	double  d;
1021
1022	<	fputresolu(YMAJOR|YDECR, ourview.hresolu, ourview.vresolu, stdout);
1023	<	for (y = ourview.vresolu-1; y >= 0; y--)
1024	<	if (fwritecolrs(pscan(y), ourview.hresolu, stdout) < 0) {
1025	<	perror(progname);
1026	<	exit(1);
1022	>	fprtresolu(hresolu, vresolu, stdout);
1023	>	for (y = vresolu-1; y >= 0; y--)
1024	>	if (blurring) {
1025	>	for (x = 0; x < hresolu; x++) { /* compute avg. */
1026	>	d = rexpadj/nvavg;
1027	>	scalecolor(bscan(y)[x], d);
1028	>	}
1029	>	if (fwritescan(bscan(y), hresolu, stdout) < 0)
1030	>	syserror(progname);
1031	>	} else if (averaging) {
1032	>	for (x = 0; x < hresolu; x++) { /* average pixels */
1033	>	d = rexpadj/wscan(y)[x];
1034	>	scalecolor(sscan(y)[x], d);
1035	>	}
1036	>	if (fwritescan(sscan(y), hresolu, stdout) < 0)
1037	>	syserror(progname);
1038	>	} else {
1039	>	if (expadj)
1040	>	shiftcolrs(pscan(y), hresolu, expadj);
1041	>	if (fwritecolrs(pscan(y), hresolu, stdout) < 0)
1042	>	syserror(progname);
1043		}
1044		}
1045
1046
1047	<	writedistance(fname)                    /* write out z file */
1047	>	writedistance(fname)                    /* write out z file (alters buffer) */
1048		char    *fname;
1049		{
1050	<	extern double   sqrt();
1051	<	int     donorm = normdist && ourview.type == VT_PER;
1052	<	FILE    *fp;
1050	>	int     donorm = normdist & !zisnorm ? 1 :
1051	>	ourview.type == VT_PER & !normdist & zisnorm ? -1 : 0;
1052	>	int     fd;
1053		int     y;
560	–	float   *zout;
1054
1055	<	if ((fp = fopen(fname, "w")) == NULL) {
1056	<	perror(fname);
1057	<	exit(1);
565	<	}
566	<	if (donorm
567	<	&& (zout = (float *)malloc(ourview.hresolu*sizeof(float))) == NULL) {
568	<	perror(progname);
569	<	exit(1);
570	<	}
571	<	for (y = ourview.vresolu-1; y >= 0; y--) {
1055	>	if ((fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) == -1)
1056	>	syserror(fname);
1057	>	for (y = vresolu-1; y >= 0; y--) {
1058		if (donorm) {
1059	<	double  vx, yzn2;
1059	>	double  vx, yzn2, d;
1060		register int    x;
1061	<	yzn2 = y - .5*(ourview.vresolu-1);
1062	<	yzn2 = 1. + yzn2*yzn2*ourview.vvn2;
1063	<	for (x = 0; x < ourview.hresolu; x++) {
1064	<	vx = x - .5*(ourview.hresolu-1);
1065	<	zout[x] = zscan(y)[x]
1066	<	* sqrt(vx*vx*ourview.vhn2 + yzn2);
1061	>	yzn2 = (y+.5)/vresolu + ourview.voff - .5;
1062	>	yzn2 = 1. + yzn2*yzn2*ourview.vn2;
1063	>	for (x = 0; x < hresolu; x++) {
1064	>	vx = (x+.5)/hresolu + ourview.hoff - .5;
1065	>	d = sqrt(vx*vx*ourview.hn2 + yzn2);
1066	>	if (donorm > 0)
1067	>	zscan(y)[x] *= d;
1068	>	else
1069	>	zscan(y)[x] /= d;
1070		}
582	–	} else
583	–	zout = zscan(y);
584	–	if (fwrite(zout, sizeof(float), ourview.hresolu, fp)
585	–	< ourview.hresolu) {
586	–	perror(fname);
587	–	exit(1);
1071		}
1072	+	if (write(fd, (char *)zscan(y), hresolu*sizeof(float))
1073	+	< hresolu*sizeof(float))
1074	+	syserror(fname);
1075		}
1076	<	if (donorm)
591	<	free((char *)zout);
592	<	fclose(fp);
1076	>	close(fd);
1077		}
1078
1079
596	–	isfloat(s)                              /* see if string is floating number */
597	–	register char   *s;
598	–	{
599	–	for ( ; *s; s++)
600	–	if ((*s < '0' || *s > '9') && *s != '.' && *s != '-'
601	–	&& *s != 'e' && *s != 'E' && *s != '+')
602	–	return(0);
603	–	return(1);
604	–	}
605	–
606	–
1080		backfill(x, y)                          /* fill pixel with background */
1081		int     x, y;
1082		{
1083	<	register BYTE   *dest = pscan(y)[x];
1084	<
1085	<	copycolr(dest, backcolr);
1083	>	if (averaging) {
1084	>	copycolor(sscan(y)[x], backcolor);
1085	>	wscan(y)[x] = 1;
1086	>	} else
1087	>	copycolr(pscan(y)[x], backcolr);
1088		zscan(y)[x] = backz;
1089		}
1090
1091
1092	<	calstart(prog, args)                    /* start fill calculation */
1092	>	calstart(prog, args)                    /* start fill calculation */
1093		char    *prog, *args;
1094		{
1095		char    combuf[512];
1096	<	int     p0[2], p1[2];
1096	>	char    *argv[64];
1097	>	int     rval;
1098	>	register char   **wp, *cp;
1099
1100	<	sprintf(combuf, prog, PACKSIZ, args);
1101	<	if (pipe(p0) < 0 || pipe(p1) < 0)
1102	<	goto syserr;
626	<	if ((childpid = vfork()) == 0) {        /* fork calculation */
627	<	close(p0[1]);
628	<	close(p1[0]);
629	<	if (p0[0] != 0) {
630	<	dup2(p0[0], 0);
631	<	close(p0[0]);
632	<	}
633	<	if (p1[1] != 1) {
634	<	dup2(p1[1], 1);
635	<	close(p1[1]);
636	<	}
637	<	execl("/bin/sh", "sh", "-c", combuf, 0);
638	<	perror("/bin/sh");
639	<	_exit(127);
1100	>	if (childpid != -1) {
1101	>	fprintf(stderr, "%s: too many calculations\n", progname);
1102	>	exit(1);
1103		}
1104	<	if (childpid < 0)
1105	<	goto syserr;
1106	<	close(p0[0]);
1107	<	close(p1[1]);
1108	<	if ((psend = fdopen(p0[1], "w")) == NULL)
1109	<	goto syserr;
1110	<	if ((precv = fdopen(p1[0], "r")) == NULL)
1111	<	goto syserr;
1104	>	strcpy(combuf, prog);
1105	>	strcat(combuf, args);
1106	>	cp = combuf;
1107	>	wp = argv;
1108	>	for ( ; ; ) {
1109	>	while (isspace(*cp))    /* nullify spaces */
1110	>	*cp++ = '\0';
1111	>	if (!*cp)               /* all done? */
1112	>	break;
1113	>	*wp++ = cp;             /* add argument to list */
1114	>	while (*++cp && !isspace(*cp))
1115	>	;
1116	>	}
1117	>	*wp = NULL;
1118	>	/* start process */
1119	>	if ((rval = open_process(PDesc, argv)) < 0)
1120	>	syserror(progname);
1121	>	if (rval == 0) {
1122	>	fprintf(stderr, "%s: command not found\n", argv[0]);
1123	>	exit(1);
1124	>	}
1125	>	packsiz = rval/(6*sizeof(float)) - 1;
1126	>	if (packsiz > PACKSIZ)
1127	>	packsiz = PACKSIZ;
1128		queuesiz = 0;
650	–	return;
651	–	syserr:
652	–	perror(progname);
653	–	exit(1);
1129		}
1130
1131
1132	<	caldone()                               /* done with calculation */
1132	>	caldone()                               /* done with calculation */
1133		{
1134	<	int     pid;
1135	<
661	<	fclose(psend);
1134	>	if (childpid == -1)
1135	>	return;
1136		clearqueue();
1137	<	fclose(precv);
1138	<	while ((pid = wait(0)) != -1 && pid != childpid)
665	<	;
1137	>	close_process(PDesc);
1138	>	childpid = -1;
1139		}
1140
1141
1142	<	calfill(x, y)                           /* fill with calculated pixel */
1142	>	rcalfill(x, y)                          /* fill with ray-calculated pixel */
1143		int     x, y;
1144		{
1145	<	FVECT   orig, dir;
673	<	float   outbuf[6];
674	<
675	<	if (queuesiz >= PACKSIZ) {      /* flush queue */
676	<	fflush(psend);
1145	>	if (queuesiz >= packsiz)        /* flush queue if needed */
1146		clearqueue();
1147	<	}
679	<	/* send new ray */
680	<	rayview(orig, dir, &ourview, x+.5, y+.5);
681	<	outbuf[0] = orig[0]; outbuf[1] = orig[1]; outbuf[2] = orig[2];
682	<	outbuf[3] = dir[0]; outbuf[4] = dir[1]; outbuf[5] = dir[2];
683	<	fwrite(outbuf, sizeof(float), 6, psend);
684	<	/* remember it */
1147	>	/* add position to queue */
1148		queue[queuesiz][0] = x;
1149		queue[queuesiz][1] = y;
1150		queuesiz++;
1151		}
1152
1153
1154	<	clearqueue()                            /* get results from queue */
1154	>	clearqueue()                            /* process queue */
1155		{
1156	<	float   inbuf[4];
1156	>	FVECT   orig, dir;
1157	>	float   fbuf[6*(PACKSIZ+1)];
1158	>	register float  *fbp;
1159		register int    i;
1160	+	double  vx, vy;
1161
1162	+	if (queuesiz == 0)
1163	+	return;
1164	+	fbp = fbuf;
1165		for (i = 0; i < queuesiz; i++) {
1166	<	fread(inbuf, sizeof(float), 4, precv);
1167	<	setcolr(pscan(queue[i][1])[queue[i][0]],
1168	<	inbuf[0], inbuf[1], inbuf[2]);
1169	<	zscan(queue[i][1])[queue[i][0]] = inbuf[3];
1166	>	viewray(orig, dir, &ourview,
1167	>	(queue[i][0]+.5)/hresolu,
1168	>	(queue[i][1]+.5)/vresolu);
1169	>	*fbp++ = orig[0]; *fbp++ = orig[1]; *fbp++ = orig[2];
1170	>	*fbp++ = dir[0]; *fbp++ = dir[1]; *fbp++ = dir[2];
1171		}
1172	+	/* mark end and get results */
1173	+	bzero((char *)fbp, 6*sizeof(float));
1174	+	if (process(PDesc, fbuf, fbuf, 4*sizeof(float)*(queuesiz+1),
1175	+	6*sizeof(float)*(queuesiz+1)) !=
1176	+	4*sizeof(float)*(queuesiz+1)) {
1177	+	fprintf(stderr, "%s: error reading from rtrace process\n",
1178	+	progname);
1179	+	exit(1);
1180	+	}
1181	+	fbp = fbuf;
1182	+	for (i = 0; i < queuesiz; i++) {
1183	+	if (ourexp > 0 && ourexp != 1.0) {
1184	+	fbp[0] *= ourexp;
1185	+	fbp[1] *= ourexp;
1186	+	fbp[2] *= ourexp;
1187	+	}
1188	+	if (averaging) {
1189	+	setcolor(sscan(queue[i][1])[queue[i][0]],
1190	+	fbp[0], fbp[1], fbp[2]);
1191	+	wscan(queue[i][1])[queue[i][0]] = 1;
1192	+	} else
1193	+	setcolr(pscan(queue[i][1])[queue[i][0]],
1194	+	fbp[0], fbp[1], fbp[2]);
1195	+	if (zisnorm)
1196	+	zscan(queue[i][1])[queue[i][0]] = fbp[3];
1197	+	else {
1198	+	vx = (queue[i][0]+.5)/hresolu + ourview.hoff - .5;
1199	+	vy = (queue[i][1]+.5)/vresolu + ourview.voff - .5;
1200	+	zscan(queue[i][1])[queue[i][0]] = fbp[3] / sqrt(1. +
1201	+	vx*vx*ourview.hn2 + vy*vy*ourview.vn2);
1202	+	}
1203	+	fbp += 4;
1204	+	}
1205		queuesiz = 0;
1206	+	}
1207	+
1208	+
1209	+	syserror(s)                     /* report error and exit */
1210	+	char    *s;
1211	+	{
1212	+	perror(s);
1213	+	exit(1);
1214		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines