ViewVC Help

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

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

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.47 by greg, Wed Nov 15 18:02:53 2023 UTC vs.
Revision 2.48 by greg, Fri Nov 17 20:02:07 2023 UTC

#	Line 73 | Line 73 | static void printdefaults(void);
73		#ifdef PERSIST
74		#define RTRACE_FEATURES "Persist\nParallelPersist\nMultiprocessing\n" \
75		"IrradianceCalc\nImmediateIrradiance\nDistanceLimiting\n" \
76	<	"Hyperspectral\nParticipatingMedia=Mist\n" \
76	>	"ParticipatingMedia=Mist\n" \
77		"HessianAmbientCache\nAmbientAveraging\n" \
78		"AmbientValueSharing\nAdaptiveShadowTesting\n" \
79		"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
80		"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
81		#else
82		#define RTRACE_FEATURES "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
83	<	"Hyperspectral\nParticipatingMedia=Mist\n" \
83	>	"ParticipatingMedia=Mist\n" \
84		"HessianAmbientCache\nAmbientAveraging\n" \
85		"AmbientValueSharing\nAdaptiveShadowTesting\n" \
86		"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
#	Line 310 | Line 310 | main(int  argc, char  *argv[])
310		}
311		break;
312		#if MAXCSAMP>3
313	<	case 'c':                               /* spectral sampling */
314	<	switch (argv[i][2]) {
315	<	case 's':                       /* spectral bin count */
316	<	check(3,"i");
317	<	NCSAMP = atoi(argv[++i]);
318	<	break;
319	<	case 'w':                       /* wavelength extrema */
320	<	check(3,"ff");
321	<	WLPART[0] = atof(argv[++i]);
322	<	WLPART[3] = atof(argv[++i]);
323	<	break;
324	<	case 'o':                       /* output spectral results */
325	<	rval = (out_prims == NULL);
326	<	check_bool(3,rval);
327	<	if (rval) out_prims = NULL;
328	<	else if (out_prims == NULL) out_prims = stdprims;
329	<	break;
330	<	default:
313	>	case 'c':                               /* output spectral results */
314	>	if (argv[i][2] != 'o')
315		goto badopt;
316	<	}
316	>	rval = (out_prims == NULL);
317	>	check_bool(3,rval);
318	>	if (rval) out_prims = NULL;
319	>	else if (out_prims == NULL) out_prims = stdprims;
320		break;
321		#endif
322		#ifdef  PERSIST
#	Line 615 | Line 602 | printdefaults(void)                    /* print default values to stdou
602		case '~': printf(" tilde"); break;
603		}
604		fputc('\n', stdout);
605	<	if (NCSAMP > 3) {
619	<	printf("-cs %-2d\t\t\t\t# number of spectral bins\n", NCSAMP);
620	<	printf("-cw %3.0f %3.0f\t\t\t# wavelength limits (nm)\n",
621	<	WLPART[3], WLPART[0]);
605	>	if (NCSAMP > 3)
606		printf(out_prims != NULL ? "-co-\t\t\t\t# output tristimulus colors\n" :
607		"-co+\t\t\t\t# output spectral values\n");
624	–	}
608		if (sens_curve == scolor_photopic)
609		printf("-pY\t\t\t\t# photopic output\n");
610		else if (sens_curve == scolor_scotopic)

Diff Legend

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