556 |
|
return; |
557 |
|
/* make octree0 */ |
558 |
|
if ((oct0date < scenedate) | (oct0date < illumdate)) { |
559 |
< |
if (touchonly && oct0date) |
560 |
< |
touch(oct0name); |
561 |
< |
else { /* build command */ |
559 |
> |
if (touchonly && (oct0date || oct1date)) { |
560 |
> |
if (oct0date) |
561 |
> |
touch(oct0name); |
562 |
> |
} else { /* build command */ |
563 |
|
if (octreedate) |
564 |
|
sprintf(combuf, "%s%s -i %s %s > %s", c_oconv, |
565 |
|
ocopts, vval(OCTREE), |
584 |
|
oct0date = octreedate; |
585 |
|
if (oct0date < illumdate) /* ditto */ |
586 |
|
oct0date = illumdate; |
587 |
< |
} |
587 |
> |
} |
588 |
|
if (touchonly && oct1date) |
589 |
|
touch(oct1name); |
590 |
|
else { |
753 |
|
{ |
754 |
|
/* BEWARE: This may be called via setdefaults(), so no assumptions */ |
755 |
|
|
756 |
< |
*mo = '\0'; |
756 |
> |
if (nprocs > 1) |
757 |
> |
sprintf(mo, " -n %d", nprocs); |
758 |
> |
else |
759 |
> |
*mo = '\0'; |
760 |
|
if (!vdef(MKPMAP)) |
761 |
|
return; |
762 |
|
if (vval(MKPMAP)[0] != '-') { |
790 |
|
{ |
791 |
|
if (vdef(EXPOSURE)) { |
792 |
|
if (vval(EXPOSURE)[0] == '+' || vval(EXPOSURE)[0] == '-') |
793 |
< |
return(.5/pow(2.,vflt(EXPOSURE))); |
794 |
< |
return(.5/vflt(EXPOSURE)); |
793 |
> |
return(.18/pow(2.,vflt(EXPOSURE))); |
794 |
> |
return(.18/vflt(EXPOSURE)); |
795 |
|
} |
796 |
|
if (vlet(ZONE) == 'E') |
797 |
|
return(10.); |
834 |
|
op = addarg(addarg(op, "-ap"), pmapf); |
835 |
|
if (atoi(bw) > 0) op = addarg(op, bw); |
836 |
|
} |
837 |
< |
if (vdef(RENDER)) |
837 |
> |
if (vdef(RENDER)) { |
838 |
|
op = addarg(op, vval(RENDER)); |
839 |
+ |
bw = strstr(vval(RENDER), "-aa "); |
840 |
+ |
if (bw != NULL && atof(bw+4) <= FTINY) |
841 |
+ |
overture = 0; |
842 |
+ |
} |
843 |
|
if (rvdevice != NULL) { |
844 |
|
if (vdef(RVU)) { |
845 |
|
if (vval(RVU)[0] != '-') { |