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.28 by greg, Fri Feb 24 18:25:36 2023 UTC vs.
Revision 2.37 by greg, Sun Oct 27 00:01:21 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	<	"ValueContribution\nImmediateIrradiance\n" \
58	>	"ImmediateIrradiance\n" \
59		"ProgressReporting\nDistanceLimiting\n" \
60	<	"Outputs=V,W\n"
60	>	"InputFormats=a,f,d\nOutputFormats=a,f,d,c\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	<	"ValueContribution\nImmediateIrradiance\n" \
66	>	"ImmediateIrradiance\n" \
67		"ProgressReporting\nDistanceLimiting\n" \
68	<	"Outputs=V,W\n"
68	>	"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
69	>	"Outputs=V,W\n" \
70	>	"OutputCS=RGB,spec\n"
71		#endif
72
73		static void
#	Line 80 | Line 84 | printdefaults(void)                    /* print default values to stdou
84		printf("-y %-9d\t\t\t# y resolution\n", yres);
85		printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
86		"-ld-\t\t\t\t# limit distance off\n");
87	<	printf("-h%c\t\t\t\t# %s header\n", header ? '+' : '-',
88	<	header ? "output" : "no");
87	>	printf(header ? "-h+\t\t\t\t# output header\n" :
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 199 | Line 205 | main(int argc, char *argv[])
205		strcat(RFeatureList, RCONTRIB_FEATURES);
206		if (argc > 1 && !strcmp(argv[1], "-features"))
207		return feature_status(argc-2, argv+2);
202	–	#if defined(_WIN32) || defined(_WIN64)
203	–
208		#if defined(_WIN32) || defined(_WIN64)  /* increase file limit to maximum */
209		for (i = 8192; i > _IOB_ENTRIES; i >>= 1)
210	<	if (_setmaxstdio(i) == 0)
210	>	if (_setmaxstdio(i) == i)
211		break;
212		#endif
213		/* initialize calcomp routines early */
#	Line 287 | Line 291 | main(int argc, char *argv[])
291		check(2,"s");
292		curout = argv[++i];
293		break;
290	–	case 'c':                       /* input rays per output */
291	–	check(2,"i");
292	–	accumulate = atoi(argv[++i]);
293	–	break;
294		case 'r':                       /* recover output */
295		check_bool(2,recover);
296		break;
#	Line 301 | Line 301 | main(int argc, char *argv[])
301		check(2,"s");
302		set_eparams(prms = argv[++i]);
303		break;
304	+	case 'c':                       /* sample count */
305	+	check(2,"i");
306	+	accumulate = atoi(argv[++i]);
307	+	break;
308		case 'b':                       /* bin expression/count */
309		if (argv[i][2] == 'n') {
310		check(3,"s");
#	Line 330 | Line 334 | main(int argc, char *argv[])
334		error(USER, "missing required modifier argument");
335		/* override some option settings */
336		override_options();
337	+	/* set/check spectral sampling */
338	+	if (setspectrsamp(CNDX, WLPART) < 0)
339	+	error(USER, "unsupported spectral sampling");
340		/* initialize object types */
341		initotypes();
342		/* initialize urand */
#	Line 383 | Line 390 | main(int argc, char *argv[])
390		setambient();                   /* initialize ambient calculation */
391
392		rcontrib();                     /* trace ray contributions (loop) */
386	–
387	–	ambsync();                      /* flush ambient file */
393
394		/* PMAP: free photon maps */
395		ray_done_pmap();

Diff Legend

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