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.36 by greg, Wed Apr 6 15:28:18 2022 UTC vs.
Revision 2.46 by greg, Tue Aug 15 01:19:37 2023 UTC

#	Line 35 | Line 35 | char  *errfile = NULL;                 /* error output file */
35
36		int  nproc = 1;                         /* number of processes */
37
38	–	extern char  *formstr(int f);           /* string from format */
38		extern int  setrtoutput(void);          /* set output values */
39
40		int  inform = 'a';                      /* input format */
#	Line 66 | Line 65 | static void onsig(int  signo);
65		static void sigdie(int  signo, char  *msg);
66		static void printdefaults(void);
67
68	+	#ifdef PERSIST
69	+	#define RTRACE_FEATURES "Persist\nParallelPersist\nMultiprocessing\n" \
70	+	"IrradianceCalc\nImmediateIrradiance\nDistanceLimiting\n" \
71	+	"ParticipatingMedia=Mist\n" \
72	+	"HessianAmbientCache\nAmbientAveraging\n" \
73	+	"AmbientValueSharing\nAdaptiveShadowTesting\n" \
74	+	"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
75	+	"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
76	+	#else
77	+	#define RTRACE_FEATURES "IrradianceCalc\nIrradianceCalc\nDistanceLimiting\n" \
78	+	"ParticipatingMedia=Mist\n" \
79	+	"HessianAmbientCache\nAmbientAveraging\n" \
80	+	"AmbientValueSharing\nAdaptiveShadowTesting\n" \
81	+	"InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \
82	+	"Outputs=o,d,v,V,w,W,l,L,c,p,n,N,s,m,M,r,x,R,X,~\n"
83	+	#endif
84
85	+
86		int
87		main(int  argc, char  *argv[])
88		{
#	Line 89 | Line 105 | main(int  argc, char  *argv[])
105		int  i;
106		/* global program name */
107		progname = argv[0] = fixargv0(argv[0]);
108	+	/* feature check only? */
109	+	strcat(RFeatureList, RTRACE_FEATURES);
110	+	if (argc > 1 && !strcmp(argv[1], "-features"))
111	+	return feature_status(argc-2, argv+2);
112		/* add trace notify function */
113		for (i = 0; addobjnotify[i] != NULL; i++)
114		;
#	Line 311 | Line 331 | main(int  argc, char  *argv[])
331		if (outform != 'a')
332		SET_FILE_BINARY(stdout);
333		rval = setrtoutput();
334	<	readoct(octname = octnm, loadflags, &thescene, NULL);
334	>	octname = savqstr(octnm);
335	>	readoct(octname, loadflags, &thescene, NULL);
336		nsceneobjs = nobjects;
337
338		if (loadflags & IO_INFO) {      /* print header */
#	Line 399 | Line 420 | badopt:
420
421		void
422		wputs(                          /* warning output function */
423	<	char    *s
423	>	const char      *s
424		)
425		{
426		int  lasterrno = errno;
#	Line 410 | Line 431 | wputs(                         /* warning output function */
431
432		void
433		eputs(                          /* put string to stderr */
434	<	register char  *s
434	>	const char  *s
435		)
436		{
437		static int  midline = 0;
#	Line 465 | Line 486 | sigdie(                        /* set fatal signal */
486		static void
487		printdefaults(void)                     /* print default values to stdout */
488		{
489	<	register char  *cp;
489	>	char  *cp;
490
491		if (imm_irrad)
492		printf("-I+\t\t\t\t# immediate irradiance on\n");
#	Line 501 | Line 522 | printdefaults(void)                    /* print default values to stdou
522		case 'W': printf(" coefficient"); break;
523		case 'm': printf(" modifier"); break;
524		case 'M': printf(" material"); break;
525	<	case '-': printf(" stroke"); break;
525	>	case '~': printf(" tilde"); break;
526		}
527		putchar('\n');
528		printf(erract[WARNING].pf != NULL ?

Diff Legend

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