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.77 by greg, Sat May 4 13:48:06 2019 UTC vs.
Revision 2.82 by greg, Thu Jul 25 16:50:54 2019 UTC

#	Line 55 | Line 55 | OBJECT traset[MAXTSET+1]={0};          /* trace include/exclud
55		static RAY  thisray;                    /* for our convenience */
56
57		typedef void putf_t(RREAL *v, int n);
58	<	static putf_t puta, putd, putf;
58	>	static putf_t puta, putd, putf, putrgbe;
59
60		typedef void oputf_t(RAY *r);
61		static oputf_t  oputo, oputd, oputv, oputV, oputl, oputL, oputc, oputp,
#	Line 118 | Line 118 | rtrace(                                /* trace rays from file */
118		unsigned long  vcount = (hresolu > 1) ? (unsigned long)hresolu*vresolu
119		: (unsigned long)vresolu;
120		long  nextflush = (vresolu > 0) & (hresolu > 1) ? 0 : hresolu;
121	+	int  something2flush = 0;
122		FILE  *fp;
123		double  d;
124		FVECT  orig, direc;
#	Line 136 | Line 137 | rtrace(                                /* trace rays from file */
137		castonly = 0;
138		else if (castonly)
139		nproc = 1;              /* don't bother multiprocessing */
140	+	if ((nextflush > 0) & (nproc > nextflush)) {
141	+	error(WARNING, "reducing number of processes to match flush interval");
142	+	nproc = nextflush;
143	+	}
144		switch (outform) {
145		case 'a': putreal = puta; break;
146		case 'f': putreal = putf; break;
147		case 'd': putreal = putd; break;
148		case 'c':
149	<	if (strcmp(outvals, "v"))
150	<	error(USER, "color format with value output only");
151	<	break;
149	>	if (outvals[0] && (outvals[1] || !strchr("vrx", outvals[0])))
150	>	error(USER, "color format only with -ov, -or, -ox");
151	>	putreal = putrgbe; break;
152		default:
153		error(CONSISTENCY, "botched output format");
154		}
#	Line 154 | Line 159 | rtrace(                                /* trace rays from file */
159		if (hresolu > 0) {
160		if (vresolu > 0)
161		fprtresolu(hresolu, vresolu, stdout);
162	<	fflush(stdout);
162	>	else
163	>	fflush(stdout);
164		}
165		/* process file */
166		while (getvec(orig, inform, fp) == 0 &&
#	Line 162 | Line 168 | rtrace(                                /* trace rays from file */
168
169		d = normalize(direc);
170		if (d == 0.0) {                         /* zero ==> flush */
171	<	if ((--nextflush <= 0) | !vcount) {
171	>	if ((--nextflush <= 0) | !vcount && something2flush) {
172		if (ray_pnprocs > 1 && ray_fifo_flush() < 0)
173		error(USER, "child(ren) died");
174		bogusray();
175		fflush(stdout);
176	+	something2flush = 0;
177		nextflush = (vresolu > 0) & (hresolu > 1) ? 0 :
178		hresolu;
179		} else
#	Line 179 | Line 186 | rtrace(                                /* trace rays from file */
186		error(USER, "child(ren) died");
187		fflush(stdout);
188		nextflush = hresolu;
189	<	}
189	>	} else
190	>	something2flush = 1;
191		}
192		if (ferror(stdout))
193		error(SYSTEM, "write error");
#	Line 293 | Line 301 | setoutput(                             /* set up output tables */
301		case 'W':                               /* coefficient */
302		*table++ = oputW;
303		castonly = 0;
304	<	if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0))
304	>	if (ambounce > 0 && (ambacc > FTINY) | (ambssamp > 0))
305		error(WARNING,
306		"-otW accuracy depends on -aa 0 -as 0");
307		break;
#	Line 308 | Line 316 | setoutput(                             /* set up output tables */
316		break;
317		}
318		*table = NULL;
319	+	/* compatibility */
320	+	for (table = ray_out; *table != NULL; table++) {
321	+	if ((*table == oputV) | (*table == oputW))
322	+	error(WARNING, "-oVW options require trace mode");
323	+	if ((do_irrad | imm_irrad) &&
324	+	(*table == oputr) | (*table == oputR) |
325	+	(*table == oputx) | (*table == oputX))
326	+	error(WARNING, "-orRxX options incompatible with -I+ and -i+");
327	+	}
328		}
329
330
331		static void
332		bogusray(void)                  /* print out empty record */
333		{
317	–	memset(&thisray, 0, sizeof(thisray));
334		rayorigin(&thisray, PRIMARY, NULL, NULL);
335		printvals(&thisray);
336		}
#	Line 579 | Line 595 | oputv(                         /* print value */
595		{
596		RREAL   cval[3];
597
582	–	if (outform == 'c') {
583	–	COLR  cout;
584	–	setcolr(cout,   colval(r->rcol,RED),
585	–	colval(r->rcol,GRN),
586	–	colval(r->rcol,BLU));
587	–	putbinary(cout, sizeof(cout), 1, stdout);
588	–	return;
589	–	}
598		cval[0] = colval(r->rcol,RED);
599		cval[1] = colval(r->rcol,GRN);
600		cval[2] = colval(r->rcol,BLU);
#	Line 656 | Line 664 | oputN(                         /* print unperturbed normal */
664		RAY  *r
665		)
666		{
667	<	if (r->rot < FHUGE)
667	>	if (r->rot < FHUGE) {
668	>	rayreorient(r);
669		(*putreal)(r->ron, 3);
670	<	else
670	>	} else
671		(*putreal)(vdummy, 3);
672		}
673
#	Line 777 | Line 786 | puta(                          /* print ascii value(s) */
786
787
788		static void
789	<	putd(RREAL *v, int n)           /* print binary double(s) */
789	>	putd(RREAL *v, int n)           /* output binary double(s) */
790		{
791		#ifdef  SMLFLT
792		double  da[3];
#	Line 795 | Line 804 | putd(RREAL *v, int n)          /* print binary double(s) */
804
805
806		static void
807	<	putf(RREAL *v, int n)           /* print binary float(s) */
807	>	putf(RREAL *v, int n)           /* output binary float(s) */
808		{
809		#ifndef SMLFLT
810		float   fa[3];
#	Line 809 | Line 818 | putf(RREAL *v, int n)          /* print binary float(s) */
818		#else
819		putbinary(v, sizeof(RREAL), n, stdout);
820		#endif
821	+	}
822	+
823	+
824	+	static void
825	+	putrgbe(RREAL *v, int n)        /* output RGBE color */
826	+	{
827	+	COLR  cout;
828	+
829	+	if (n != 3)
830	+	error(INTERNAL, "putrgbe() not called with 3 components");
831	+	setcolr(cout, v[0], v[1], v[2]);
832	+	putbinary(cout, sizeof(cout), 1, stdout);
833		}

Diff Legend

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