ViewVC Help

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

root/Development/ray/src/rt/rxtmain.cpp

Comparing ray/src/rt/rxtmain.cpp (file contents):
Revision 2.6 by greg, Sat Aug 3 21:33:15 2024 UTC vs.
Revision 2.12 by greg, Wed Mar 5 18:56:28 2025 UTC

#	Line 2 | Line 2
2		static const char       RCSid[] = "$Id$";
3		#endif
4		/*
5	<	*  rxtmain.c - main for per-ray calculation program
5	>	*  rxtmain.cpp - main for per-ray calculation program
6		*/
7
8		#include "copyright.h"
#	Line 43 | Line 43 | extern void  tranotify(OBJECT obj);
43		char  *tralist[MAXMODLIST];             /* list of modifers to trace (or no) */
44		int  traincl = -1;                      /* include == 1, exclude == 0 */
45
46	<	double  (*sens_curve)(SCOLOR scol) = NULL;      /* spectral conversion for 1-channel */
46	>	double  (*sens_curve)(const SCOLOR scol) = NULL;        /* spectral conversion for 1-channel */
47		double  out_scalefactor = 1;            /* output calibration scale factor */
48		RGBPRIMP  out_prims = stdprims;         /* output color primitives (NULL if spectral) */
49		static RGBPRIMS  our_prims;             /* private output color primitives */
#	Line 52 | Line 52 | static void onsig(int  signo);
52		static void sigdie(int  signo, const char  *msg);
53		static void printdefaults(void);
54
55	<	#define RXTRACE_FEATURES        "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
55	>	#define RXTRACE_FEATURES        "IrradianceCalc\nMultiprocessing\nDistanceLimiting\n" \
56		"HessianAmbientCache\nAmbientAveraging\n" \
57		"AmbientValueSharing\nAdaptiveShadowTesting\n" \
58		"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \
#	Line 142 | Line 142 | main(int  argc, char  *argv[])
142		break;
143		case 'I':                               /* immed. irradiance */
144		rval = myRTmanager.rtFlags & RTimmIrrad;
145	<	check_bool(3,rval);
145	>	check_bool(2,rval);
146		if (rval) myRTmanager.rtFlags |= RTimmIrrad;
147		else myRTmanager.rtFlags &= ~RTimmIrrad;
148		break;
#	Line 303 | Line 303 | main(int  argc, char  *argv[])
303		rval = setspectrsamp(CNDX, WLPART);
304		if (rval < 0)
305		error(USER, "unsupported spectral sampling");
306	<	if (out_prims != NULL) {
306	>	if (sens_curve != NULL)
307	>	out_prims = NULL;
308	>	else if (out_prims != NULL) {
309		if (!rval)
310		error(WARNING, "spectral range incompatible with color output");
311		} else if (NCSAMP == 3)
#	Line 352 | Line 354 | main(int  argc, char  *argv[])
354		SET_FILE_BINARY(stdout);
355		if (doheader) {                 /* print header? */
356		newheader("RADIANCE", stdout);
357	<	fputs(myRTmanager.GetHeader(), stdout);
357	>	fputs(myRTmanager.GetHeadStr(), stdout);
358		printargs(i, argv, stdout);
359		printf("SOFTWARE= %s\n", VersionID);
360		fputnow(stdout);
361		if (rval > 0)           /* saved from setrtoutput() call */
362	<	printf("NCOMP=%d\n", rval);
362	>	fputncomp(rval, stdout);
363	>	if (NCSAMP > 3)
364	>	fputwlsplit(WLPART, stdout);
365	>	if ((out_prims != stdprims) & (out_prims != NULL))
366	>	fputprims(out_prims, stdout);
367		if ((outform == 'f') | (outform == 'd'))
368		fputendian(stdout);
369		fputformat(formstr(outform), stdout);
#	Line 387 | Line 393 | wputs(                         /* warning output function */
393
394		void
395		eputs(                          /* put string to stderr */
396	<	char  *s
396	>	const char  *s
397		)
398		{
399		static int  midline = 0;

Diff Legend

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