| 15 |
|
'-ab',1, '-af',1, '-ai',1, '-aI',1, '-ae',1, '-aE',1, |
| 16 |
|
'-av',3, '-aw',1, '-aa',1, '-ar',1, '-ad',1, '-as',1, |
| 17 |
|
'-me',3, '-ma',3, '-mg',1, '-ms',1, '-lr',1, '-lw',1, |
| 18 |
< |
'-ap',2, '-am',1, '-ac',1, '-aC',1); |
| 18 |
> |
'-ap',2, '-am',1, '-ac',1, '-aC',1, |
| 19 |
> |
'-cs',1, '-cw',2, '-pc',8, '-pXYZ',0); |
| 20 |
|
# boolean rtrace options |
| 21 |
|
my @boolO = ('-w', '-bv', '-dv', '-i', '-u'); |
| 22 |
|
# view options and the associated number of arguments |
| 27 |
|
my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1,); |
| 28 |
|
# Starting options for rtrace (rpict values) |
| 29 |
|
my @rtraceA = split(' ', 'rtrace -u- -dt .05 -dc .5 -ds .25 -dr 1 ' . |
| 30 |
< |
'-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-03'); |
| 30 |
> |
'-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-04'); |
| 31 |
|
my @vwraysA = ('vwrays', '-pj', '.67'); |
| 32 |
|
my @vwrightA = ('vwright', '-vtv'); |
| 33 |
|
my @rpictA = ('rpict', '-ps', '1'); |
| 34 |
+ |
my @pvalueA = ('pvalue', '-r'); |
| 35 |
|
my $outpatt = '^-o[vrxlLRXnNsmM]+'; |
| 36 |
|
my $refDepth = ""; |
| 37 |
|
my $irrad = 0; |
| 90 |
|
$ambcache = ($ARGV[1] > 0.0); |
| 91 |
|
} elsif ("$ARGV[0]" eq '-af') { |
| 92 |
|
$ambfile = "$ARGV[1]"; |
| 93 |
+ |
} elsif ("$ARGV[0]" eq '-pXYZ') { |
| 94 |
+ |
push @pvalueA, $ARGV[0]; |
| 95 |
+ |
} elsif ("$ARGV[0]" eq '-pc') { |
| 96 |
+ |
push @pvalueA, '-p'; |
| 97 |
+ |
push @pvalueA, @ARGV[1..8]; |
| 98 |
|
} |
| 99 |
|
push @rtraceA, $ARGV[0]; |
| 100 |
|
push @rpictA, shift(@ARGV); |
| 160 |
|
##### Resort pixels to reduce ambient cache collisions? |
| 161 |
|
if ($nprocs > 1 && $ambounce > 0 && $ambcache && defined($ambfile)) { |
| 162 |
|
if (!defined($outzbf) && !defined($outdir)) { |
| 163 |
< |
# Straight picture output, so just randomize sample order |
| 164 |
< |
system "cnt $res[1] $res[3] | sort -R > /tmp/ord$$.txt"; |
| 165 |
< |
die "sort error\n" if ( $? ); |
| 163 |
> |
# Straight picture output, so just shuffle sample order |
| 164 |
> |
system "cnt -s $res[1] $res[3] > /tmp/ord$$.txt"; |
| 165 |
> |
die "cnt error\n" if ( $? ); |
| 166 |
|
system "@vwraysA -ff -i < /tmp/ord$$.txt " . |
| 167 |
|
"| @rtraceA -ffa -ov '$oct' > /tmp/pix$$.txt"; |
| 168 |
|
die "Error running rtrace\n" if ( $? ); |
| 169 |
|
system "( getinfo < /tmp/pix$$.txt | getinfo -a 'VIEW=$view'; " . |
| 170 |
|
"getinfo - < /tmp/pix$$.txt | rlam /tmp/ord$$.txt - " . |
| 171 |
< |
"| sort -k2rn -k1n ) | pvalue -r -Y $res[3] +X $res[1]"; |
| 171 |
> |
"| sort -k2rn -k1n ) | @pvalueA -Y $res[3] +X $res[1]"; |
| 172 |
|
die "rlam error\n" if ( $? ); |
| 173 |
|
unlink ("/tmp/ord$$.txt", "/tmp/pix$$.txt"); |
| 174 |
|
exit 0; |
| 175 |
|
} |
| 176 |
|
# Else randomize overture calculation to prime ambient cache |
| 177 |
< |
my $oxres = int($res[1]/6); |
| 178 |
< |
my $oyres = int($res[3]/6); |
| 172 |
< |
print STDERR "Running $oxres by $oyres overture calculation " . |
| 177 |
> |
my @ores = (int($res[1]/6), int($res[3]/6)); |
| 178 |
> |
print STDERR "Running $ores[0] by $ores[1] overture calculation " . |
| 179 |
|
"to populate '$ambfile'...\n"; |
| 180 |
< |
system "@vwraysA -x $oxres -y $oyres -pj 0 " . |
| 181 |
< |
"| sort -R | @rtraceA -faf -ov '$oct' > /dev/null"; |
| 180 |
> |
system "cnt -s @ores | @vwraysA -i -ff -x $ores[0] -y $ores[1] -pj 0 " . |
| 181 |
> |
"| @rtraceA -ff -ov '$oct' > /dev/null"; |
| 182 |
|
die "Failure running overture\n" if ( $? ); |
| 183 |
|
print STDERR "Finished overture.\n"; |
| 184 |
|
} |
| 187 |
|
if (defined $outzbf) { |
| 188 |
|
exec "@vwraysA -ff | @rtraceA -fff -olv @res '$oct' | " . |
| 189 |
|
"rsplit -ih -iH -f -of '$outzbf' -oh -oH -of3 - | " . |
| 190 |
< |
"pvalue -r -df | getinfo -a 'VIEW=$view'"; |
| 190 |
> |
"@pvalueA -df | getinfo -a 'VIEW=$view'"; |
| 191 |
|
} |
| 192 |
|
##################################################################### |
| 193 |
|
##### Base case with output picture only? |
| 214 |
|
); |
| 215 |
|
# Arguments for rsplit based on output file type |
| 216 |
|
my %rcodeC = ( |
| 217 |
< |
'.hdr', ['-of3', '!pvalue -r -df -u'], |
| 217 |
> |
'.hdr', ['-of3', "!@pvalueA -df -u"], |
| 218 |
|
'.dpt', ['-of', "!rcode_depth$refDepth -ff"], |
| 219 |
|
'.nrm', ['-of3', '!rcode_norm -ff'], |
| 220 |
|
'.idx', ['-oa', '!rcode_ident "-t "'] |
