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.2 by greg, Tue Mar 12 16:54:51 2024 UTC vs.
Revision 2.15 by greg, Sun Aug 3 18:20:44 2025 UTC

#	Line 2 | Line 2
2		static const char       RCSid[] = "$Id$";
3		#endif
4		/*
5	<	*  rtmain.c - main for rtrace per-ray calculation program
5	>	*  rxtmain.cpp - main for per-ray calculation program
6		*/
7
8		#include "copyright.h"
#	Line 12 | Line 12 | static const char      RCSid[] = "$Id$";
12		#include  "rtprocess.h" /* getpid() */
13		#include  "platform.h"
14		#include  "RtraceSimulManager.h"
15	+	#include  "func.h"
16
16	–	extern char     *progname;              /* global argv[0] */
17	–
17		static const char  *sigerr[NSIG];       /* signal error messages */
18		char  *errfile = NULL;                  /* error output file */
19
#	Line 43 | Line 42 | extern void  tranotify(OBJECT obj);
42		char  *tralist[MAXMODLIST];             /* list of modifers to trace (or no) */
43		int  traincl = -1;                      /* include == 1, exclude == 0 */
44
45	+	double  (*sens_curve)(const SCOLOR scol) = NULL;        /* spectral conversion for 1-channel */
46	+	double  out_scalefactor = 1;            /* output calibration scale factor */
47	+	RGBPRIMP  out_prims = stdprims;         /* output color primitives (NULL if spectral) */
48	+	static RGBPRIMS  our_prims;             /* private output color primitives */
49	+
50		static void onsig(int  signo);
51		static void sigdie(int  signo, const char  *msg);
52		static void printdefaults(void);
53
54	<	#define RATRACE_FEATURES        "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
55	<	"HessianAmbientCache\nAmbientAveraging\n" \
56	<	"AmbientValueSharing\nAdaptiveShadowTesting\n" \
57	<	"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
54	>	#define RXTRACE_FEATURES        "IrradianceCalc\nMultiprocessing\nDistanceLimiting\n" \
55	>	"HessianAmbientCache\nAmbientAveraging\n" \
56	>	"AmbientValueSharing\nAdaptiveShadowTesting\n" \
57	>	"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
58	>	"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n" \
59	>	"OutputCS=RGB,XYZ,Y,S,M,prims,spec\n"
60
61		int
62		main(int  argc, char  *argv[])
#	Line 69 | Line 75 | main(int  argc, char  *argv[])
75		int  rval;
76		int  i;
77		/* global program name */
78	<	progname = argv[0] = fixargv0(argv[0]);
78	>	progname = argv[0];
79		/* feature check only? */
80	<	strcat(RFeatureList, RATRACE_FEATURES);
80	>	strcat(RFeatureList, RXTRACE_FEATURES);
81		if (argc > 1 && !strcmp(argv[1], "-features"))
82		return feature_status(argc-2, argv+2);
83	+	/* initialize calcomp routines */
84	+	initfunc();
85		/* add trace notify function */
86		for (i = 0; addobjnotify[i] != NULL; i++)
87		;
#	Line 136 | Line 144 | main(int  argc, char  *argv[])
144		break;
145		case 'I':                               /* immed. irradiance */
146		rval = myRTmanager.rtFlags & RTimmIrrad;
147	<	check_bool(3,rval);
147	>	check_bool(2,rval);
148		if (rval) myRTmanager.rtFlags |= RTimmIrrad;
149		else myRTmanager.rtFlags &= ~RTimmIrrad;
150		break;
#	Line 221 | Line 229 | main(int  argc, char  *argv[])
229		goto badopt;
230		}
231		break;
232	+	case 'p':                               /* value output */
233	+	switch (argv[i][2]) {
234	+	case 'R':                       /* standard RGB output */
235	+	if (strcmp(argv[i]+2, "RGB"))
236	+	goto badopt;
237	+	out_prims = stdprims;
238	+	out_scalefactor = 1;
239	+	sens_curve = NULL;
240	+	break;
241	+	case 'X':                       /* XYZ output */
242	+	if (strcmp(argv[i]+2, "XYZ"))
243	+	goto badopt;
244	+	out_prims = xyzprims;
245	+	out_scalefactor = WHTEFFICACY;
246	+	sens_curve = NULL;
247	+	break;
248	+	case 'c': {
249	+	int     j;
250	+	check(3,"ffffffff");
251	+	rval = 0;
252	+	for (j = 0; j < 8; j++) {
253	+	our_prims[0][j] = atof(argv[++i]);
254	+	rval |= fabs(our_prims[0][j]-stdprims[0][j]) > .001;
255	+	}
256	+	if (rval) {
257	+	if (!colorprimsOK(our_prims))
258	+	error(USER, "illegal primary chromaticities");
259	+	out_prims = our_prims;
260	+	} else
261	+	out_prims = stdprims;
262	+	out_scalefactor = 1;
263	+	sens_curve = NULL;
264	+	} break;
265	+	case 'Y':                       /* photopic response */
266	+	if (argv[i][3])
267	+	goto badopt;
268	+	sens_curve = scolor_photopic;
269	+	out_scalefactor = WHTEFFICACY;
270	+	break;
271	+	case 'S':                       /* scotopic response */
272	+	if (argv[i][3])
273	+	goto badopt;
274	+	sens_curve = scolor_scotopic;
275	+	out_scalefactor = WHTSCOTOPIC;
276	+	break;
277	+	case 'M':                       /* melanopic response */
278	+	if (argv[i][3])
279	+	goto badopt;
280	+	sens_curve = scolor_melanopic;
281	+	out_scalefactor = WHTMELANOPIC;
282	+	break;
283	+	default:
284	+	goto badopt;
285	+	}
286	+	break;
287	+	#if MAXCSAMP>3
288	+	case 'c':                               /* output spectral results */
289	+	if (argv[i][2] != 'o')
290	+	goto badopt;
291	+	rval = (out_prims == NULL) & (sens_curve == NULL);
292	+	check_bool(3,rval);
293	+	if (rval) {
294	+	out_prims = NULL;
295	+	sens_curve = NULL;
296	+	} else if (out_prims == NULL)
297	+	out_prims = stdprims;
298	+	break;
299	+	#endif
300		default:
301		goto badopt;
302		}
303		}
304	+	/* set/check spectral sampling */
305	+	rval = setspectrsamp(CNDX, WLPART);
306	+	if (rval < 0)
307	+	error(USER, "unsupported spectral sampling");
308	+	if (sens_curve != NULL)
309	+	out_prims = NULL;
310	+	else if (out_prims != NULL) {
311	+	if (!rval)
312	+	error(WARNING, "spectral range incompatible with color output");
313	+	} else if (NCSAMP == 3)
314	+	out_prims = stdprims;   /* 3 samples do not a spectrum make */
315		/* set up signal handling */
316		sigdie(SIGINT, "Interrupt");
317		#ifdef SIGHUP
#	Line 268 | Line 355 | main(int  argc, char  *argv[])
355		if (outform != 'a')
356		SET_FILE_BINARY(stdout);
357		if (doheader) {                 /* print header? */
358	<	static char     fmt[] = OCTFMT;
359	<	FILE *          octfp = fopen(argv[i], "rb");
273	<	if (checkheader(octfp, fmt, stdout) < 0)
274	<	error(USER, "bad octree header");
275	<	fclose(octfp);
358	>	newheader("RADIANCE", stdout);
359	>	fputs(myRTmanager.GetHeadStr(), stdout);
360		printargs(i, argv, stdout);
361		printf("SOFTWARE= %s\n", VersionID);
362		fputnow(stdout);
363		if (rval > 0)           /* saved from setrtoutput() call */
364	<	printf("NCOMP=%d\n", rval);
364	>	fputncomp(rval, stdout);
365	>	if (NCSAMP > 3)
366	>	fputwlsplit(WLPART, stdout);
367	>	if ((out_prims != stdprims) & (out_prims != NULL))
368	>	fputprims(out_prims, stdout);
369		if ((outform == 'f') | (outform == 'd'))
370		fputendian(stdout);
371		fputformat(formstr(outform), stdout);
372	<	putchar('\n');
372	>	fputc('\n', stdout);    /* end of header */
373		}
374		rtrace(NULL, nproc);            /* trace rays */
375		quit(0);                        /* clean up & exit */
#	Line 307 | Line 395 | wputs(                         /* warning output function */
395
396		void
397		eputs(                          /* put string to stderr */
398	<	char  *s
398	>	const char  *s
399		)
400		{
401		static int  midline = 0;
#	Line 398 | Line 486 | printdefaults(void)                    /* print default values to stdou
486		case '~': printf(" tilde"); break;
487		}
488		putchar('\n');
489	+	if (sens_curve == scolor_photopic)
490	+	printf("-pY\t\t\t\t# photopic output\n");
491	+	else if (sens_curve == scolor_scotopic)
492	+	printf("-pS\t\t\t\t# scotopic output\n");
493	+	else if (sens_curve == scolor_melanopic)
494	+	printf("-pM\t\t\t\t# melanopic output\n");
495	+	else if (out_prims == stdprims)
496	+	printf("-pRGB\t\t\t\t# standard RGB color output\n");
497	+	else if (out_prims == xyzprims)
498	+	printf("-pXYZ\t\t\t\t# CIE XYZ color output\n");
499	+	else if (out_prims != NULL)
500	+	printf("-pc %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f\t# output color primaries and white point\n",
501	+	out_prims[RED][0], out_prims[RED][1],
502	+	out_prims[GRN][0], out_prims[GRN][1],
503	+	out_prims[BLU][0], out_prims[BLU][1],
504	+	out_prims[WHT][0], out_prims[WHT][1]);
505	+	if ((sens_curve == NULL) & (NCSAMP > 3))
506	+	printf(out_prims != NULL ? "-co-\t\t\t\t# output tristimulus colors\n" :
507	+	"-co+\t\t\t\t# output spectral values\n");
508		printf(erract[WARNING].pf != NULL ?
509		"-w+\t\t\t\t# warning messages on\n" :
510		"-w-\t\t\t\t# warning messages off\n");

Diff Legend

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