117 |
|
int overture = 0; /* overture calculation needed */ |
118 |
|
|
119 |
|
char *progname; /* global argv[0] */ |
120 |
+ |
char *rifname; /* global rad input file name */ |
121 |
|
|
122 |
|
char radname[MAXPATH]; /* root Radiance file name */ |
123 |
|
|
156 |
|
} |
157 |
|
if (i >= argc) |
158 |
|
goto userr; |
159 |
+ |
rifname = argv[i]; |
160 |
|
/* assign Radiance root file name */ |
161 |
< |
rootname(radname, argv[i]); |
161 |
> |
rootname(radname, rifname); |
162 |
|
/* load variable values */ |
163 |
< |
load(argv[i]); |
163 |
> |
load(rifname); |
164 |
|
/* get any additional assignments */ |
165 |
|
for (i++; i < argc; i++) |
166 |
|
setvariable(argv[i]); |
612 |
|
d *= 3./(siz[0]+siz[1]+siz[2]); |
613 |
|
switch (vscale(DETAIL)) { |
614 |
|
case LOW: |
615 |
< |
op = addarg(op, "-ps 16 -dp 16"); |
615 |
> |
op = addarg(op, "-ps 16 -dp 64"); |
616 |
|
sprintf(op, " -ar %d", (int)(4*d)); |
617 |
|
op += strlen(op); |
618 |
|
break; |
619 |
|
case MEDIUM: |
620 |
< |
op = addarg(op, "-ps 8 -dp 32"); |
620 |
> |
op = addarg(op, "-ps 8 -dp 128"); |
621 |
|
sprintf(op, " -ar %d", (int)(8*d)); |
622 |
|
op += strlen(op); |
623 |
|
break; |
624 |
|
case HIGH: |
625 |
< |
op = addarg(op, "-ps 4 -dp 64"); |
625 |
> |
op = addarg(op, "-ps 4 -dp 256"); |
626 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
627 |
|
op += strlen(op); |
628 |
|
break; |
674 |
|
switch (vscale(DETAIL)) { |
675 |
|
case LOW: |
676 |
|
op = addarg(op, vbool(PENUMBRAS) ? "-ps 4" : "-ps 8"); |
677 |
< |
op = addarg(op, "-dp 64"); |
677 |
> |
op = addarg(op, "-dp 256"); |
678 |
|
sprintf(op, " -ar %d", (int)(8*d)); |
679 |
|
op += strlen(op); |
680 |
|
break; |
681 |
|
case MEDIUM: |
682 |
|
op = addarg(op, vbool(PENUMBRAS) ? "-ps 3" : "-ps 6"); |
683 |
< |
op = addarg(op, "-dp 128"); |
683 |
> |
op = addarg(op, "-dp 512"); |
684 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
685 |
|
op += strlen(op); |
686 |
|
break; |
687 |
|
case HIGH: |
688 |
|
op = addarg(op, vbool(PENUMBRAS) ? "-ps 2" : "-ps 4"); |
689 |
< |
op = addarg(op, "-dp 256"); |
689 |
> |
op = addarg(op, "-dp 1024"); |
690 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
691 |
|
op += strlen(op); |
692 |
|
break; |
741 |
|
switch (vscale(DETAIL)) { |
742 |
|
case LOW: |
743 |
|
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 8"); |
744 |
< |
op = addarg(op, "-dp 256"); |
744 |
> |
op = addarg(op, "-dp 1024"); |
745 |
|
sprintf(op, " -ar %d", (int)(16*d)); |
746 |
|
op += strlen(op); |
747 |
|
break; |
748 |
|
case MEDIUM: |
749 |
|
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 5"); |
750 |
< |
op = addarg(op, "-dp 512"); |
750 |
> |
op = addarg(op, "-dp 2048"); |
751 |
|
sprintf(op, " -ar %d", (int)(32*d)); |
752 |
|
op += strlen(op); |
753 |
|
break; |
754 |
|
case HIGH: |
755 |
|
op = addarg(op, vbool(PENUMBRAS) ? "-ps 1" : "-ps 3"); |
756 |
< |
op = addarg(op, "-dp 1024"); |
756 |
> |
op = addarg(op, "-dp 4096"); |
757 |
|
sprintf(op, " -ar %d", (int)(64*d)); |
758 |
|
op += strlen(op); |
759 |
|
break; |
1069 |
|
return; |
1070 |
|
if (sayview) |
1071 |
|
printview(vw); |
1072 |
< |
sprintf(combuf, "rview %s%s ", vw, opts); |
1072 |
> |
sprintf(combuf, "rview %s%s -R %s ", vw, opts, rifname); |
1073 |
|
if (rvdevice != NULL) |
1074 |
|
sprintf(combuf+strlen(combuf), "-o %s ", rvdevice); |
1075 |
|
strcat(combuf, vval(OCTREE)); |