--- ray/src/util/rad.c 2008/04/21 07:31:30 2.85 +++ ray/src/util/rad.c 2008/12/12 15:49:48 2.90 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rad.c,v 2.85 2008/04/21 07:31:30 schorsch Exp $"; +static const char RCSid[] = "$Id: rad.c,v 2.90 2008/12/12 15:49:48 greg Exp $"; #endif /* * Executive program for oconv, rpict and pfilt @@ -208,7 +208,7 @@ main( goto userr; rifname = argv[i]; /* check command-line options */ - if ((nprocs > 1) & (viewselect != NULL)) + if ((nprocs > 1) & (viewselect != NULL) & (rvdevice == NULL)) nprocs = 1; /* assign Radiance root file name */ rootname(radname, rifname); @@ -787,7 +787,7 @@ medqopts( /* medium quality rendering options */ } po = addarg(po, "-pt .08"); if (vbool(PENUMBRAS)) - op = addarg(op, "-ds .2 -dj .5"); + op = addarg(op, "-ds .2 -dj .9"); else op = addarg(op, "-ds .3"); op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1"); @@ -867,7 +867,7 @@ hiqopts( /* high quality rendering options */ } po = addarg(po, "-pt .04"); if (vbool(PENUMBRAS)) - op = addarg(op, "-ds .1 -dj .65"); + op = addarg(op, "-ds .1 -dj .9"); else op = addarg(op, "-ds .2"); op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01"); @@ -1197,6 +1197,8 @@ rvu( /* run rvu with first view */ if (sayview) myprintview(vw, stdout); sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname); + if (nprocs > 1) + sprintf(combuf+strlen(combuf), "-n %d ", nprocs); if (rvdevice != NULL) sprintf(combuf+strlen(combuf), "-o %s ", rvdevice); if (vdef(EXPOSURE)) @@ -1277,7 +1279,7 @@ rpict( /* run rpict and pfilt for each view */ myprintview(vw, stdout); if (!vs[0]) sprintf(vs, "%d", vn); - sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs); + sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs); if (vdef(ZFILE)) sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs); else @@ -1366,7 +1368,7 @@ rpict( /* run rpict and pfilt for each view */ } /* remove/rename raw file */ if (vdef(RAWFILE)) { - sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs); + sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs); mvfile(rawfile, combuf); } else rmfile(rawfile);