ViewVC Help

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

root/Development/ray/src/rt/rcmain.c

Comparing ray/src/rt/rcmain.c (file contents):
Revision 2.32 by greg, Wed Nov 15 18:02:53 2023 UTC vs.
Revision 2.38 by greg, Wed Oct 30 02:22:23 2024 UTC

#	Line 55 | Line 55 | char   RCCONTEXT[] = "RC.";            /* our special evaluation c
55
56		#if defined(_WIN32) || defined(_WIN64)
57		#define RCONTRIB_FEATURES       "Accumulation\nSummation\nRecovery\n" \
58	<	"Hyperspectral\nImmediateIrradiance\n" \
58	>	"ImmediateIrradiance\n" \
59		"ProgressReporting\nDistanceLimiting\n" \
60		"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
61	<	"Outputs=V,W\n"
61	>	"Outputs=V,W\n" \
62	>	"OutputCS=RGB,spec\n"
63		#else
64		#define RCONTRIB_FEATURES       "Multiprocessing\n" \
65		"Accumulation\nSummation\nRecovery\n" \
66	<	"Hyperspectral\nImmediateIrradiance\n" \
66	>	"ImmediateIrradiance\n" \
67		"ProgressReporting\nDistanceLimiting\n" \
68		"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
69	<	"Outputs=V,W\n"
69	>	"Outputs=V,W\n" \
70	>	"OutputCS=RGB,spec\n"
71		#endif
72
73		static void
74		printdefaults(void)                     /* print default values to stdout */
75		{
76		printf("-c %-5d\t\t\t# accumulated rays per record\n", accumulate);
75	–	if (NCSAMP > 3) {
76	–	printf("-cs %-2d\t\t\t\t# number of spectral bins\n", NCSAMP);
77	–	printf("-cw %3.0f %3.0f\t\t\t# wavelength limits (nm)\n",
78	–	WLPART[3], WLPART[0]);
79	–	}
77		printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-',
78		contrib ? "contributions" : "coefficients");
79		if (imm_irrad)
#	Line 91 | Line 88 | printdefaults(void)                    /* print default values to stdou
88		"-h-\t\t\t\t# no header\n");
89		printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n",
90		inpfmt, outfmt, formstr(inpfmt), formstr(outfmt));
91	+	if (report_intvl > 0)
92	+	printf("-t %-9d\t\t\t#  time between reports\n", report_intvl);
93		printf(erract[WARNING].pf != NULL ?
94		"-w+\t\t\t\t# warning messages on\n" :
95		"-w-\t\t\t\t# warning messages off\n");
#	Line 214 | Line 213 | main(int argc, char *argv[])
213		/* initialize calcomp routines early */
214		initfunc();
215		calcontext(RCCONTEXT);
216	+	esupport &= ~E_REDEFW;          /* temporary */
217		/* option city */
218		for (i = 1; i < argc; i++) {
219		/* expand arguments */
#	Line 302 | Line 302 | main(int argc, char *argv[])
302		check(2,"s");
303		set_eparams(prms = argv[++i]);
304		break;
305	<	case 'c':                               /* spectral sampling or count */
306	<	switch (argv[i][2]) {
307	<	#if MAXCSAMP>3
308	<	case 's':                       /* spectral bin count */
309	<	check(3,"i");
310	<	NCSAMP = atoi(argv[++i]);
311	<	break;
312	<	case 'w':                       /* wavelength extrema */
313	<	check(3,"ff");
314	<	WLPART[0] = atof(argv[++i]);
315	<	WLPART[3] = atof(argv[++i]);
316	<	break;
317	<	#endif
318	<	case '\0':                      /* sample count */
319	<	check(2,"i");
320	<	accumulate = atoi(argv[++i]);
321	<	break;
322	<	default:
323	<	goto badopt;
324	<	}
305	>	case 'c':                       /* sample count */
306	>	check(2,"i");
307	>	accumulate = atoi(argv[++i]);
308		break;
309		case 'b':                       /* bin expression/count */
310		if (argv[i][2] == 'n') {
#	Line 350 | Line 333 | main(int argc, char *argv[])
333		}
334		if (nmods <= 0)
335		error(USER, "missing required modifier argument");
336	+	esupport |= E_REDEFW;
337		/* override some option settings */
338		override_options();
339	+	/* set/check spectral sampling */
340	+	if (setspectrsamp(CNDX, WLPART) < 0)
341	+	error(USER, "unsupported spectral sampling");
342		/* initialize object types */
343		initotypes();
344		/* initialize urand */
#	Line 406 | Line 393 | main(int argc, char *argv[])
393
394		rcontrib();                     /* trace ray contributions (loop) */
395
409	–	ambsync();                      /* flush ambient file */
410	–
396		/* PMAP: free photon maps */
397		ray_done_pmap();
398
#	Line 432 | Line 417 | wputs(                         /* warning output function */
417		)
418		{
419		int  lasterrno = errno;
420	+	if (erract[WARNING].pf == NULL)
421	+	return;         /* called by calcomp or someone */
422		eputs(s);
423		errno = lasterrno;
424		}

Diff Legend

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