84 |
|
$rmtmp = "rm -rf $td"; |
85 |
|
} |
86 |
|
my @savedARGV = @ARGV; |
87 |
< |
my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6"; |
87 |
> |
my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6 -w-"; |
88 |
|
my $wrapper = "wrapBSDF"; |
89 |
|
my $tensortree = 0; |
90 |
|
my $ttlog2 = 4; |
170 |
|
} |
171 |
|
} |
172 |
|
if ( $#dim != 5 ) { |
173 |
< |
@dim = split ' ', `getbbox -h $radscn`; |
173 |
> |
@dim = split ' ', `getbbox -h -w $radscn`; |
174 |
|
} |
175 |
|
die "Device entirely inside room!\n" if ( $dim[4] >= 0 ); |
176 |
|
if ( $dim[5] > 1e-5 ) { |
201 |
|
} |
202 |
|
close MYAVH; |
203 |
|
# Generate octree |
204 |
< |
system "oconv -w $radscn > $octree"; |
204 |
> |
system "oconv -w -f $radscn > $octree"; |
205 |
|
die "Could not compile scene\n" if ( $? ); |
206 |
|
# Add MGF description if requested |
207 |
|
if ( $geout ) { |
249 |
|
} |
250 |
|
print STDERR "Recover using: $0 -recover $td\n"; |
251 |
|
} |
252 |
– |
# Open unbuffered progress file |
253 |
– |
open(MYPH, ">> $td/phase.txt"); |
254 |
– |
{ |
255 |
– |
my $ofh = select MYPH; |
256 |
– |
$| = 1; |
257 |
– |
select $ofh; |
258 |
– |
} |
252 |
|
$curphase = 0; |
253 |
|
# Create data segments (all the work happens here) |
254 |
|
if ( $tensortree ) { |
272 |
|
if ( $recovery > $curphase ) { return 0; } |
273 |
|
if ( $recovery == $curphase ) { return -1; } |
274 |
|
} |
275 |
+ |
open(MYPH, ">> $td/phase.txt"); |
276 |
|
print MYPH "$curphase\n"; |
277 |
+ |
close MYPH; |
278 |
|
return 1; |
279 |
|
} |
280 |
|
|
348 |
|
$cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree"; |
349 |
|
} |
350 |
|
} |
351 |
< |
run_check $cmd; |
351 |
> |
if ( $dop ) { |
352 |
> |
# print STDERR "Running: $cmd\n"; |
353 |
> |
system $cmd; |
354 |
> |
die "Failure running rfluxmtx" if ( $? ); |
355 |
> |
} |
356 |
|
ttree_out($forw); |
357 |
|
} # end of do_ttree_dir() |
358 |
|
|
481 |
|
my $dop = do_phase(); |
482 |
|
my $r = ($dop < 0) ? " -r" : ""; |
483 |
|
my $sender = ($bsender,$fsender)[$forw]; |
484 |
< |
run_check "$rfluxmtx$r -fd $sender $receivers -i $octree"; |
484 |
> |
my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree"; |
485 |
> |
if ( $dop ) { |
486 |
> |
# print STDERR "Running: $cmd\n"; |
487 |
> |
system $cmd; |
488 |
> |
die "Failure running rfluxmtx" if ( $? ); |
489 |
> |
} |
490 |
|
matrix_out($forw); |
491 |
|
} # end of do_matrix_dir() |
492 |
|
|
530 |
|
} elsif ("$spec" eq "CIE-Z") { |
531 |
|
$cmd .= " -c 0.0241 0.1229 0.8530"; |
532 |
|
} |
533 |
< |
$cmd .= " $src | rcollate -ho -oc 145"; |
533 |
> |
$cmd .= " $src | getinfo -"; |
534 |
|
run_check "$cmd > $dest"; |
535 |
|
if ( "$spec" ne "$curspec" ) { |
536 |
|
$wrapper .= " -s $spec"; |