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.25 by greg, Thu Apr 23 20:29:14 2015 UTC vs.
Revision 2.29 by greg, Thu Apr 18 23:58:22 2019 UTC

#	Line 69 | Line 69 | main(int  argc, char  *argv[])
69		#define  check(ol,al)           if (argv[i][ol] || \
70		badarg(argc-i-1,argv+i+1,al)) \
71		goto badopt
72	<	#define  bool(olen,var)         switch (argv[i][olen]) { \
72	>	#define  check_bool(olen,var)           switch (argv[i][olen]) { \
73		case '\0': var = !var; break; \
74		case 'y': case 'Y': case 't': case 'T': \
75		case '+': case '1': var = 1; break; \
#	Line 89 | Line 89 | main(int  argc, char  *argv[])
89		for (i = 0; addobjnotify[i] != NULL; i++)
90		;
91		addobjnotify[i] = tranotify;
92	–	/* set our defaults */
93	–	rand_samp = 1;
94	–	maxdepth = -10;
95	–	minweight = 2e-3;
92		/* option city */
93		for (i = 1; i < argc; i++) {
94		/* expand arguments */
#	Line 135 | Line 131 | main(int  argc, char  *argv[])
131		break;
132		case 'w':                               /* warnings */
133		rval = erract[WARNING].pf != NULL;
134	<	bool(2,rval);
134	>	check_bool(2,rval);
135		if (rval) erract[WARNING].pf = wputs;
136		else erract[WARNING].pf = NULL;
137		break;
#	Line 146 | Line 142 | main(int  argc, char  *argv[])
142		case 'l':                               /* limit distance */
143		if (argv[i][2] != 'd')
144		goto badopt;
145	<	bool(3,lim_dist);
145	>	check_bool(3,lim_dist);
146		break;
147		case 'I':                               /* immed. irradiance */
148	<	bool(2,imm_irrad);
148	>	check_bool(2,imm_irrad);
149		break;
150		case 'f':                               /* format i/o */
151		switch (argv[i][2]) {
#	Line 181 | Line 177 | main(int  argc, char  *argv[])
177		break;
178		case 'h':                               /* header output */
179		rval = loadflags & IO_INFO;
180	<	bool(2,rval);
180	>	check_bool(2,rval);
181		loadflags = rval ? loadflags | IO_INFO :
182		loadflags & ~IO_INFO;
183		break;
#	Line 195 | Line 191 | main(int  argc, char  *argv[])
191		tralp = tralist;
192		}
193		if (argv[i][2] == 'I') {        /* file */
194	<	rval = wordfile(tralp,
194	>	rval = wordfile(tralp, MAXMODLIST-(tralp-tralist),
195		getpath(argv[++i],getrlibpath(),R_OK));
196		if (rval < 0) {
197		sprintf(errmsg,
#	Line 217 | Line 213 | main(int  argc, char  *argv[])
213		tralp = tralist;
214		}
215		if (argv[i][2] == 'E') {        /* file */
216	<	rval = wordfile(tralp,
216	>	rval = wordfile(tralp, MAXMODLIST-(tralp-tralist),
217		getpath(argv[++i],getrlibpath(),R_OK));
218		if (rval < 0) {
219		sprintf(errmsg,
#	Line 389 | Line 385 | badopt:
385		return 1; /* pro forma return */
386
387		#undef  check
388	<	#undef  bool
388	>	#undef  check_bool
389		}
390
391
#	Line 481 | Line 477 | printdefaults(void)                    /* print default values to stdou
477		case 't': case 'T': printf(" trace"); break;
478		case 'o': printf(" origin"); break;
479		case 'd': printf(" direction"); break;
480	+	case 'r': printf(" reflect_contrib"); break;
481	+	case 'R': printf(" reflect_length"); break;
482	+	case 'x': printf(" unreflect_contrib"); break;
483	+	case 'X': printf(" unreflect_length"); break;
484		case 'v': printf(" value"); break;
485		case 'V': printf(" contribution"); break;
486		case 'l': printf(" length"); break;

Diff Legend

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