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.28 by greg, Tue Nov 13 19:58:33 2018 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 135 | Line 135 | main(int  argc, char  *argv[])
135		break;
136		case 'w':                               /* warnings */
137		rval = erract[WARNING].pf != NULL;
138	<	bool(2,rval);
138	>	check_bool(2,rval);
139		if (rval) erract[WARNING].pf = wputs;
140		else erract[WARNING].pf = NULL;
141		break;
#	Line 146 | Line 146 | main(int  argc, char  *argv[])
146		case 'l':                               /* limit distance */
147		if (argv[i][2] != 'd')
148		goto badopt;
149	<	bool(3,lim_dist);
149	>	check_bool(3,lim_dist);
150		break;
151		case 'I':                               /* immed. irradiance */
152	<	bool(2,imm_irrad);
152	>	check_bool(2,imm_irrad);
153		break;
154		case 'f':                               /* format i/o */
155		switch (argv[i][2]) {
#	Line 181 | Line 181 | main(int  argc, char  *argv[])
181		break;
182		case 'h':                               /* header output */
183		rval = loadflags & IO_INFO;
184	<	bool(2,rval);
184	>	check_bool(2,rval);
185		loadflags = rval ? loadflags | IO_INFO :
186		loadflags & ~IO_INFO;
187		break;
#	Line 195 | Line 195 | main(int  argc, char  *argv[])
195		tralp = tralist;
196		}
197		if (argv[i][2] == 'I') {        /* file */
198	<	rval = wordfile(tralp,
198	>	rval = wordfile(tralp, MAXMODLIST-(tralp-tralist),
199		getpath(argv[++i],getrlibpath(),R_OK));
200		if (rval < 0) {
201		sprintf(errmsg,
#	Line 217 | Line 217 | main(int  argc, char  *argv[])
217		tralp = tralist;
218		}
219		if (argv[i][2] == 'E') {        /* file */
220	<	rval = wordfile(tralp,
220	>	rval = wordfile(tralp, MAXMODLIST-(tralp-tralist),
221		getpath(argv[++i],getrlibpath(),R_OK));
222		if (rval < 0) {
223		sprintf(errmsg,
#	Line 389 | Line 389 | badopt:
389		return 1; /* pro forma return */
390
391		#undef  check
392	<	#undef  bool
392	>	#undef  check_bool
393		}
394
395
#	Line 481 | Line 481 | printdefaults(void)                    /* print default values to stdou
481		case 't': case 'T': printf(" trace"); break;
482		case 'o': printf(" origin"); break;
483		case 'd': printf(" direction"); break;
484	+	case 'r': printf(" reflect_contrib"); break;
485	+	case 'R': printf(" reflect_length"); break;
486	+	case 'x': printf(" unreflect_contrib"); break;
487	+	case 'X': printf(" unreflect_length"); break;
488		case 'v': printf(" value"); break;
489		case 'V': printf(" contribution"); break;
490		case 'l': printf(" length"); break;

Diff Legend

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