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.14 by greg, Tue Feb 24 19:39:27 2015 UTC vs.
Revision 2.16 by greg, Wed Jun 1 03:00:06 2016 UTC

#	Line 163 | Line 163 | main(int argc, char *argv[])
163		#define  check(ol,al)           if (argv[i][ol] || \
164		badarg(argc-i-1,argv+i+1,al)) \
165		goto badopt
166	<	#define  bool(olen,var)         switch (argv[i][olen]) { \
166	>	#define  check_bool(olen,var)           switch (argv[i][olen]) { \
167		case '\0': var = !var; break; \
168		case 'y': case 'Y': case 't': case 'T': \
169		case '+': case '1': var = 1; break; \
#	Line 217 | Line 217 | main(int argc, char *argv[])
217		error(USER, "bad number of processes");
218		break;
219		case 'V':                       /* output contributions */
220	<	bool(2,contrib);
220	>	check_bool(2,contrib);
221		break;
222		case 'x':                       /* x resolution */
223		check(2,"i");
#	Line 229 | Line 229 | main(int argc, char *argv[])
229		break;
230		case 'w':                       /* warnings */
231		rval = (erract[WARNING].pf != NULL);
232	<	bool(2,rval);
232	>	check_bool(2,rval);
233		if (rval) erract[WARNING].pf = wputs;
234		else erract[WARNING].pf = NULL;
235		break;
#	Line 240 | Line 240 | main(int argc, char *argv[])
240		case 'l':                       /* limit distance */
241		if (argv[i][2] != 'd')
242		goto badopt;
243	<	bool(3,lim_dist);
243	>	check_bool(3,lim_dist);
244		break;
245		case 'I':                       /* immed. irradiance */
246	<	bool(2,imm_irrad);
246	>	check_bool(2,imm_irrad);
247		break;
248		case 'f':                       /* file or force or format */
249		if (!argv[i][2]) {
#	Line 252 | Line 252 | main(int argc, char *argv[])
252		break;
253		}
254		if (argv[i][2] == 'o') {
255	<	bool(3,force_open);
255	>	check_bool(3,force_open);
256		break;
257		}
258		setformat(argv[i]+2);
#	Line 266 | Line 266 | main(int argc, char *argv[])
266		accumulate = atoi(argv[++i]);
267		break;
268		case 'r':                       /* recover output */
269	<	bool(2,recover);
269	>	check_bool(2,recover);
270		break;
271		case 'h':                       /* header output */
272	<	bool(2,header);
272	>	check_bool(2,header);
273		break;
274		case 'p':                       /* parameter setting(s) */
275		check(2,"s");
#	Line 363 | Line 363 | main(int argc, char *argv[])
363
364		badopt:
365		fprintf(stderr,
366	<	"Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-p p1=V1,p2=V2][-b binv][-bn N] {-m mod | -M file} [rtrace options] octree\n",
366	>	"Usage: %s [-n nprocs][-V][-c count][-r][-e expr][-f source][-o ospec][-p p1=V1,p2=V2][-b binv][-bn N] {-m mod | -M file} [rtrace options] octree\n",
367		progname);
368		sprintf(errmsg, "command line error at '%s'", argv[i]);
369		error(USER, errmsg);
370		return(1);      /* pro forma return */
371
372		#undef  check
373	<	#undef  bool
373	>	#undef  check_bool
374		}
375
376

Diff Legend

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