ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/genBSDF.pl
(Generate patch)

Comparing ray/src/util/genBSDF.pl (file contents):
Revision 2.68 by greg, Fri Sep 16 20:01:29 2016 UTC vs.
Revision 2.74 by greg, Tue Feb 7 19:53:59 2017 UTC

# Line 21 | Line 21 | if ($#ARGV == 1 && "$ARGV[0]" =~ /^-rec/) {
21          @ARGV = <MYAVH>;
22          close MYAVH;
23          chomp @ARGV;
24 +        $recovery = 0;
25          if (open(MYPH, "< $td/phase.txt")) {
26                  while (<MYPH>) {
27                          chomp($recovery = $_);
# Line 83 | Line 84 | if ($windoz) {
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;
# Line 169 | Line 170 | if ( !defined $recovery ) {
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 ) {
# Line 200 | Line 201 | if ( !defined $recovery ) {
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 ) {
# Line 248 | Line 249 | if ( !defined $recovery ) {
249          }
250          print STDERR "Recover using: $0 -recover $td\n";
251   }
251 – # Open unbuffered progress file
252 – open(MYPH, ">> $td/phase.txt");
253 – {
254 –        my $ofh = select MYPH;
255 –        $| = 1;
256 –        select $ofh;
257 – }
252   $curphase = 0;
253   # Create data segments (all the work happens here)
254   if ( $tensortree ) {
# Line 274 | Line 268 | exec $rmtmp;
268   # Function to determine if next phase should be skipped or recovered
269   sub do_phase {
270          $curphase++;
271 <        if (defined $recovery) {
272 <                if ($recovery > $curphase) { return 0; }
273 <                if ($recovery == $curphase) { return -1; }
271 >        if ( defined $recovery ) {
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  
281 + # Check if we are in active phase (not skipping parts)
282 + sub active_phase {
283 +        if ( defined $recovery ) {
284 +                if ( $recovery > $curphase ) { return 0; }
285 +                if ( $recovery == $curphase ) { return -1; }
286 +        }
287 +        return 1;
288 + }
289 +
290 + # Function to run program and check output if in active phase
291 + sub run_check {
292 +        if ( !active_phase() ) { return; }
293 +        my $cmd = shift;
294 +        # print STDERR "Running: $cmd\n";
295 +        system $cmd;
296 +        die "Failure running: $cmd\n" if ( $? );
297 + }
298 +
299   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
300   sub do_tree_bsdf {
301  
# Line 294 | Line 308 | sub do_tree_bsdf {
308   # Call rfluxmtx and process tensor tree BSDF for the given direction
309   sub do_ttree_dir {
310          my $forw = shift;
311 <        my $r = do_phase();
312 <        if (!$r) { return; }
299 <        $r = ($r < 0) ? " -r" : "";
311 >        my $dop = do_phase();
312 >        my $r = ($dop < 0) ? " -r" : "";
313          my $cmd;
314          if ( $tensortree == 3 ) {
315                  # Isotropic BSDF
# Line 335 | Line 348 | sub do_ttree_dir {
348                          $cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
349                  }
350          }
351 <        # print STDERR "Starting: $cmd\n";
352 <        system $cmd;
353 <        die "Failure running rfluxmtx" if ( $? );
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  
# Line 420 | Line 435 | sub ttree_comp {
435                          $cmd .= " -of $src " .
436                                          "| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
437                  }
438 <                # print STDERR "Running: $cmd\n";
424 <                system "$cmd > $dest";
425 <                die "Failure running rttree_reduce" if ( $? );
438 >                run_check "$cmd > $dest";
439          } else {
440                  if ($windoz) {
441                          $cmd = "rcollate -ho -oc 1 $src | " . $cmd ;
442                  } else {
443                          $cmd .= " $src";
444                  }
445 <                open(DATOUT, "> $dest");
446 <                print DATOUT "{\n";
447 <                close DATOUT;
448 <                # print STDERR "Running: $cmd\n";
449 <                system "$cmd >> $dest";
450 <                die "Failure running rcalc" if ( $? );
451 <                open(DATOUT, ">> $dest");
452 <                for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
453 <                        print DATOUT "0\n";
445 >                if ( active_phase() ) {
446 >                        open(DATOUT, "> $dest");
447 >                        print DATOUT "{\n";
448 >                        close DATOUT;
449 >                        # print STDERR "Running: $cmd\n";
450 >                        system "$cmd >> $dest";
451 >                        die "Failure running rcalc" if ( $? );
452 >                        open(DATOUT, ">> $dest");
453 >                        for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
454 >                                print DATOUT "0\n";
455 >                        }
456 >                        print DATOUT "}\n";
457 >                        close DATOUT;
458                  }
442 –                print DATOUT "}\n";
443 –                close DATOUT;
459          }
460          if ( "$spec" ne "$curspec" ) {
461                  $wrapper .= " -s $spec";
# Line 463 | Line 478 | sub do_matrix_bsdf {
478   # Call rfluxmtx and process tensor tree BSDF for the given direction
479   sub do_matrix_dir {
480          my $forw = shift;
481 <        my $r = do_phase();
482 <        if (!$r) { return; }
468 <        $r = ($r < 0) ? " -r" : "";
469 <        my $cmd;
481 >        my $dop = do_phase();
482 >        my $r = ($dop < 0) ? " -r" : "";
483          my $sender = ($bsender,$fsender)[$forw];
484 <        $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
485 <        # print STDERR "Starting: $cmd\n";
486 <        system $cmd;
487 <        die "Failure running rfluxmtx" if ( $? );
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  
# Line 515 | Line 530 | sub matrix_comp {
530          } elsif ("$spec" eq "CIE-Z") {
531                  $cmd .= " -c 0.0241 0.1229 0.8530";
532          }
533 <        $cmd .= " $src | rcollate -ho -oc 145";
534 <        # print STDERR "Running: $cmd\n";
520 <        system "$cmd > $dest";
521 <        die "Failure running rmtxop" if ( $? );
533 >        $cmd .= " $src | getinfo -";
534 >        run_check "$cmd > $dest";
535          if ( "$spec" ne "$curspec" ) {
536                  $wrapper .= " -s $spec";
537                  $curspec = $spec;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines