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.79 by greg, Mon May 6 16:49:38 2019 UTC vs.
Revision 2.80 by greg, Thu Jul 4 01:06:35 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 146 | Line 146 | rtrace(                                /* trace rays from file */
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("vVWrx", outvals[0])))
150	>	error(USER, "color format only with one of 'vVWrx'");
151	>	putreal = putrgbe; break;
152		default:
153		error(CONSISTENCY, "botched output format");
154		}
#	Line 301 | 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 316 | Line 316 | setoutput(                             /* set up output tables */
316		break;
317		}
318		*table = NULL;
319	+	if (do_irrad | imm_irrad)                       /* compatibile? */
320	+	for (table = ray_out; *table != NULL; table++)
321	+	if ((*table == oputr) | (*table == oputR) |
322	+	(*table == oputx) | (*table == oputX)) {
323	+	error(WARNING, "-orRxX options incompatible with -I+ and -i+");
324	+	break;
325	+	}
326		}
327
328
#	Line 586 | Line 593 | oputv(                         /* print value */
593		{
594		RREAL   cval[3];
595
589	–	if (outform == 'c') {
590	–	COLR  cout;
591	–	setcolr(cout,   colval(r->rcol,RED),
592	–	colval(r->rcol,GRN),
593	–	colval(r->rcol,BLU));
594	–	putbinary(cout, sizeof(cout), 1, stdout);
595	–	return;
596	–	}
596		cval[0] = colval(r->rcol,RED);
597		cval[1] = colval(r->rcol,GRN);
598		cval[2] = colval(r->rcol,BLU);
#	Line 784 | Line 783 | puta(                          /* print ascii value(s) */
783
784
785		static void
786	<	putd(RREAL *v, int n)           /* print binary double(s) */
786	>	putd(RREAL *v, int n)           /* output binary double(s) */
787		{
788		#ifdef  SMLFLT
789		double  da[3];
#	Line 802 | Line 801 | putd(RREAL *v, int n)          /* print binary double(s) */
801
802
803		static void
804	<	putf(RREAL *v, int n)           /* print binary float(s) */
804	>	putf(RREAL *v, int n)           /* output binary float(s) */
805		{
806		#ifndef SMLFLT
807		float   fa[3];
#	Line 816 | Line 815 | putf(RREAL *v, int n)          /* print binary float(s) */
815		#else
816		putbinary(v, sizeof(RREAL), n, stdout);
817		#endif
818	+	}
819	+
820	+
821	+	static void
822	+	putrgbe(RREAL *v, int n)        /* output RGBE color */
823	+	{
824	+	COLR  cout;
825	+
826	+	if (n != 3)
827	+	error(INTERNAL, "putrgbe() not called with 3 components");
828	+	setcolr(cout, v[0], v[1], v[2]);
829	+	putbinary(cout, sizeof(cout), 1, stdout);
830		}

Diff Legend

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