ViewVC Help

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

root/Development/ray/src/rt/rtrace.c

Comparing ray/src/rt/rtrace.c (file contents):
Revision 2.88 by greg, Thu Mar 12 17:19:18 2020 UTC vs.
Revision 2.89 by greg, Fri Apr 3 17:06:16 2020 UTC

#	Line 54 | Line 54 | OBJECT traset[MAXTSET+1]={0};          /* trace include/exclud
54
55		static RAY  thisray;                    /* for our convenience */
56
57	+	static FILE  *inpfp = NULL;             /* input stream pointer */
58	+
59	+	static FVECT    *inp_queue = NULL;      /* ray input queue if flushing */
60	+	static int      inp_qpos = 0;           /* next ray to return */
61	+	static int      inp_qend = 0;           /* number of rays in this work group */
62	+
63		typedef void putf_t(RREAL *v, int n);
64		static putf_t puta, putd, putf, putrgbe;
65
#	Line 70 | Line 76 | static void rayirrad(RAY *r);
76		static void rtcompute(FVECT org, FVECT dir, double dmax);
77		static int printvals(RAY *r);
78		static int getvec(FVECT vec, int fmt, FILE *fp);
79	+	static int iszerovec(const FVECT vec);
80	+	static double nextray(FVECT org, FVECT dir);
81		static void tabin(RAY *r);
82		static void ourtrace(RAY *r);
83
#	Line 124 | Line 132 | rtrace(                                /* trace rays from file */
132		FVECT  orig, direc;
133		/* set up input */
134		if (fname == NULL)
135	<	fp = stdin;
136	<	else if ((fp = fopen(fname, "r")) == NULL) {
135	>	inpfp = stdin;
136	>	else if ((inpfp = fopen(fname, "r")) == NULL) {
137		sprintf(errmsg, "cannot open input file \"%s\"", fname);
138		error(SYSTEM, errmsg);
139		}
140	+	#ifdef getc_unlocked
141	+	flockfile(inpfp);               /* avoid lock/unlock overhead */
142	+	flockfile(stdout);
143	+	#endif
144		if (inform != 'a')
145	<	SET_FILE_BINARY(fp);
145	>	SET_FILE_BINARY(inpfp);
146		/* set up output */
147		setoutput(outvals);
148		if (imm_irrad)
#	Line 162 | Line 174 | rtrace(                                /* trace rays from file */
174		else
175		fflush(stdout);
176		}
177	<	/* process file */
178	<	while (getvec(orig, inform, fp) == 0 &&
167	<	getvec(direc, inform, fp) == 0) {
168	<
169	<	d = normalize(direc);
177	>	/* process input rays */
178	>	while ((d = nextray(orig, direc)) >= 0.0) {
179		if (d == 0.0) {                         /* flush request? */
180		if (something2flush) {
181		if (ray_pnprocs > 1 && ray_fifo_flush() < 0)
#	Line 179 | Line 188 | rtrace(                                /* trace rays from file */
188		bogusray();
189		} else {                                /* compute and print */
190		rtcompute(orig, direc, lim_dist ? d : 0.0);
191	<	/* flush if time */
183	<	if (!--nextflush) {
191	>	if (!--nextflush) {             /* flush if time */
192		if (ray_pnprocs > 1 && ray_fifo_flush() < 0)
193		error(USER, "child(ren) died");
194		fflush(stdout);
#	Line 198 | Line 206 | rtrace(                                /* trace rays from file */
206		error(USER, "unable to complete processing");
207		ray_pclose(0);
208		}
209	+	if (vcount)
210	+	error(WARNING, "unexpected EOF on input");
211		if (fflush(stdout) < 0)
212		error(SYSTEM, "write error");
213	<	if (vcount)
214	<	error(USER, "unexpected EOF on input");
215	<	if (fname != NULL)
216	<	fclose(fp);
213	>	if (fname != NULL) {
214	>	fclose(inpfp);
215	>	inpfp = NULL;
216	>	}
217	>	nextray(NULL, NULL);
218		}
219
220
#	Line 421 | Line 432 | printvals(                     /* print requested ray values */
432
433
434		static int
435	<	getvec(         /* get a vector from fp */
435	>	getvec(                 /* get a vector from fp */
436		FVECT  vec,
437		int  fmt,
438		FILE  *fp
#	Line 455 | Line 466 | getvec(                /* get a vector from fp */
466		error(CONSISTENCY, "botched input format");
467		}
468		return(0);
469	+	}
470	+
471	+
472	+	static int
473	+	iszerovec(const FVECT vec)
474	+	{
475	+	return (vec[0] == 0.0) & (vec[1] == 0.0) & (vec[2] == 0.0);
476	+	}
477	+
478	+
479	+	static double
480	+	nextray(                /* return next ray in work group (-1.0 if EOF) */
481	+	FVECT org,
482	+	FVECT dir
483	+	)
484	+	{
485	+	const size_t    qlength = !vresolu * hresolu;
486	+
487	+	if ((org == NULL) | (dir == NULL)) {
488	+	if (inp_queue != NULL)  /* asking to free queue */
489	+	free(inp_queue);
490	+	inp_queue = NULL;
491	+	inp_qpos = inp_qend = 0;
492	+	return(-1.);
493	+	}
494	+	if (!inp_qend) {                /* initialize FIFO queue */
495	+	int     rsiz = 6*20;    /* conservative ascii ray size */
496	+	if (inform == 'f') rsiz = 6*sizeof(float);
497	+	else if (inform == 'd') rsiz = 6*sizeof(double);
498	+	if ((inpfp == stdin) & (qlength*rsiz > 512))    /* pipe limit */
499	+	inp_queue = (FVECT *)malloc(sizeof(FVECT)*2*qlength);
500	+	inp_qend = -(inp_queue == NULL);        /* flag for no queue */
501	+	}
502	+	if (inp_qend < 0) {             /* not queuing? */
503	+	if (getvec(org, inform, inpfp) < 0 ||
504	+	getvec(dir, inform, inpfp) < 0)
505	+	return(-1.);
506	+	return normalize(dir);
507	+	}
508	+	if (inp_qpos >= inp_qend) {     /* need to refill input queue? */
509	+	for (inp_qend = 0; inp_qend < qlength; inp_qend++) {
510	+	if (getvec(inp_queue[2*inp_qend], inform, inpfp) < 0
511	+	|| getvec(inp_queue[2*inp_qend+1],
512	+	inform, inpfp) < 0)
513	+	break;          /* hit EOF */
514	+	if (iszerovec(inp_queue[2*inp_qend+1])) {
515	+	++inp_qend;     /* flush request */
516	+	break;
517	+	}
518	+	}
519	+	inp_qpos = 0;
520	+	}
521	+	if (inp_qpos >= inp_qend)       /* unexpected EOF? */
522	+	return(-1.);
523	+	VCOPY(org, inp_queue[2*inp_qpos]);
524	+	VCOPY(dir, inp_queue[2*inp_qpos+1]);
525	+	++inp_qpos;
526	+	return normalize(dir);
527		}
528
529

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)