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.106 by greg, Mon Feb 6 22:40:21 2023 UTC vs.
Revision 2.107 by greg, Wed Nov 15 18:02:53 2023 UTC

#	Line 47 | Line 47 | extern int  vresolu;                   /* vertical resolution */
47
48		extern int  castonly;                   /* only doing ray-casting? */
49
50	+	extern double  (*sens_curve)(SCOLOR scol);      /* spectral conversion for 1-channel */
51	+	extern double  out_scalefactor;         /* output calibration scale factor */
52	+	extern RGBPRIMP  out_prims;             /* output color primitives (NULL if spectral) */
53	+
54		#ifndef  MAXTSET
55		#define  MAXTSET        8191            /* maximum number in trace set */
56		#endif
#	Line 63 | Line 67 | static int     inp_qpos = 0;           /* next ray to return */
67		static int      inp_qend = 0;           /* number of rays in this work group */
68
69		typedef void putf_t(RREAL *v, int n);
70	<	static putf_t puta, putd, putf, putrgbe;
70	>	static putf_t puta, putd, putf;
71
72		typedef void oputf_t(RAY *r);
73		static oputf_t  oputo, oputd, oputv, oputV, oputl, oputL, oputc, oputp,
#	Line 83 | Line 87 | static double nextray(FVECT org, FVECT dir);
87		static void tabin(RAY *r);
88		static void ourtrace(RAY *r);
89
90	+	static void  putscolor(const COLORV *scol);
91	+
92		static oputf_t *ray_out[32], *every_out[32];
93		static putf_t *putreal;
94
#	Line 115 | Line 121 | formstr(                               /* return format identifier */
121		case 'a': return("ascii");
122		case 'f': return("float");
123		case 'd': return("double");
124	<	case 'c': return(COLRFMT);
124	>	case 'c':
125	>	if (out_prims == NULL)
126	>	return(SPECFMT);
127	>	if (out_prims == xyzprims)
128	>	return(CIEFMT);
129	>	return(COLRFMT);
130		}
131		return("unknown");
132		}
#	Line 228 | Line 239 | setrtoutput(void)                      /* set up output tables, return #c
239		{
240		char  *vs = outvals;
241		oputf_t **table = ray_out;
242	+	const int       nco = (sens_curve != NULL) ? 1 :
243	+	(out_prims != NULL) ? 3 : NCSAMP;
244		int  ncomp = 0;
245
246		if (!*vs)
#	Line 240 | Line 253 | setrtoutput(void)                      /* set up output tables, return #c
253		case 'c':
254		if (outvals[1] || !strchr("vrx", outvals[0]))
255		error(USER, "color format only with -ov, -or, -ox");
256	<	putreal = putrgbe; break;
256	>	break;
257		default:
258		error(CONSISTENCY, "botched output format");
259		}
#	Line 266 | Line 279 | setrtoutput(void)                      /* set up output tables, return #c
279		break;
280		case 'r':                               /* reflected contrib. */
281		*table++ = oputr;
282	<	ncomp += 3;
282	>	ncomp += nco;
283		castonly = 0;
284		break;
285		case 'R':                               /* reflected distance */
#	Line 276 | Line 289 | setrtoutput(void)                      /* set up output tables, return #c
289		break;
290		case 'x':                               /* xmit contrib. */
291		*table++ = oputx;
292	<	ncomp += 3;
292	>	ncomp += nco;
293		castonly = 0;
294		break;
295		case 'X':                               /* xmit distance */
#	Line 286 | Line 299 | setrtoutput(void)                      /* set up output tables, return #c
299		break;
300		case 'v':                               /* value */
301		*table++ = oputv;
302	<	ncomp += 3;
302	>	ncomp += nco;
303		castonly = 0;
304		break;
305		case 'V':                               /* contribution */
306		*table++ = oputV;
307	<	ncomp += 3;
307	>	ncomp += nco;
308		castonly = 0;
309		if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0))
310		error(WARNING,
#	Line 333 | Line 346 | setrtoutput(void)                      /* set up output tables, return #c
346		break;
347		case 'W':                               /* coefficient */
348		*table++ = oputW;
349	<	ncomp += 3;
349	>	ncomp += nco;
350		castonly = 0;
351		if (ambounce > 0 && (ambacc > FTINY) | (ambssamp > 0))
352		error(WARNING,
#	Line 693 | Line 706 | oputx(                         /* print unmirrored contribution */
706		RAY  *r
707		)
708		{
709	<	RREAL   cval[3];
709	>	SCOLOR  cdiff;
710
711	<	cval[0] = colval(r->rcol,RED) - colval(r->mcol,RED);
712	<	cval[1] = colval(r->rcol,GRN) - colval(r->mcol,GRN);
713	<	cval[2] = colval(r->rcol,BLU) - colval(r->mcol,BLU);
714	<	(*putreal)(cval, 3);
711	>	copyscolor(cdiff, r->rcol);
712	>	sopscolor(cdiff, -=, r->mcol);
713	>
714	>	putscolor(cdiff);
715		}
716
717
#	Line 716 | Line 729 | oputv(                         /* print value */
729		RAY  *r
730		)
731		{
732	<	RREAL   cval[3];
720	<
721	<	cval[0] = colval(r->rcol,RED);
722	<	cval[1] = colval(r->rcol,GRN);
723	<	cval[2] = colval(r->rcol,BLU);
724	<	(*putreal)(cval, 3);
732	>	putscolor(r->rcol);
733		}
734
735
#	Line 730 | Line 738 | oputV(                         /* print value contribution */
738		RAY *r
739		)
740		{
741	<	RREAL   contr[3];
741	>	SCOLOR  contr;
742
743		raycontrib(contr, r, PRIMARY);
744	<	multcolor(contr, r->rcol);
745	<	(*putreal)(contr, 3);
744	>	smultscolor(contr, r->rcol);
745	>	putscolor(contr);
746		}
747
748
#	Line 844 | Line 852 | oputW(                         /* print coefficient */
852		RAY  *r
853		)
854		{
855	<	RREAL   contr[3];
855	>	SCOLOR  contr;
856		/* shadow ray not on source? */
857		if (r->rsrc >= 0 && source[r->rsrc].so != r->ro)
858	<	setcolor(contr, 0.0, 0.0, 0.0);
858	>	scolorblack(contr);
859		else
860		raycontrib(contr, r, PRIMARY);
861
862	<	(*putreal)(contr, 3);
862	>	putscolor(contr);
863		}
864
865
#	Line 949 | Line 957 | putf(RREAL *v, int n)          /* output binary float(s) */
957
958
959		static void
960	<	putrgbe(RREAL *v, int n)        /* output RGBE color */
960	>	putscolor(const COLORV *scol)           /* output (spectral) color */
961		{
962	<	COLR  cout;
963	<
964	<	if (n != 3)
965	<	error(INTERNAL, "putrgbe() not called with 3 components");
966	<	setcolr(cout, v[0], v[1], v[2]);
967	<	putbinary(cout, sizeof(cout), 1, stdout);
962	>	static COLORMAT xyz2myrgbmat;
963	>	SCOLOR          my_scol;
964	>	COLOR           col;
965	>	/* apply scalefactor if any */
966	>	if (out_scalefactor != 1.) {
967	>	copyscolor(my_scol, scol);
968	>	scalescolor(my_scol, out_scalefactor);
969	>	scol = my_scol;
970	>	}
971	>	if (sens_curve != NULL) {       /* single channel output */
972	>	RREAL   v = (*sens_curve)(scol);
973	>	(*putreal)(&v, 1);
974	>	return;
975	>	}
976	>	if (out_prims == NULL) {        /* full spectral reporting */
977	>	if (outform == 'c') {
978	>	SCOLR   sclr;
979	>	scolor_scolr(sclr, scol);
980	>	putbinary(sclr, LSCOLR, 1, stdout);
981	>	} else if (sizeof(RREAL) != sizeof(COLORV)) {
982	>	RREAL   sreal[MAXCSAMP];
983	>	int     i = NCSAMP;
984	>	while (i--) sreal[i] = scol[i];
985	>	(*putreal)(sreal, NCSAMP);
986	>	} else
987	>	(*putreal)((RREAL *)scol, NCSAMP);
988	>	return;
989	>	}
990	>	if (out_prims == xyzprims) {
991	>	scolor_cie(col, scol);
992	>	} else if (out_prims == stdprims) {
993	>	scolor_rgb(col, scol);
994	>	} else {
995	>	COLOR   xyz;
996	>	if (xyz2myrgbmat[0][0] == 0)
997	>	compxyz2rgbWBmat(xyz2myrgbmat, out_prims);
998	>	scolor_cie(xyz, scol);
999	>	colortrans(col, xyz2myrgbmat, xyz);
1000	>	clipgamut(col, xyz[CIEY], CGAMUT_LOWER, cblack, cwhite);
1001	>	}
1002	>	if (outform == 'c') {
1003	>	COLR    clr;
1004	>	setcolr(clr, colval(col,RED), colval(col,GRN), colval(col,BLU));
1005	>	putbinary(clr, sizeof(COLR), 1, stdout);
1006	>	} else if (sizeof(RREAL) != sizeof(COLORV)) {
1007	>	RREAL   creal[3];
1008	>	copycolor(creal, col);
1009	>	(*putreal)(creal, 3);
1010	>	} else
1011	>	(*putreal)((RREAL *)col, 3);
1012		}

Diff Legend

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