208 |
|
goto userr; |
209 |
|
rifname = argv[i]; |
210 |
|
/* check command-line options */ |
211 |
< |
if ((nprocs > 1) & (viewselect != NULL)) |
211 |
> |
if ((nprocs > 1) & (viewselect != NULL) & (rvdevice == NULL)) |
212 |
|
nprocs = 1; |
213 |
|
/* assign Radiance root file name */ |
214 |
|
rootname(radname, rifname); |
787 |
|
} |
788 |
|
po = addarg(po, "-pt .08"); |
789 |
|
if (vbool(PENUMBRAS)) |
790 |
< |
op = addarg(op, "-ds .2 -dj .5"); |
790 |
> |
op = addarg(op, "-ds .2 -dj .9"); |
791 |
|
else |
792 |
|
op = addarg(op, "-ds .3"); |
793 |
|
op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1"); |
867 |
|
} |
868 |
|
po = addarg(po, "-pt .04"); |
869 |
|
if (vbool(PENUMBRAS)) |
870 |
< |
op = addarg(op, "-ds .1 -dj .65"); |
870 |
> |
op = addarg(op, "-ds .1 -dj .9"); |
871 |
|
else |
872 |
|
op = addarg(op, "-ds .2"); |
873 |
|
op = addarg(op, "-dt .05 -dc .75 -dr 3 -sj 1 -st .01"); |
1012 |
|
} else if (*vs == 'z') { |
1013 |
|
zpos = -1; vs++; |
1014 |
|
} |
1015 |
< |
viewtype = 'v'; |
1016 |
< |
if ((*vs == 'v') | (*vs == 'l') | (*vs == 'a') | |
1017 |
< |
(*vs == 'h') | (*vs == 'c') | (*vs == 's')) |
1015 |
> |
switch (*vs) { |
1016 |
> |
case VT_PER: |
1017 |
> |
case VT_PAR: |
1018 |
> |
case VT_ANG: |
1019 |
> |
case VT_HEM: |
1020 |
> |
case VT_PLS: |
1021 |
> |
case VT_CYL: |
1022 |
|
viewtype = *vs++; |
1023 |
+ |
break; |
1024 |
+ |
default: |
1025 |
+ |
viewtype = VT_PER; |
1026 |
+ |
break; |
1027 |
+ |
} |
1028 |
|
cp = viewopts; |
1029 |
|
if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) { /* got one! */ |
1030 |
|
*cp++ = '-'; *cp++ = 'v'; *cp++ = 't'; *cp++ = viewtype; |
1066 |
|
} |
1067 |
|
cp = addarg(cp, vup[upax+3]); |
1068 |
|
switch (viewtype) { |
1069 |
< |
case 'v': |
1069 |
> |
case VT_PER: |
1070 |
|
cp = addarg(cp, "-vh 45 -vv 45"); |
1071 |
|
break; |
1072 |
< |
case 'l': |
1072 |
> |
case VT_PAR: |
1073 |
|
d = sqrt(dim[0]*dim[0]+dim[1]*dim[1]+dim[2]*dim[2]); |
1074 |
|
sprintf(cp, " -vh %.2g -vv %.2g", d, d); |
1075 |
|
cp += strlen(cp); |
1076 |
|
break; |
1077 |
< |
case 'a': |
1078 |
< |
case 'h': |
1077 |
> |
case VT_ANG: |
1078 |
> |
case VT_HEM: |
1079 |
> |
case VT_PLS: |
1080 |
|
cp = addarg(cp, "-vh 180 -vv 180"); |
1081 |
|
break; |
1082 |
< |
case 'c': |
1082 |
> |
case VT_CYL: |
1083 |
|
cp = addarg(cp, "-vh 180 -vv 90"); |
1084 |
|
break; |
1085 |
|
} |
1197 |
|
if (sayview) |
1198 |
|
myprintview(vw, stdout); |
1199 |
|
sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname); |
1200 |
+ |
if (nprocs > 1) |
1201 |
+ |
sprintf(combuf+strlen(combuf), "-n %d ", nprocs); |
1202 |
|
if (rvdevice != NULL) |
1203 |
|
sprintf(combuf+strlen(combuf), "-o %s ", rvdevice); |
1204 |
|
if (vdef(EXPOSURE)) |
1279 |
|
myprintview(vw, stdout); |
1280 |
|
if (!vs[0]) |
1281 |
|
sprintf(vs, "%d", vn); |
1282 |
< |
sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs); |
1282 |
> |
sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs); |
1283 |
|
if (vdef(ZFILE)) |
1284 |
|
sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs); |
1285 |
|
else |
1368 |
|
} |
1369 |
|
/* remove/rename raw file */ |
1370 |
|
if (vdef(RAWFILE)) { |
1371 |
< |
sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs); |
1371 |
> |
sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs); |
1372 |
|
mvfile(rawfile, combuf); |
1373 |
|
} else |
1374 |
|
rmfile(rawfile); |
1485 |
|
int all |
1486 |
|
) |
1487 |
|
{ |
1488 |
< |
int ourstatus = 0; |
1489 |
< |
RT_PID pid, status; |
1488 |
> |
int ourstatus = 0, status; |
1489 |
> |
RT_PID pid; |
1490 |
|
|
1491 |
|
if (all) |
1492 |
|
all = children_running; |
1523 |
|
} |
1524 |
|
int |
1525 |
|
kill(pid, sig) /* win|unix_process.c should also wait and kill */ |
1526 |
< |
RT_PID pid, sig; |
1526 |
> |
RT_PID pid; |
1527 |
> |
int sig; |
1528 |
|
{ |
1529 |
|
return 0; |
1530 |
|
} |