ViewVC Help

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

root/Development/ray/src/util/rtcontrib.c

Comparing ray/src/util/rtcontrib.c (file contents):
Revision 1.18 by greg, Fri Jun 10 20:38:38 2005 UTC vs.
Revision 1.24 by greg, Fri Jun 17 16:07:18 2005 UTC

#	Line 16 | Line 16 | static const char RCSid[] = "$Id$";
16		#include  "lookup.h"
17		#include  "calcomp.h"
18
19	+	#ifndef MAXMODLIST
20		#define MAXMODLIST      1024            /* maximum modifiers we'll track */
21	+	#endif
22
23		int     treebufsiz = BUFSIZ;            /* current tree buffer size */
24
#	Line 194 | Line 196 | main(int argc, char *argv[])
196		recover++;
197		continue;
198		case 'n':               /* number of processes */
199	<	if (argv[i][2] || i >= argc-1) break;
199	>	if (argv[i][2] || i >= argc-2) break;
200		nprocs = atoi(argv[++i]);
201		if (nprocs <= 0)
202		error(USER, "illegal number of processes");
#	Line 219 | Line 221 | main(int argc, char *argv[])
221		case 'f':               /* file or i/o format */
222		if (!argv[i][2]) {
223		char    *fpath;
224	<	if (i >= argc-1) break;
224	>	if (i >= argc-2) break;
225		fpath = getpath(argv[++i],
226		getrlibpath(), R_OK);
227		if (fpath == NULL) {
#	Line 234 | Line 236 | main(int argc, char *argv[])
236		setformat(argv[i]+2);
237		continue;
238		case 'e':               /* expression */
239	<	if (argv[i][2] || i >= argc-1) break;
239	>	if (argv[i][2] || i >= argc-2) break;
240		scompile(argv[++i], NULL, 0);
241		continue;
242		case 'o':               /* output file spec. */
243	<	if (argv[i][2] || i >= argc-1) break;
243	>	if (argv[i][2] || i >= argc-2) break;
244		curout = argv[++i];
245		continue;
246		case 'x':               /* horiz. output resolution */
247	<	if (argv[i][2] || i >= argc-1) break;
247	>	if (argv[i][2] || i >= argc-2) break;
248		xres = atoi(argv[++i]);
249		continue;
250		case 'y':               /* vert. output resolution */
251	<	if (argv[i][2] || i >= argc-1) break;
251	>	if (argv[i][2] || i >= argc-2) break;
252		yres = atoi(argv[++i]);
253		continue;
254		case 'b':               /* bin expression */
255	<	if (argv[i][2] || i >= argc-1) break;
255	>	if (argv[i][2] || i >= argc-2) break;
256		binval = argv[++i];
257		continue;
258		case 'm':               /* modifier name */
259	<	if (argv[i][2] || i >= argc-1) break;
259	>	if (argv[i][2] || i >= argc-2) break;
260		rtargv[rtargc++] = "-ti";
261		rtargv[rtargc++] = argv[++i];
262		addmodifier(argv[i], curout, binval);
263		continue;
264		case 'M':               /* modifier file */
265	<	if (argv[i][2] || i >= argc-1) break;
266	<	addmodfile(argv[++i], curout, binval);
265	>	if (argv[i][2] || i >= argc-2) break;
266	>	rtargv[rtargc++] = "-tI";
267	>	rtargv[rtargc++] = argv[++i];
268	>	addmodfile(argv[i], curout, binval);
269		continue;
270		}
271		rtargv[rtargc++] = argv[i];     /* assume rtrace option */
#	Line 311 | Line 315 | main(int argc, char *argv[])
315		error(USER, "missing octree argument");
316		rtargv[rtargc++] = octree = argv[i];
317		rtargv[rtargc] = NULL;
318	<	/* start rtrace & compute contributions */
318	>	/* start rtrace */
319		init(nprocs);
320		if (recover)            /* perform recovery if requested */
321		recover_output(stdin);
322	<	trace_contribs(stdin);
322	>	trace_contribs(stdin);  /* compute contributions */
323		quit(0);
324		}
325
#	Line 464 | Line 468 | addmodfile(char *fname, char *outf, char *binv)
468		{
469		char    *mname[MAXMODLIST];
470		int     i;
471	<	/* load the file & store strings */
472	<	wordfile(mname, fname);
471	>	/* find the file & store strings */
472	>	if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) {
473	>	sprintf(errmsg, "cannot find modifier file '%s'", fname);
474	>	error(SYSTEM, errmsg);
475	>	}
476		for (i = 0; mname[i]; i++)      /* add each one */
477		addmodifier(mname[i], outf, binv);
478		}
#	Line 616 | Line 623 | getofile(const char *ospec, const char *mname, int bn)
623		if (header) {
624		char    info[512];
625		char    *cp = info;
626	<	if (ofl & OF_MODIFIER) {
627	<	sprintf(cp, "MODIFIER=%s\n", mname);
621	<	while (*cp) ++cp;
622	<	}
626	>	sprintf(cp, "MODIFIER=%s\n", mname);
627	>	while (*cp) ++cp;
628		if (ofl & OF_BIN) {
629		sprintf(cp, "BIN=%d\n", bn);
630		while (*cp) ++cp;
#	Line 1025 | Line 1030 | recover_output(FILE *fin)
1030		error(USER, "cannot recover from command");
1031		/* open output */
1032		fp = fopen(oname, "rb+");
1033	<	if (fp == NULL)
1034	<	break;          /* must be end of modifier */
1033	>	if (fp == NULL) {
1034	>	if (j)
1035	>	break;  /* assume end of modifier */
1036	>	sprintf(errmsg, "missing recover file '%s'",
1037	>	oname);
1038	>	error(USER, errmsg);
1039	>	}
1040		nvals = lseek(fileno(fp), 0, SEEK_END);
1041		if (nvals <= 0) {
1042		lastout = 0;    /* empty output, quit here */
#	Line 1080 | Line 1090 | recover_output(FILE *fin)
1090		if (lastout < 0) {
1091		error(WARNING, "no output files to recover");
1092		return;
1093	+	}
1094	+	if (raysleft && lastout >= raysleft) {
1095	+	error(WARNING, "output appears to be complete");
1096	+	/* XXX should read & discard input? */
1097	+	quit(0);
1098		}
1099		/* seek on all files */
1100		nvals = lastout * outvsiz;

Diff Legend

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