11 |
|
my $nprocs = 1; |
12 |
|
# rtrace options and the associated number of arguments |
13 |
|
my %rtraceC = ('-dt',1, '-dc',1, '-dj',1, '-ds',1, '-dr',1, '-dp',1, |
14 |
< |
'-ss',1, '-st',1, '-e',1, '-am',1, |
14 |
> |
'-ss',1, '-st',1, '-e',1, '-am',1, '-P',1, '-PP',1, |
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); |
17 |
> |
'-me',3, '-ma',3, '-mg',1, '-ms',1, '-lr',1, '-lw',1, |
18 |
> |
'-ap',2, '-am',1, '-ac',1, '-aC',1); |
19 |
|
# boolean rtrace options |
20 |
|
my @boolO = ('-w', '-bv', '-dv', '-i', '-u'); |
21 |
|
# view options and the associated number of arguments |
22 |
|
my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0, '-vta',0, '-vts',0, '-vtc',0, |
23 |
|
'-x',1, '-y',1, '-vp',3, '-vd',3, '-vu',3, '-vh',1, '-vv',1, |
24 |
< |
'-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1); |
24 |
> |
'-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1, '-pd',1); |
25 |
|
# options we need to silently ignore |
26 |
< |
my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1, '-pd',1); |
26 |
> |
my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1,); |
27 |
|
# Starting options for rtrace (rpict values) |
28 |
|
my @rtraceA = split(' ', 'rtrace -u- -dt .05 -dc .5 -ds .25 -dr 1 ' . |
29 |
|
'-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-03'); |
30 |
< |
my @vwraysA = ('vwrays', '-ff', '-pj', '.67'); |
30 |
> |
my @vwraysA = ('vwrays', '-pj', '.67'); |
31 |
|
my @vwrightA = ('vwright', '-vtv'); |
32 |
< |
my @rpictA = ('rpict'); |
32 |
> |
my @rpictA = ('rpict', '-ps', '1'); |
33 |
|
my $outpatt = '^-o[vrxlLRXnNsmM]+'; |
34 |
|
my $refDepth = ""; |
35 |
|
my $irrad = 0; |
36 |
+ |
my $persist = 0; |
37 |
+ |
my $ambounce = 0; |
38 |
+ |
my $ambcache = 1; |
39 |
+ |
my $ambfile; |
40 |
|
my $outlyr; |
41 |
|
my $outdir; |
42 |
|
my $outpic; |
80 |
|
} |
81 |
|
# Check rtrace options |
82 |
|
if (defined $rtraceC{$ARGV[0]}) { |
83 |
+ |
if ("$ARGV[0]" =~ /^-PP?$/) { |
84 |
+ |
$persist = 1; |
85 |
+ |
} elsif ("$ARGV[0]" eq '-ab') { |
86 |
+ |
$ambounce = $ARGV[1]; |
87 |
+ |
} elsif ("$ARGV[0]" eq '-aa') { |
88 |
+ |
$ambcache = ($ARGV[1] > 0.0); |
89 |
+ |
} elsif ("$ARGV[0]" eq '-af') { |
90 |
+ |
$ambfile = "$ARGV[1]"; |
91 |
+ |
} |
92 |
|
push @rtraceA, $ARGV[0]; |
93 |
|
push @rpictA, shift(@ARGV); |
94 |
|
for (my $i = $rtraceC{$rpictA[-1]}; $i-- > 0; ) { |
138 |
|
} |
139 |
|
##################################################################### |
140 |
|
##### May as well run rpict? |
141 |
< |
if ($nprocs == 1 && !defined($outdir)) { |
141 |
> |
if ($nprocs == 1 && $persist == 0 && !defined($outdir)) { |
142 |
|
push(@rpictA, $ARGV[0]) if ($#ARGV == 0); |
143 |
|
exec @rpictA ; |
144 |
|
} |
150 |
|
chomp $view; |
151 |
|
my @res = split(/\s/, `@vwraysA -d`); |
152 |
|
##################################################################### |
153 |
+ |
##### Resort pixels to reduce ambient cache collisions? |
154 |
+ |
if ($nprocs > 1 && $ambounce > 0 && $ambcache && defined($ambfile)) { |
155 |
+ |
if (!defined($outzbf) && !defined($outdir)) { |
156 |
+ |
# Straight picture output, so just randomize sample order |
157 |
+ |
system "cnt $res[1] $res[3] | sort -R > /tmp/ord$$.txt"; |
158 |
+ |
die "sort error\n" if ( $? ); |
159 |
+ |
system "@vwraysA -ff -i < /tmp/ord$$.txt " . |
160 |
+ |
"| @rtraceA -ffa -ov '$oct' > /tmp/pix$$.txt"; |
161 |
+ |
die "Error running rtrace\n" if ( $? ); |
162 |
+ |
system "( getinfo < /tmp/pix$$.txt ; getinfo - < /tmp/pix$$.txt " . |
163 |
+ |
"| rlam /tmp/ord$$.txt - | sort -k2rn -k1n ) " . |
164 |
+ |
"| pvalue -r -Y $res[3] +X $res[1] | getinfo -a 'VIEW=$view'"; |
165 |
+ |
die "rlam error\n" if ( $? ); |
166 |
+ |
unlink ("/tmp/ord$$.txt", "/tmp/pix$$.txt"); |
167 |
+ |
exit 0; |
168 |
+ |
} |
169 |
+ |
# Else randomize overture calculation to prime ambient cache |
170 |
+ |
my $oxres = int($res[1]/6); |
171 |
+ |
my $oyres = int($res[3]/6); |
172 |
+ |
print STDERR "Running $oxres by $oyres overture calculation " . |
173 |
+ |
"to populate '$ambfile'...\n"; |
174 |
+ |
system "@vwraysA -x $oxres -y $oyres -pj 0 " . |
175 |
+ |
"| sort -R | @rtraceA -faf -ov '$oct' > /dev/null"; |
176 |
+ |
die "Failure running overture\n" if ( $? ); |
177 |
+ |
print STDERR "Finished overture.\n"; |
178 |
+ |
} |
179 |
+ |
##################################################################### |
180 |
|
##### Generating picture with depth buffer? |
181 |
|
if (defined $outzbf) { |
182 |
< |
exec "@vwraysA | @rtraceA -fff -olv @res '$oct' | " . |
182 |
> |
exec "@vwraysA -ff | @rtraceA -fff -olv @res '$oct' | " . |
183 |
|
"rsplit -ih -iH -f -of '$outzbf' -oh -oH -of3 - | " . |
184 |
|
"pvalue -r -df | getinfo -a 'VIEW=$view'"; |
185 |
|
} |
186 |
|
##################################################################### |
187 |
|
##### Base case with output picture only? |
188 |
|
if (! defined $outdir) { |
189 |
< |
exec "@vwraysA | @rtraceA -ffc @res '$oct' | getinfo -a 'VIEW=$view'"; |
189 |
> |
exec "@vwraysA -ff | @rtraceA -ffc @res '$oct' | getinfo -a 'VIEW=$view'"; |
190 |
|
} |
191 |
|
##################################################################### |
192 |
|
##### Layered image output case |
235 |
|
delete $rtoutC{$oval}; |
236 |
|
} |
237 |
|
# call rtrace + rsplit |
238 |
< |
exec "@vwraysA | @rtraceA -fff @res '$oct' | getinfo -a 'VIEW=$view' | @rsplitA"; |
238 |
> |
exec "@vwraysA -ff | @rtraceA -fff @res '$oct' | getinfo -a 'VIEW=$view' | @rsplitA"; |