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.53 by greg, Thu Jun 11 18:32:24 2009 UTC vs.
Revision 1.56 by greg, Fri Jun 11 20:26:09 2010 UTC

#	Line 340 | Line 340 | main(int argc, char *argv[])
340		case 'b':               /* bin expression/count */
341		if (i >= argc-2) break;
342		if (argv[i][2] == 'n') {
343	<	bincnt = atoi(argv[++i]);
343	>	bincnt = (int)(eval(argv[++i]) + .5);
344		continue;
345		}
346		if (argv[i][2]) break;
#	Line 378 | Line 378 | main(int argc, char *argv[])
378		rtargv[rtargc++] = contrib ? RTCONTRIB : RTCOEFF;
379		/* just asking for defaults? */
380		if (!strcmp(argv[i], "-defaults")) {
381	<	char    sxres[16], syres[16];
381	>	char    nps[8], sxres[16], syres[16];
382		char    *rtpath;
383	–	printf("-n %-2d\t\t\t\t# number of processes\n", nprocs);
383		printf("-c %-5d\t\t\t# accumulated rays per record\n",
384		accumulate);
385		printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-',
386		contrib ? "contributions" : "coefficients");
387		fflush(stdout);                 /* report OUR options */
388	+	rtargv[rtargc++] = "-n";
389	+	sprintf(nps, "%d", nprocs);
390	+	rtargv[rtargc++] = nps;
391		rtargv[rtargc++] = header ? "-h+" : "-h-";
392		sprintf(fmt, "-f%c%c", inpfmt, outfmt);
393		rtargv[rtargc++] = fmt;
#	Line 580 | Line 582 | addmodifier(char *modn, char *outf, char *binv, int bi
582		error(USER, errmsg);
583		}
584		if (nmods >= MAXMODLIST)
585	<	error(USER, "too many modifiers");
585	>	error(INTERNAL, "too many modifiers");
586		modname[nmods++] = modn;        /* XXX assumes static string */
587		lep->key = modn;                /* XXX assumes static string */
588		mp = (MODCONT *)malloc(sizeof(MODCONT));
#	Line 588 | Line 590 | addmodifier(char *modn, char *outf, char *binv, int bi
590		error(SYSTEM, "out of memory in addmodifier");
591		mp->outspec = outf;             /* XXX assumes static string */
592		mp->modname = modn;             /* XXX assumes static string */
593	<	if (binv != NULL)
594	<	mp->binv = eparse(binv);
595	<	else
596	<	mp->binv = eparse("0");
597	<	mp->nbins = 1;
593	>	if (binv == NULL)
594	>	binv = "0";             /* use single bin if unspecified */
595	>	mp->binv = eparse(binv);
596	>	if (mp->binv->type == NUM) {    /* check value if constant */
597	>	bincnt = (int)(evalue(mp->binv) + 1.5);
598	>	if (bincnt != 1) {
599	>	sprintf(errmsg, "illegal non-zero constant for bin (%s)",
600	>	binv);
601	>	error(USER, errmsg);
602	>	}
603	>	}
604	>	mp->nbins = 1;                  /* initialize results holder */
605		setcolor(mp->cbin[0], 0., 0., 0.);
606	<	if (mp->binv->type == NUM)      /* assume one bin if constant */
598	<	bincnt = 1;
599	<	else if (bincnt > 1)
606	>	if (bincnt > 1)
607		mp = growmodifier(mp, bincnt);
608		lep->data = (char *)mp;
609		/* allocate output streams */
#	Line 659 | Line 666 | ofname(char *oname, const char *ospec, const char *mna
666		mnp = cp;
667		break;
668		case 'd':
669	+	case 'i':
670	+	case 'o':
671	+	case 'x':
672	+	case 'X':
673		if (bnp != NULL)
674		return -1;
675		bnp = cp;

Diff Legend

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