[ViewVC] Diff of: radiance/src/px/pinterp.c

Comparing src/px/pinterp.c (file contents):
Revision 2.21 by greg, Mon Dec 26 21:02:31 1994 UTC vs.
Revision 2.55 by greg, Wed Jul 2 16:54:44 2025 UTC

#	Line 1 \| Line 1
1	–	/* Copyright (c) 1994 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* Interpolate and extrapolate pictures with different view parameters.
6		*
7		* Greg Ward 09Dec89
8		*/
9
10	<	#include "standard.h"
10	>	#include "copyright.h"
11
12		#include <ctype.h>
13	+	#include <string.h>
14
15	+	#include "platform.h"
16	+	#include "standard.h"
17	+	#include "rtprocess.h" /* Windows: must come before color.h */
18		#include "view.h"
18	–
19		#include "color.h"
20
21	–	#include "resolu.h"
22	–
21		#define LOG2 0.69314718055994530942
22
23		#define pscan(y) (ourpict+(y)*hresolu)
24		#define sscan(y) (ourspict+(y)*hresolu)
25		#define wscan(y) (ourweigh+(y)*hresolu)
26		#define zscan(y) (ourzbuf+(y)*hresolu)
27	+	#define bscan(y) (ourbpict+(y)*hresolu)
28		#define averaging (ourweigh != NULL)
29	+	#define blurring (ourbpict != NULL)
30	+	#define usematrix (hasmatrix & !averaging)
31	+	#define zisnorm (!usematrix \| (ourview.type != VT_PER))
32
33		#define MAXWT 1000. /* maximum pixel weight (averaging) */
34
#	Line 35 \| Line 37 \| static char SCCSid[] = "$SunId$ LBL";
37
38		#define PACKSIZ 256 /* max. calculation packet size */
39
40	<	#define RTCOM "rtrace -h- -ovl -fff "
40	>	#define RTCOM "rtrace -h- -ovl -fff -ld- -i- -I- "
41
42		#define ABS(x) ((x)>0?(x):-(x))
43
#	Line 57 \| Line 59 \| *COLR ourpict; /* output picture (COLR's) /*
59		COLOR ourspict; / output pixel sums (averaging) */
60		float ourweigh = NULL; / output pixel weights (averaging) */
61		float ourzbuf; / corresponding z-buffer */
62	+	COLOR ourbpict = NULL; / blurred picture (view averaging) */
63
64	<	char *progname;
64	>	VIEW avgview; /* average view for -B option */
65	>	int nvavg; /* number of views averaged */
66
67		int fillo = F_FORE\|F_BACK; /* selected fill options */
68		int fillsamp = 0; /* sample separation (0 == inf) */
65	–	extern int backfill(), rcalfill(); /* fill functions */
66	–	int (fillfunc)() = backfill; / selected fill function */
69		COLR backcolr = BLKCOLR; /* background color */
70		COLOR backcolor = BLKCOLOR; /* background color (float) */
71		double backz = 0.0; /* background z value */
72	<	int normdist = 1; /* normalized distance? */
72	>	int normdist = 1; /* i/o normalized distance? */
73	>	char ourfmt[MAXFMTLEN] = PICFMT; /* original picture format */
74		double ourexp = -1; /* original picture exposure */
75		int expadj = 0; /* exposure adjustment (f-stops) */
76		double rexpadj = 1; /* real exposure adjustment */
77
78	<	VIEW theirview = STDVIEW; /* input view */
78	>	VIEW theirview; /* input view */
79		int gotview; /* got input view? */
80		int wrongformat = 0; /* input in another format? */
81		RESOLU tresolu; /* input resolution */
#	Line 80 \| Line 83 \| *double theirexp; / input picture exposure /*
83		MAT4 theirs2ours; /* transformation matrix */
84		int hasmatrix = 0; /* has transformation matrix */
85
86	<	int PDesc[3] = {-1,-1,-1}; /* rtrace process descriptor */
84	<	#define childpid (PDesc[2])
86	>	static SUBPROC PDesc = SP_INACTIVE; /* rtrace process descriptor */
87		unsigned short queue[PACKSIZ][2]; /* pending pixels */
88		int packsiz; /* actual packet size */
89	<	int queuesiz; /* number of pixels pending */
89	>	int queuesiz = 0; /* number of pixels pending */
90
91	<	extern double movepixel();
91	>	typedef void fillfunc_t(int x, int y);
92
93	+	static gethfunc headline;
94	+	static int nextview(FILE *fp);
95	+	static void compavgview(void);
96	+	static void addpicture(char pfile, char zspec);
97	+	static int pixform(MAT4 xfmat, VIEW vw1, VIEW vw2);
98	+	static void addscanline(struct bound *xl, int y,
99	+	COLR pline, float zline, struct position *lasty);
100	+	static void addpixel(struct position p0, struct position p1,
101	+	struct position *p2, COLR pix, double w, double z);
102	+	static double movepixel(FVECT pos);
103	+	static int getperim(struct bound xl, struct bound yl, float *zline, int zfd);
104	+	static void backpicture(fillfunc_t *fill, int samp);
105	+	static void fillpicture(fillfunc_t *fill);
106	+	static int clipaft(void);
107	+	static int addblur(void);
108	+	static void writepicture(void);
109	+	static void writedistance(char *fname);
110	+	static fillfunc_t backfill;
111	+	static fillfunc_t rcalfill;
112	+	static void calstart(char prog, char args);
113	+	static void caldone(void);
114	+	static void clearqueue(void);
115	+	static void syserror(char *s);
116
117	<	main(argc, argv) /* interpolate pictures */
118	<	int argc;
119	<	char *argv[];
117	>	fillfunc_t fillfunc = backfill; / selected fill function */
118	>
119	>	int
120	>	main( /* interpolate pictures */
121	>	int argc,
122	>	char *argv[]
123	>	)
124		{
125	<	#define check(ol,al) if (argv[i][ol] \|\| \
126	<	badarg(argc-i-1,argv+i+1,al)) \
125	>	#define check(ol,al) if (argv[an][ol] \|\| \
126	>	badarg(argc-an-1,argv+an+1,al)) \
127		goto badopt
128		int gotvfile = 0;
129		int doavg = -1;
130	+	int doblur = 0;
131		char *zfile = NULL;
132		char *expcomp = NULL;
133	<	char *err;
104	<	int i, rval;
133	>	int i, an, rval;
134
135	<	progname = argv[0];
135	>	SET_DEFAULT_BINARY();
136	>	SET_FILE_BINARY(stdout);
137
138	<	for (i = 1; i < argc && argv[i][0] == '-'; i++) {
139	<	rval = getviewopt(&ourview, argc-i, argv+i);
138	>	fixargv0(argv[0]); /* sets global progname */
139	>
140	>	for (an = 1; an < argc && argv[an][0] == '-'; an++) {
141	>	rval = getviewopt(&ourview, argc-an, argv+an);
142		if (rval >= 0) {
143	<	i += rval;
143	>	an += rval;
144		continue;
145		}
146	<	switch (argv[i][1]) {
146	>	switch (argv[an][1]) {
147		case 'e': /* exposure */
148		check(2,"f");
149	<	expcomp = argv[++i];
149	>	expcomp = argv[++an];
150		break;
151		case 't': /* threshold */
152		check(2,"f");
153	<	zeps = atof(argv[++i]);
153	>	zeps = atof(argv[++an]);
154		break;
155		case 'a': /* average */
156		check(2,NULL);
157		doavg = 1;
158		break;
159	+	case 'B': /* blur views */
160	+	check(2,NULL);
161	+	doblur = 1;
162	+	break;
163		case 'q': /* quick (no avg.) */
164		check(2,NULL);
165		doavg = 0;
#	Line 133 \| Line 169 \| *char argv[];**
169		normdist = !normdist;
170		break;
171		case 'f': /* fill type */
172	<	switch (argv[i][2]) {
172	>	switch (argv[an][2]) {
173		case '0': /* none */
174		check(3,NULL);
175		fillo = 0;
#	Line 152 \| Line 188 \| *char argv[];**
188		break;
189		case 's': /* sample */
190		check(3,"i");
191	<	fillsamp = atoi(argv[++i]);
191	>	fillsamp = atoi(argv[++an]);
192		break;
193		case 'c': /* color */
194		check(3,"fff");
195		fillfunc = backfill;
196	<	setcolor(backcolor, atof(argv[i+1]),
197	<	atof(argv[i+2]), atof(argv[i+3]));
196	>	setcolor(backcolor, atof(argv[an+1]),
197	>	atof(argv[an+2]), atof(argv[an+3]));
198		setcolr(backcolr, colval(backcolor,RED),
199		colval(backcolor,GRN),
200		colval(backcolor,BLU));
201	<	i += 3;
201	>	an += 3;
202		break;
203		case 'z': /* z value */
204		check(3,"f");
205		fillfunc = backfill;
206	<	backz = atof(argv[++i]);
206	>	backz = atof(argv[++an]);
207		break;
208		case 'r': /* rtrace */
209		check(3,"s");
210		fillfunc = rcalfill;
211	<	calstart(RTCOM, argv[++i]);
211	>	calstart(RTCOM, argv[++an]);
212		break;
213		default:
214		goto badopt;
#	Line 180 \| Line 216 \| *char argv[];**
216		break;
217		case 'z': /* z file */
218		check(2,"s");
219	<	zfile = argv[++i];
219	>	zfile = argv[++an];
220		break;
221		case 'x': /* x resolution */
222		check(2,"i");
223	<	hresolu = atoi(argv[++i]);
223	>	hresolu = atoi(argv[++an]);
224		break;
225		case 'y': /* y resolution */
226		check(2,"i");
227	<	vresolu = atoi(argv[++i]);
227	>	vresolu = atoi(argv[++an]);
228		break;
229		case 'p': /* pixel aspect */
230	<	if (argv[i][2] != 'a')
230	>	if (argv[an][2] != 'a')
231		goto badopt;
232		check(3,"f");
233	<	pixaspect = atof(argv[++i]);
233	>	pixaspect = atof(argv[++an]);
234		break;
235		case 'v': /* view file */
236	<	if (argv[i][2] != 'f')
236	>	if (argv[an][2] != 'f')
237		goto badopt;
238		check(3,"s");
239	<	gotvfile = viewfile(argv[++i], &ourview, 0, 0);
239	>	gotvfile = viewfile(argv[++an], &ourview, NULL);
240		if (gotvfile < 0)
241	<	syserror(argv[i]);
241	>	syserror(argv[an]);
242		else if (gotvfile == 0) {
243		fprintf(stderr, "%s: bad view file\n",
244	<	argv[i]);
244	>	argv[an]);
245		exit(1);
246		}
247		break;
248		default:
249		badopt:
250		fprintf(stderr, "%s: command line error at '%s'\n",
251	<	progname, argv[i]);
251	>	progname, argv[an]);
252		goto userr;
253		}
254		}
255		/* check arguments */
256	<	if ((argc-i)%2)
256	>	if ((argc-an)%2)
257		goto userr;
258		if (fillsamp == 1)
259		fillo &= ~F_BACK;
260		if (doavg < 0)
261	<	doavg = (argc-i) > 2;
262	<	if (expcomp != NULL)
263	<	if (expcomp[0] == '+' \| expcomp[0] == '-') {
261	>	doavg = (argc-an) > 2;
262	>	if (expcomp != NULL) {
263	>	if ((expcomp[0] == '+') \| (expcomp[0] == '-')) {
264		expadj = atof(expcomp) + (expcomp[0]=='+' ? .5 : -.5);
265	<	if (doavg)
265	>	if (doavg \| doblur)
266		rexpadj = pow(2.0, atof(expcomp));
267		else
268		rexpadj = pow(2.0, (double)expadj);
#	Line 235 \| Line 271 \| *char argv[];**
271		goto userr;
272		rexpadj = atof(expcomp);
273		expadj = log(rexpadj)/LOG2 + (rexpadj>1 ? .5 : -.5);
274	<	if (!doavg)
274	>	if (!(doavg \| doblur))
275		rexpadj = pow(2.0, (double)expadj);
276		}
277	+	}
278		/* set view */
279	<	if ((err = setview(&ourview)) != NULL) {
280	<	fprintf(stderr, "%s: %s\n", progname, err);
279	>	if (nextview(doblur ? stdin : (FILE *)NULL) == EOF) {
280	>	fprintf(stderr, "%s: no view on standard input!\n",
281	>	progname);
282		exit(1);
283		}
284		normaspect(viewaspect(&ourview), &pixaspect, &hresolu, &vresolu);
#	Line 248 \| Line 286 \| *char argv[];**
286		if (doavg) {
287		ourspict = (COLOR )bmalloc(hresoluvresolu*sizeof(COLOR));
288		ourweigh = (float )bmalloc(hresoluvresolu*sizeof(float));
289	<	if (ourspict == NULL \| ourweigh == NULL)
289	>	if ((ourspict == NULL) \| (ourweigh == NULL))
290		syserror(progname);
291		} else {
292		ourpict = (COLR )bmalloc(hresoluvresolu*sizeof(COLR));
293		if (ourpict == NULL)
294		syserror(progname);
295		}
296	+	if (doblur) {
297	+	ourbpict = (COLOR )bmalloc(hresoluvresolu*sizeof(COLOR));
298	+	if (ourbpict == NULL)
299	+	syserror(progname);
300	+	}
301		ourzbuf = (float )bmalloc(hresoluvresolu*sizeof(float));
302		if (ourzbuf == NULL)
303		syserror(progname);
261	–	bzero((char )ourzbuf, hresoluvresolu*sizeof(float));
304		/* new header */
305		newheader("RADIANCE", stdout);
306	<	/* get input */
307	<	for ( ; i < argc; i += 2)
308	<	addpicture(argv[i], argv[i+1]);
309	<	/* fill in spaces */
310	<	if (fillo&F_BACK)
311	<	backpicture(fillfunc, fillsamp);
312	<	else
313	<	fillpicture(fillfunc);
306	>	fputnow(stdout);
307	>	/* run pictures */
308	>	do {
309	>	memset((char )ourzbuf, '\0', hresoluvresolu*sizeof(float));
310	>	for (i = an; i < argc; i += 2)
311	>	addpicture(argv[i], argv[i+1]);
312	>	if (fillo&F_BACK) /* fill in spaces */
313	>	backpicture(fillfunc, fillsamp);
314	>	else
315	>	fillpicture(fillfunc);
316	>	/* aft clipping */
317	>	clipaft();
318	>	} while (addblur() && nextview(stdin) != EOF);
319		/* close calculation */
320		caldone();
274	–	/* aft clipping */
275	–	clipaft();
321		/* add to header */
322		printargs(argc, argv, stdout);
323	<	if (gotvfile) {
323	>	compavgview();
324	>	if (doblur \| gotvfile) {
325		fputs(VIEWSTR, stdout);
326	<	fprintview(&ourview, stdout);
326	>	fprintview(&avgview, stdout);
327		putc('\n', stdout);
328		}
329	<	if (pixaspect < .99 \| pixaspect > 1.01)
329	>	if ((pixaspect < .995) \| (pixaspect > 1.005))
330		fputaspect(pixaspect, stdout);
331		if (ourexp > 0)
332		ourexp *= rexpadj;
333		else
334		ourexp = rexpadj;
335	<	if (ourexp < .995 \| ourexp > 1.005)
335	>	if ((ourexp < .995) \| (ourexp > 1.005))
336		fputexpos(ourexp, stdout);
337	<	fputformat(COLRFMT, stdout);
337	>	if (strcmp(ourfmt, PICFMT)) /* print format if known */
338	>	fputformat(ourfmt, stdout);
339		putc('\n', stdout);
340		/* write picture */
341		writepicture();
#	Line 299 \| Line 346 \| *char argv[];**
346		exit(0);
347		userr:
348		fprintf(stderr,
349	<	"Usage: %s [view opts][-t eps][-z zout][-e spec][-a\|-q][-fT][-n] pfile zspec ..\n",
349	>	"Usage: %s [view opts][-t eps][-z zout][-e spec][-B][-a\|-q][-fT][-n] pfile zspec ..\n",
350		progname);
351		exit(1);
352		#undef check
353		}
354
355
356	<	headline(s) /* process header string */
357	<	char *s;
356	>	static int
357	>	headline( /* process header string */
358	>	char *s,
359	>	void *p
360	>	)
361		{
362	<	char fmt[32];
362	>	char fmt[MAXFMTLEN];
363
364		if (isheadid(s))
365	<	return;
365	>	return(0);
366		if (formatval(fmt, s)) {
367	<	wrongformat = strcmp(fmt, COLRFMT);
368	<	return;
367	>	if (globmatch(ourfmt, fmt)) {
368	>	wrongformat = 0;
369	>	strcpy(ourfmt, fmt);
370	>	} else
371	>	wrongformat = 1;
372	>	return(0);
373		}
374	<	putc('\t', stdout);
375	<	fputs(s, stdout);
376	<
374	>	if (nvavg < 2) {
375	>	putc('\t', stdout);
376	>	fputs(s, stdout);
377	>	}
378		if (isexpos(s)) {
379		theirexp *= exposval(s);
380	<	return;
380	>	return(0);
381		}
382		if (isview(s) && sscanview(&theirview, s) > 0)
383		gotview++;
384	+	return(0);
385		}
386
387
388	<	addpicture(pfile, zspec) /* add picture to output */
389	<	char pfile, zspec;
388	>	static int
389	>	nextview( /* get and set next view */
390	>	FILE *fp
391	>	)
392		{
393	+	char linebuf[256];
394	+	char *err;
395	+	int i;
396	+
397	+	if (fp != NULL) {
398	+	do /* get new view */
399	+	if (fgets(linebuf, sizeof(linebuf), fp) == NULL)
400	+	return(EOF);
401	+	while (!isview(linebuf) \|\| !sscanview(&ourview, linebuf));
402	+	}
403	+	/* set new view */
404	+	if ((err = setview(&ourview)) != NULL) {
405	+	fprintf(stderr, "%s: %s\n", progname, err);
406	+	exit(1);
407	+	}
408	+	if (!nvavg) { /* first view */
409	+	avgview = ourview;
410	+	return(nvavg++);
411	+	}
412	+	/* add to average view */
413	+	for (i = 0; i < 3; i++) {
414	+	avgview.vp[i] += ourview.vp[i];
415	+	avgview.vdir[i] += ourview.vdir[i];
416	+	avgview.vup[i] += ourview.vup[i];
417	+	}
418	+	avgview.vdist += ourview.vdist;
419	+	avgview.horiz += ourview.horiz;
420	+	avgview.vert += ourview.vert;
421	+	avgview.hoff += ourview.hoff;
422	+	avgview.voff += ourview.voff;
423	+	avgview.vfore += ourview.vfore;
424	+	avgview.vaft += ourview.vaft;
425	+	return(nvavg++);
426	+	}
427	+
428	+
429	+	static void
430	+	compavgview(void) /* compute average view */
431	+	{
432	+	int i;
433	+	double f;
434	+
435	+	if (nvavg < 2)
436	+	return;
437	+	f = 1.0/nvavg;
438	+	for (i = 0; i < 3; i++) {
439	+	avgview.vp[i] *= f;
440	+	avgview.vdir[i] *= f;
441	+	avgview.vup[i] *= f;
442	+	}
443	+	avgview.vdist *= f;
444	+	avgview.horiz *= f;
445	+	avgview.vert *= f;
446	+	avgview.hoff *= f;
447	+	avgview.voff *= f;
448	+	avgview.vfore *= f;
449	+	avgview.vaft *= f;
450	+	if (setview(&avgview) != NULL) /* in case of emergency... */
451	+	avgview = ourview;
452	+	pixaspect = viewaspect(&avgview) * hresolu / vresolu;
453	+	}
454	+
455	+
456	+	static void
457	+	addpicture( /* add picture to output */
458	+	char *pfile,
459	+	char *zspec
460	+	)
461	+	{
462		FILE *pfp;
463		int zfd;
464		char *err;
#	Line 345 \| Line 472 \| *char pfile, zspec;*
472		syserror(pfile);
473		/* get header with exposure and view */
474		theirexp = 1.0;
475	+	theirview = stdview;
476		gotview = 0;
477	<	printf("%s:\n", pfile);
477	>	if (nvavg < 2)
478	>	printf("%s:\n", pfile);
479		getheader(pfp, headline, NULL);
480		if (wrongformat \|\| !gotview \|\| !fgetsresolu(&tresolu, pfp)) {
481		fprintf(stderr, "%s: picture format error\n", pfile);
#	Line 356 \| Line 485 \| *char pfile, zspec;*
485		ourexp = theirexp;
486		else if (ABS(theirexp-ourexp) > .01*ourexp)
487		fprintf(stderr, "%s: different exposure (warning)\n", pfile);
488	<	if (err = setview(&theirview)) {
488	>	if ( (err = setview(&theirview)) ) {
489		fprintf(stderr, "%s: %s\n", pfile, err);
490		exit(1);
491		}
#	Line 366 \| Line 495 \| *char pfile, zspec;*
495		zin = (float )malloc(scanlen(&tresolu)sizeof(float));
496		if (zin == NULL)
497		syserror(progname);
498	<	if ((zfd = open(zspec, O_RDONLY)) == -1) {
499	<	double zvalue;
500	<	register int x;
501	<	if (!isflt(zspec) \|\| (zvalue = atof(zspec)) <= 0.0)
502	<	syserror(zspec);
498	>	if (isflt(zspec)) { /* depth is a constant? */
499	>	double zvalue = atof(zspec);
500	>	int x;
501	>	if (zvalue <= 0.0) {
502	>	fprintf(stderr, "%s: illegal Z-value %s\n",
503	>	progname, zspec);
504	>	exit(1);
505	>	}
506		for (x = scanlen(&tresolu); x-- > 0; )
507		zin[x] = zvalue;
508	<	}
508	>	zfd = -1;
509	>	} else if ((zfd = open_float_depth(zspec, (long)tresolu.xr*tresolu.yr)) < 0)
510	>	exit(1);
511		/* compute transferrable perimeter */
512		xlim = (struct bound )malloc(numscans(&tresolu)sizeof(struct bound));
513		if (xlim == NULL)
514		syserror(progname);
515		if (!getperim(xlim, &ylim, zin, zfd)) { /* overlapping area? */
516	<	free((char *)zin);
517	<	free((char *)xlim);
516	>	free((void *)zin);
517	>	free((void *)xlim);
518		if (zfd != -1)
519		close(zfd);
520		fclose(pfp);
#	Line 390 \| Line 524 \| *char pfile, zspec;*
524		scanin = (COLR )malloc(scanlen(&tresolu)sizeof(COLR));
525		plast = (struct position *)calloc(scanlen(&tresolu),
526		sizeof(struct position));
527	<	if (scanin == NULL \| plast == NULL)
527	>	if ((scanin == NULL) \| (plast == NULL))
528		syserror(progname);
529		/* skip to starting point */
530		for (y = 0; y < ylim.min; y++)
#	Line 399 \| Line 533 \| *char pfile, zspec;*
533		exit(1);
534		}
535		if (zfd != -1 && lseek(zfd,
536	<	(long)ylim.minscanlen(&tresolu)sizeof(float), 0) < 0)
536	>	(off_t)ylim.minscanlen(&tresolu)sizeof(float),
537	>	SEEK_SET) < 0)
538		syserror(zspec);
539		/* load image */
540		for (y = ylim.min; y <= ylim.max; y++) {
#	Line 414 \| Line 549 \| *char pfile, zspec;*
549		addscanline(xlim+y, y, scanin, zin, plast);
550		}
551		/* clean up */
552	<	free((char *)xlim);
553	<	free((char *)scanin);
554	<	free((char *)zin);
555	<	free((char *)plast);
552	>	free((void *)xlim);
553	>	free((void *)scanin);
554	>	free((void *)zin);
555	>	free((void *)plast);
556		fclose(pfp);
557		if (zfd != -1)
558		close(zfd);
559		}
560
561
562	<	pixform(xfmat, vw1, vw2) /* compute view1 to view2 matrix */
563	<	register MAT4 xfmat;
564	<	register VIEW vw1, vw2;
562	>	static int
563	>	pixform( /* compute view1 to view2 matrix */
564	>	MAT4 xfmat,
565	>	VIEW *vw1,
566	>	VIEW *vw2
567	>	)
568		{
569	<	double m4t[4][4];
569	>	MAT4 m4t;
570
571	<	if (vw1->type != VT_PER && vw1->type != VT_PAR)
571	>	if ((vw1->type != VT_PER) & (vw1->type != VT_PAR))
572		return(0);
573	<	if (vw2->type != VT_PER && vw2->type != VT_PAR)
573	>	if ((vw2->type != VT_PER) & (vw2->type != VT_PAR))
574		return(0);
575		setident4(xfmat);
576		xfmat[0][0] = vw1->hvec[0];
#	Line 465 \| Line 603 \| *register VIEW vw1, vw2;*
603		}
604
605
606	<	addscanline(xl, y, pline, zline, lasty) /* add scanline to output */
607	<	struct bound *xl;
608	<	int y;
609	<	COLR *pline;
610	<	float *zline;
611	<	struct position lasty; / input/output */
606	>	static void
607	>	addscanline( /* add scanline to output */
608	>	struct bound *xl,
609	>	int y,
610	>	COLR *pline,
611	>	float *zline,
612	>	struct position lasty / input/output */
613	>	)
614		{
615		FVECT pos;
616		struct position lastx, newpos;
617		double wt;
618	<	register int x;
618	>	int x;
619
620		lastx.z = 0;
621		for (x = xl->max; x >= xl->min; x--) {
#	Line 497 \| Line 637 \| *struct position lasty; /* input/output /*
637		}
638
639
640	<	addpixel(p0, p1, p2, pix, w, z) /* fill in pixel parallelogram */
641	<	struct position p0, p1, *p2;
642	<	COLR pix;
643	<	double w;
644	<	double z;
640	>	static void
641	>	addpixel( /* fill in pixel parallelogram */
642	>	struct position *p0,
643	>	struct position *p1,
644	>	struct position *p2,
645	>	COLR pix,
646	>	double w,
647	>	double z
648	>	)
649		{
650		double zt = 2.zepsp0->z; /* threshold */
651		COLOR pval; /* converted+weighted pixel */
#	Line 509 \| Line 653 \| double z;
653		int l1, l2, c1, c2; /* side lengths and counters */
654		int p1isy; /* p0p1 along y? */
655		int x1, y1; /* p1 position */
656	<	register int x, y; /* final position */
656	>	int x, y; /* final position */
657
658		/* compute vector p0p1 */
659		if (fillo&F_FORE && ABS(p1->z-p0->z) <= zt) {
660		s1x = p1->x - p0->x;
661		s1y = p1->y - p0->y;
662		l1 = ABS(s1x);
663	<	if (p1isy = (ABS(s1y) > l1))
663	>	if ( (p1isy = (ABS(s1y) > l1)) )
664		l1 = ABS(s1y);
665		else if (l1 < 1)
666		l1 = 1;
#	Line 549 \| Line 693 \| double z;
693		y1 = p0->y + c1*s1y/l1;
694		for (c2 = l2; c2-- > 0; ) {
695		x = x1 + c2*s2x/l2;
696	<	if (x < 0 \|\| x >= hresolu)
696	>	if ((x < 0) \| (x >= hresolu))
697		continue;
698		y = y1 + c2*s2y/l2;
699	<	if (y < 0 \|\| y >= vresolu)
699	>	if ((y < 0) \| (y >= vresolu))
700		continue;
701		if (averaging) {
702		if (zscan(y)[x] <= 0 \|\| zscan(y)[x]-z
#	Line 574 \| Line 718 \| double z;
718		}
719
720
721	<	double
722	<	movepixel(pos) /* reposition image point */
723	<	register FVECT pos;
721	>	static double
722	>	movepixel( /* reposition image point */
723	>	FVECT pos
724	>	)
725		{
726		FVECT pt, tdir, odir;
727		double d;
583	–	register int i;
728
729		if (pos[2] <= 0) /* empty pixel */
730		return(0);
731	<	if (!averaging && hasmatrix) {
731	>	if (usematrix) {
732		pos[0] += theirview.hoff - .5;
733		pos[1] += theirview.voff - .5;
734	+	if (normdist & (theirview.type == VT_PER))
735	+	d = sqrt(1. + pos[0]pos[0]theirview.hn2
736	+	+ pos[1]pos[1]theirview.vn2);
737	+	else
738	+	d = 1.;
739	+	pos[2] += d*theirview.vfore;
740		if (theirview.type == VT_PER) {
741	<	if (normdist) /* adjust distance */
592	<	pos[2] /= sqrt(1. + pos[0]pos[0]theirview.hn2
593	<	+ pos[1]pos[1]theirview.vn2);
741	>	pos[2] /= d;
742		pos[0] *= pos[2];
743		pos[1] *= pos[2];
744		}
745		multp3(pos, pos, theirs2ours);
746	<	if (pos[2] <= 0)
746	>	if (pos[2] <= ourview.vfore)
747		return(0);
748		if (ourview.type == VT_PER) {
749		pos[0] /= pos[2];
#	Line 603 \| Line 751 \| register FVECT pos;
751		}
752		pos[0] += .5 - ourview.hoff;
753		pos[1] += .5 - ourview.voff;
754	+	if ((pos[0] < 0) \| (pos[0] >= 1-FTINY) \|
755	+	(pos[1] < 0) \| (pos[1] >= 1-FTINY))
756	+	return(0);
757	+	pos[2] -= ourview.vfore;
758		} else {
759		if (viewray(pt, tdir, &theirview, pos[0], pos[1]) < -FTINY)
760		return(0);
761	<	if (!normdist && theirview.type == VT_PER) /* adjust */
762	<	pos[2] = sqrt(1. + pos[0]pos[0]*theirview.hn2
611	<	+ pos[1]pos[1]theirview.vn2);
761	>	if (!normdist & (theirview.type == VT_PER)) /* adjust */
762	>	pos[2] /= DOT(theirview.vdir, tdir);
763		pt[0] += tdir[0]*pos[2];
764		pt[1] += tdir[1]*pos[2];
765		pt[2] += tdir[2]*pos[2];
766	<	viewloc(pos, &ourview, pt);
616	<	if (pos[2] <= 0)
766	>	if (viewloc(pos, &ourview, pt) != VL_GOOD)
767		return(0);
768		}
619	–	if (pos[0] < 0 \|\| pos[0] >= 1-FTINY \|\| pos[1] < 0 \|\| pos[1] >= 1-FTINY)
620	–	return(0);
769		if (!averaging)
770		return(1);
771	<	if (ourview.type == VT_PAR) /* compute our direction */
772	<	VCOPY(odir, ourview.vdir);
773	<	else
774	<	for (i = 0; i < 3; i++)
775	<	odir[i] = (pt[i] - ourview.vp[i])/pos[2];
776	<	d = DOT(odir,tdir); /* compute pixel weight */
777	<	if (d >= 1.-1./MAXWT/MAXWT)
771	>	/* compute pixel weight */
772	>	if (ourview.type == VT_PAR) {
773	>	d = DOT(ourview.vdir,tdir);
774	>	d = 1. - d*d;
775	>	} else {
776	>	VSUB(odir, pt, ourview.vp);
777	>	d = DOT(odir,tdir);
778	>	d = 1. - d*d/DOT(odir,odir);
779	>	}
780	>	if (d <= 1./MAXWT/MAXWT)
781		return(MAXWT); /* clip to maximum weight */
782	<	return(1./sqrt(1.-d));
782	>	return(1./sqrt(d));
783		}
784
785
786	<	getperim(xl, yl, zline, zfd) /* compute overlapping image area */
787	<	register struct bound *xl;
788	<	struct bound *yl;
789	<	float *zline;
790	<	int zfd;
786	>	static int
787	>	getperim( /* compute overlapping image area */
788	>	struct bound *xl,
789	>	struct bound *yl,
790	>	float *zline,
791	>	int zfd
792	>	)
793		{
794		int step;
795		FVECT pos;
796	<	register int x, y;
796	>	int x, y;
797		/* set up step size */
798		if (scanlen(&tresolu) < numscans(&tresolu))
799		step = scanlen(&tresolu)/NSTEPS;
#	Line 659 \| Line 812 \| int zfd;
812		yl->min = 32000; yl->max = 0; /* search for points on image */
813		for (y = step - 1; y < numscans(&tresolu); y += step) {
814		if (zfd != -1) {
815	<	if (lseek(zfd, (long)yscanlen(&tresolu)sizeof(float),
816	<	0) < 0)
815	>	if (lseek(zfd, (off_t)yscanlen(&tresolu)sizeof(float),
816	>	SEEK_SET) < 0)
817		syserror("lseek");
818		if (read(zfd, (char *)zline,
819		scanlen(&tresolu)*sizeof(float))
#	Line 705 \| Line 858 \| int zfd;
858		xl[y-1].max = xl[y-step].max;
859		}
860		for (x = 2; x < step; x++)
861	<	copystruct(xl+y-x, xl+y-1);
861	>	(xl+y-x) = (xl+y-1);
862		}
863		if (yl->max >= numscans(&tresolu))
864		yl->max = numscans(&tresolu) - 1;
865		y -= step;
866		for (x = numscans(&tresolu) - 1; x > y; x--) /* fill bottom rows */
867	<	copystruct(xl+x, xl+y);
867	>	(xl+x) = (xl+y);
868		return(yl->max >= yl->min);
869		}
870
871
872	<	backpicture(fill, samp) /* background fill algorithm */
873	<	int (*fill)();
874	<	int samp;
872	>	static void
873	>	backpicture( /* background fill algorithm */
874	>	fillfunc_t *fill,
875	>	int samp
876	>	)
877		{
878		int *yback, xback;
879		int y;
880	<	register int x, i;
880	>	int x, i;
881		/* get back buffer */
882		yback = (int )malloc(hresolusizeof(int));
883		if (yback == NULL)
#	Line 820 \| Line 975 \| int samp;
975		xback = -2;
976		}
977		}
978	<	free((char *)yback);
978	>	free((void *)yback);
979		}
980
981
982	<	fillpicture(fill) /* paint in empty pixels using fill */
983	<	int (*fill)();
982	>	static void
983	>	fillpicture( /* paint in empty pixels using fill */
984	>	fillfunc_t *fill
985	>	)
986		{
987	<	register int x, y;
987	>	int x, y;
988
989		for (y = 0; y < vresolu; y++)
990		for (x = 0; x < hresolu; x++)
991		if (zscan(y)[x] <= 0)
992		(*fill)(x,y);
993	+	if (fill == rcalfill)
994	+	clearqueue();
995		}
996
997
998	<	clipaft() /* perform aft clipping as indicated */
998	>	static int
999	>	clipaft(void) /* perform aft clipping as indicated */
1000		{
1001	<	register int x, y;
1001	>	int x, y;
1002	>	int adjtest = (ourview.type == VT_PER) & zisnorm;
1003		double tstdist;
1004		double yzn2, vx;
1005
1006		if (ourview.vaft <= FTINY)
1007	<	return;
1007	>	return(0);
1008		tstdist = ourview.vaft - ourview.vfore;
1009		for (y = 0; y < vresolu; y++) {
1010	<	if (ourview.type == VT_PER) { /* adjust distance */
1010	>	if (adjtest) { /* adjust test */
1011		yzn2 = (y+.5)/vresolu + ourview.voff - .5;
1012		yzn2 = 1. + yzn2yzn2ourview.vn2;
1013		tstdist = (ourview.vaft - ourview.vfore)*sqrt(yzn2);
1014		}
1015		for (x = 0; x < hresolu; x++)
1016		if (zscan(y)[x] > tstdist) {
1017	<	if (ourview.type == VT_PER) {
1017	>	if (adjtest) {
1018		vx = (x+.5)/hresolu + ourview.hoff - .5;
1019		if (zscan(y)[x] <= (ourview.vaft -
1020		ourview.vfore) *
#	Line 861 \| Line 1022 \| *clipaft() / perform aft clipping as indicated /*
1022		continue;
1023		}
1024		if (averaging)
1025	<	bzero(sscan(y)[x], sizeof(COLOR));
1025	>	memset(sscan(y)[x], '\0', sizeof(COLOR));
1026		else
1027	<	bzero(pscan(y)[x], sizeof(COLR));
1027	>	memset(pscan(y)[x], '\0', sizeof(COLR));
1028		zscan(y)[x] = 0.0;
1029		}
1030		}
1031	+	return(1);
1032		}
1033
1034
1035	<	writepicture() /* write out picture (alters buffer) */
1035	>	static int
1036	>	addblur(void) /* add to blurred picture */
1037		{
1038	+	COLOR cval;
1039	+	double d;
1040	+	int i;
1041	+
1042	+	if (!blurring)
1043	+	return(0);
1044	+	i = hresolu*vresolu;
1045	+	if (nvavg < 2)
1046	+	if (averaging)
1047	+	while (i--) {
1048	+	copycolor(ourbpict[i], ourspict[i]);
1049	+	d = 1.0/ourweigh[i];
1050	+	scalecolor(ourbpict[i], d);
1051	+	}
1052	+	else
1053	+	while (i--)
1054	+	colr_color(ourbpict[i], ourpict[i]);
1055	+	else
1056	+	if (averaging)
1057	+	while (i--) {
1058	+	copycolor(cval, ourspict[i]);
1059	+	d = 1.0/ourweigh[i];
1060	+	scalecolor(cval, d);
1061	+	addcolor(ourbpict[i], cval);
1062	+	}
1063	+	else
1064	+	while (i--) {
1065	+	colr_color(cval, ourpict[i]);
1066	+	addcolor(ourbpict[i], cval);
1067	+	}
1068	+	/* print view */
1069	+	printf("VIEW%d:", nvavg);
1070	+	fprintview(&ourview, stdout);
1071	+	putchar('\n');
1072	+	return(1);
1073	+	}
1074	+
1075	+
1076	+	static void
1077	+	writepicture(void) /* write out picture (alters buffer) */
1078	+	{
1079		int y;
1080	<	register int x;
1080	>	int x;
1081		double d;
1082
1083		fprtresolu(hresolu, vresolu, stdout);
1084		for (y = vresolu-1; y >= 0; y--)
1085	<	if (averaging) {
1085	>	if (blurring) {
1086	>	for (x = 0; x < hresolu; x++) { /* compute avg. */
1087	>	d = rexpadj/nvavg;
1088	>	scalecolor(bscan(y)[x], d);
1089	>	}
1090	>	if (fwritescan(bscan(y), hresolu, stdout) < 0)
1091	>	syserror(progname);
1092	>	} else if (averaging) {
1093		for (x = 0; x < hresolu; x++) { /* average pixels */
1094		d = rexpadj/wscan(y)[x];
1095		scalecolor(sscan(y)[x], d);
#	Line 894 \| Line 1105 \| *writepicture() / write out picture (alters buffer)**
1105		}
1106
1107
1108	<	writedistance(fname) /* write out z file */
1109	<	char *fname;
1108	>	static void
1109	>	writedistance( /* write out z file (alters buffer) */
1110	>	char *fname
1111	>	)
1112		{
1113	<	int donorm = normdist && ourview.type == VT_PER &&
1114	<	!averaging && hasmatrix;
1113	>	int donorm = normdist & !zisnorm ? 1 :
1114	>	(ourview.type == VT_PER) & !normdist & zisnorm ? -1 : 0;
1115		int fd;
1116		int y;
904	–	float *zout;
1117
1118		if ((fd = open(fname, O_WRONLY\|O_CREAT\|O_TRUNC, 0666)) == -1)
1119		syserror(fname);
908	–	if (donorm
909	–	&& (zout = (float )malloc(hresolusizeof(float))) == NULL)
910	–	syserror(progname);
1120		for (y = vresolu-1; y >= 0; y--) {
1121		if (donorm) {
1122	<	double vx, yzn2;
1123	<	register int x;
1122	>	double vx, yzn2, d;
1123	>	int x;
1124		yzn2 = (y+.5)/vresolu + ourview.voff - .5;
1125		yzn2 = 1. + yzn2yzn2ourview.vn2;
1126		for (x = 0; x < hresolu; x++) {
1127		vx = (x+.5)/hresolu + ourview.hoff - .5;
1128	<	zout[x] = zscan(y)[x]
1129	<	* sqrt(vxvxourview.hn2 + yzn2);
1128	>	d = sqrt(vxvxourview.hn2 + yzn2);
1129	>	if (donorm > 0)
1130	>	zscan(y)[x] *= d;
1131	>	else
1132	>	zscan(y)[x] /= d;
1133		}
1134	<	} else
1135	<	zout = zscan(y);
924	<	if (write(fd, (char )zout, hresolusizeof(float))
1134	>	}
1135	>	if (write(fd, (char )zscan(y), hresolusizeof(float))
1136		< hresolu*sizeof(float))
1137		syserror(fname);
1138		}
928	–	if (donorm)
929	–	free((char *)zout);
1139		close(fd);
1140		}
1141
1142
1143	<	backfill(x, y) /* fill pixel with background */
1144	<	int x, y;
1143	>	static void
1144	>	backfill( /* fill pixel with background */
1145	>	int x,
1146	>	int y
1147	>	)
1148		{
1149		if (averaging) {
1150		copycolor(sscan(y)[x], backcolor);
#	Line 943 \| Line 1155 \| int x, y;
1155		}
1156
1157
1158	<	calstart(prog, args) /* start fill calculation */
1159	<	char prog, args;
1158	>	static void
1159	>	calstart( /* start fill calculation */
1160	>	char *prog,
1161	>	char *args
1162	>	)
1163		{
1164		char combuf[512];
1165		char *argv[64];
1166		int rval;
1167	<	register char *wp, cp;
1167	>	char *wp, cp;
1168
1169	<	if (childpid != -1) {
1169	>	if (PDesc.flags & PF_RUNNING) {
1170		fprintf(stderr, "%s: too many calculations\n", progname);
1171		exit(1);
1172		}
#	Line 970 \| Line 1185 \| *char prog, args;*
1185		}
1186		*wp = NULL;
1187		/* start process */
1188	<	if ((rval = open_process(PDesc, argv)) < 0)
1188	>	if ((rval = open_process(&PDesc, argv)) < 0)
1189		syserror(progname);
1190		if (rval == 0) {
1191		fprintf(stderr, "%s: command not found\n", argv[0]);
#	Line 983 \| Line 1198 \| *char prog, args;*
1198		}
1199
1200
1201	<	caldone() /* done with calculation */
1201	>	static void
1202	>	caldone(void) /* done with calculation */
1203		{
1204	<	if (childpid == -1)
1204	>	if (!(PDesc.flags & PF_RUNNING))
1205		return;
1206		clearqueue();
1207	<	close_process(PDesc);
992	<	childpid = -1;
1207	>	close_process(&PDesc);
1208		}
1209
1210
1211	<	rcalfill(x, y) /* fill with ray-calculated pixel */
1212	<	int x, y;
1211	>	static void
1212	>	rcalfill( /* fill with ray-calculated pixel */
1213	>	int x,
1214	>	int y
1215	>	)
1216		{
1217		if (queuesiz >= packsiz) /* flush queue if needed */
1218		clearqueue();
#	Line 1005 \| Line 1223 \| int x, y;
1223		}
1224
1225
1226	<	clearqueue() /* process queue */
1226	>	static void
1227	>	clearqueue(void) /* process queue */
1228		{
1229		FVECT orig, dir;
1230		float fbuf[6*(PACKSIZ+1)];
1231	<	register float *fbp;
1232	<	register int i;
1231	>	float *fbp;
1232	>	int i;
1233	>	double vx, vy;
1234
1235		if (queuesiz == 0)
1236		return;
#	Line 1023 \| Line 1243 \| *clearqueue() / process queue /*
1243		fbp++ = dir[0]; fbp++ = dir[1]; *fbp++ = dir[2];
1244		}
1245		/* mark end and get results */
1246	<	bzero((char )fbp, 6sizeof(float));
1247	<	if (process(PDesc, fbuf, fbuf, 4sizeof(float)queuesiz,
1246	>	memset((char )fbp, '\0', 6sizeof(float));
1247	>	if (process(&PDesc, fbuf, fbuf,
1248	>	4sizeof(float)(queuesiz+1),
1249		6sizeof(float)(queuesiz+1)) !=
1250	<	4sizeof(float)queuesiz) {
1250	>	4sizeof(float)(queuesiz+1)) {
1251		fprintf(stderr, "%s: error reading from rtrace process\n",
1252		progname);
1253		exit(1);
#	Line 1045 \| Line 1266 \| *clearqueue() / process queue /*
1266		} else
1267		setcolr(pscan(queue[i][1])[queue[i][0]],
1268		fbp[0], fbp[1], fbp[2]);
1269	<	zscan(queue[i][1])[queue[i][0]] = fbp[3];
1269	>	if (zisnorm)
1270	>	zscan(queue[i][1])[queue[i][0]] = fbp[3];
1271	>	else {
1272	>	vx = (queue[i][0]+.5)/hresolu + ourview.hoff - .5;
1273	>	vy = (queue[i][1]+.5)/vresolu + ourview.voff - .5;
1274	>	zscan(queue[i][1])[queue[i][0]] = fbp[3] / sqrt(1. +
1275	>	vxvxourview.hn2 + vyvyourview.vn2);
1276	>	}
1277		fbp += 4;
1278		}
1279		queuesiz = 0;
1280		}
1281
1282
1283	<	syserror(s) /* report error and exit */
1284	<	char *s;
1283	>	static void
1284	>	syserror( /* report error and exit */
1285	>	char *s
1286	>	)
1287		{
1288		perror(s);
1289		exit(1);

Diff Legend

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

Comparing src/px/pinterp.c (file contents): Revision 2.21 by greg, Mon Dec 26 21:02:31 1994 UTC vs. Revision 2.55 by greg, Wed Jul 2 16:54:44 2025 UTC

Diff Legend

Comparing src/px/pinterp.c (file contents):
Revision 2.21 by greg, Mon Dec 26 21:02:31 1994 UTC vs.
Revision 2.55 by greg, Wed Jul 2 16:54:44 2025 UTC