ViewVC Help

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

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

Comparing ray/src/util/rad.c (file contents):
Revision 2.98 by greg, Sun Sep 12 18:42:40 2010 UTC vs.
Revision 2.101 by greg, Sat Oct 9 17:14:01 2010 UTC

#	Line 751 | Line 751 | lowqopts(                      /* low quality rendering options */
751		op = addarg(op, "-ds .4");
752		else
753		op = addarg(op, "-ds 0");
754	<	op = addarg(op, "-dt .2 -dc .25 -dr 0 -sj 0 -st .5");
754	>	op = addarg(op, "-dt .2 -dc .25 -dr 0 -ss 0 -st .5");
755		if (vdef(AMBFILE)) {
756		sprintf(op, " -af %s", vval(AMBFILE));
757		op += strlen(op);
#	Line 826 | Line 826 | medqopts(                      /* medium quality rendering options */
826		op = addarg(op, "-ds .2 -dj .9");
827		else
828		op = addarg(op, "-ds .3");
829	<	op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1");
829	>	op = addarg(op, "-dt .1 -dc .5 -dr 1 -ss 1 -st .1");
830		if ( (overture = vint(INDIRECT)) ) {
831		sprintf(op, " -ab %d", overture);
832		op += strlen(op);
#	Line 904 | Line 904 | hiqopts(                               /* high quality rendering options */
904		op = addarg(op, "-ds .1 -dj .9");
905		else
906		op = addarg(op, "-ds .2");
907	<	op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01");
907	>	op = addarg(op, "-dt .05 -dc .75 -dr 3 -ss 16 -st .01");
908		sprintf(op, " -ab %d", overture=vint(INDIRECT)+1);
909		op += strlen(op);
910		if (vdef(AMBFILE)) {
#	Line 1396 | Line 1396 | rpict(                         /* run rpict and pfilt for each view */
1396		} else {
1397		if (overture) {         /* run overture calculation */
1398		sprintf(combuf,
1399	<	"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1399	>	"%s%s %s%s -x 64 -y 64 -ps 1 %s > %s",
1400		c_rpict, rep, vw, opts,
1401		oct1name, overfile);
1402	<	if (do_rpiece)
1403	<	while (next_process(1))
1404	<	sleep(5);
1405	<	if (runcom(combuf)) {
1406	<	fprintf(stderr,
1402	>	if (!do_rpiece || !next_process(0)) {
1403	>	if (runcom(combuf)) {
1404	>	fprintf(stderr,
1405		"%s: error in overture for view %s\n",
1406	<	progname, vs);
1407	<	quit(1);
1408	<	}
1411	<	if (do_rpiece) {
1412	<	finish_process();
1413	<	wait_process(1);
1414	<	}
1406	>	progname, vs);
1407	>	quit(1);
1408	>	}
1409		#ifndef NULL_DEVICE
1410	<	rmfile(overfile);
1410	>	rmfile(overfile);
1411		#endif
1412	+	} else if (do_rpiece)
1413	+	sleep(20);
1414		}
1415		if (do_rpiece) {
1416		sprintf(combuf, "%s -F %s %s%s %s %s%s%s -o %s %s",
#	Line 1570 | Line 1566 | next_process(int reserve)              /* fork the next process */
1566		child_pid = fork();             /* split process */
1567		if (child_pid == 0) {           /* we're the child */
1568		children_running = -1;
1569	+	nprocs = 1;
1570		return(0);
1571		}
1572		if (child_pid > 0) {            /* we're the parent */

Diff Legend

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