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.66 by greg, Fri Sep 16 17:54:56 2016 UTC vs.
Revision 2.71 by greg, Mon Sep 19 16:28:21 2016 UTC

# Line 13 | Line 13 | sub userror {
13          exit 1;
14   }
15   my ($td,$radscn,$mgfscn,$octree,$fsender,$bsender,$receivers,$facedat,$behinddat,$rmtmp);
16 < my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz,$cph,$sav);
16 > my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz,$cph);
17   my ($curphase, $recovery);
18   if ($#ARGV == 1 && "$ARGV[0]" =~ /^-rec/) {
19          $td = $ARGV[1];
# 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 155 | Line 156 | while ($#ARGV >= 0) {
156   die "Must have at least one of +forward or +backward\n" if (!$doforw && !$doback);
157   $wrapper .= $tensortree ? " -a t$tensortree" : " -a kf -c";
158   $wrapper .= " -u $gunit";
159 < if (!defined $recovery) {
159 > if ( !defined $recovery ) {
160          # Issue warning for unhandled reciprocity case
161          print STDERR "Warning: recommend both +forward and +backward with -t3\n" if
162                          ($tensortree==3 && !($doforw && $doback));
163 <        # Get scene description and dimensions
163 >        # Get scene description
164          if ( $mgfin ) {
165                  system "mgf2rad @ARGV > $radscn";
166                  die "Could not load MGF input\n" if ( $? );
# Line 168 | Line 169 | if (!defined $recovery) {
169                  die "Could not load Radiance input\n" if ( $? );
170          }
171   }
172 < if ($#dim != 5) {
172 > if ( $#dim != 5 ) {
173          @dim = split ' ', `getbbox -h $radscn`;
174   }
175 < die "Device entirely inside room!\n" if ($dim[4] >= 0);
176 < if ($dim[5] > 1e-5) {
175 > die "Device entirely inside room!\n" if ( $dim[4] >= 0 );
176 > if ( $dim[5] > 1e-5 ) {
177          print STDERR "Warning: Device extends into room\n";
178 < } elsif ($dim[5]*$dim[5] > .01*($dim[1]-$dim[0])*($dim[3]-$dim[2])) {
178 > } elsif ( $dim[5]*$dim[5] > .01*($dim[1]-$dim[0])*($dim[3]-$dim[2]) ) {
179          print STDERR "Warning: Device far behind Z==0 plane\n";
180   }
181   # Assume Zmax==0 to derive thickness so pkgBSDF will work
182   $wrapper .= ' -f "t=' . (-$dim[4]) . ';w=' . ($dim[1] - $dim[0]) .
183                  ';h=' . ($dim[3] - $dim[2]) . '"';
184 + $wrapper .= " -g $mgfscn" if ( $geout );
185   # Calculate CIE (u',v') from Radiance RGB:
186   my $CIEuv =     'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
187                  'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
# Line 192 | Line 194 | my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$d
194   my $ny = int($nsamp/$nx + 1);
195   $nsamp = $nx * $ny;
196   $rfluxmtx .= " -n $nproc -c $nsamp";
197 < if (!defined $recovery) {
197 > if ( !defined $recovery ) {
198          open(MYAVH, "> $td/savedARGV.txt");
199          foreach (@savedARGV) {
200                  print MYAVH "$_\n";
# Line 214 | Line 216 | if (!defined $recovery) {
216                  open(MGFSCN, ">> $mgfscn");
217                  print MGFSCN "xf\n";
218                  close MGFSCN;
217                $wrapper .= " -g $mgfscn";
219          }
220          # Create receiver & sender surfaces (rectangular)
221          open(RADSCN, "> $receivers");
# Line 248 | Line 249 | if (!defined $recovery) {
249          }
250          print STDERR "Recover using: $0 -recover $td\n";
251   }
252 + # Open unbuffered progress file
253   open(MYPH, ">> $td/phase.txt");
254 < {               # unbuffer output to MYPH
254 > {
255          my $ofh = select MYPH;
256          $| = 1;
257          select $ofh;
258   }
259   $curphase = 0;
258 # Function to determine if next phase should be skipped or recovered
259 sub do_phase {
260        $curphase++;
261        if (defined $recovery) {
262                if ($recovery == $curphase) { return -1; }
263                if ($recovery > $curphase) { return 0; }
264        }
265        print MYPH "$curphase\n";
266        return 1;
267 }
260   # Create data segments (all the work happens here)
261   if ( $tensortree ) {
262          do_tree_bsdf();
# Line 272 | Line 264 | if ( $tensortree ) {
264          do_matrix_bsdf();
265   }
266   # Output XML
267 < print STDERR "Running: $wrapper\n";
267 > # print STDERR "Running: $wrapper\n";
268   system "$wrapper -C \"Created by: genBSDF @savedARGV\"";
269   die "Could not wrap BSDF data\n" if ( $? );
270   # Clean up temporary files and exit
271   exec $rmtmp;
272  
273 < #-------------- End of main program segment --------------#
273 > #============== End of main program segment ==============#
274  
275 + # Function to determine if next phase should be skipped or recovered
276 + sub do_phase {
277 +        $curphase++;
278 +        if ( defined $recovery ) {
279 +                if ( $recovery > $curphase ) { return 0; }
280 +                if ( $recovery == $curphase ) { return -1; }
281 +        }
282 +        print MYPH "$curphase\n";
283 +        return 1;
284 + }
285 +
286 + # Check if we are in active phase (not skipping parts)
287 + sub active_phase {
288 +        if ( defined $recovery ) {
289 +                if ( $recovery > $curphase ) { return 0; }
290 +                if ( $recovery == $curphase ) { return -1; }
291 +        }
292 +        return 1;
293 + }
294 +
295 + # Function to run program and check output if in active phase
296 + sub run_check {
297 +        if ( !active_phase() ) { return; }
298 +        my $cmd = shift;
299 +        # print STDERR "Running: $cmd\n";
300 +        system $cmd;
301 +        die "Failure running: $cmd\n" if ( $? );
302 + }
303 +
304   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
305   sub do_tree_bsdf {
306  
# Line 292 | Line 313 | sub do_tree_bsdf {
313   # Call rfluxmtx and process tensor tree BSDF for the given direction
314   sub do_ttree_dir {
315          my $forw = shift;
316 <        my $r = do_phase();
317 <        if (!$r) { return; }
297 <        $r = ($r < 0) ? " -r" : "";
316 >        my $dop = do_phase();
317 >        my $r = ($dop < 0) ? " -r" : "";
318          my $cmd;
319          if ( $tensortree == 3 ) {
320                  # Isotropic BSDF
# Line 333 | Line 353 | sub do_ttree_dir {
353                          $cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
354                  }
355          }
356 <        print STDERR "Starting: $cmd\n";
357 <        system $cmd;
358 <        die "Failure running rfluxmtx" if ( $? );
356 >        if ( $dop ) {
357 >                # print STDERR "Running: $cmd\n";
358 >                system $cmd;
359 >                die "Failure running rfluxmtx" if ( $? );
360 >        }
361          ttree_out($forw);
362   }       # end of do_ttree_dir()
363  
# Line 418 | Line 440 | sub ttree_comp {
440                          $cmd .= " -of $src " .
441                                          "| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
442                  }
443 <                print STDERR "Running: $cmd\n";
422 <                system "$cmd > $dest";
423 <                die "Failure running rttree_reduce" if ( $? );
443 >                run_check "$cmd > $dest";
444          } else {
445                  if ($windoz) {
446                          $cmd = "rcollate -ho -oc 1 $src | " . $cmd ;
447                  } else {
448                          $cmd .= " $src";
449                  }
450 <                open(DATOUT, "> $dest");
451 <                print DATOUT "{\n";
452 <                close DATOUT;
453 <                print STDERR "Running: $cmd\n";
454 <                system "$cmd >> $dest";
455 <                die "Failure running rcalc" if ( $? );
456 <                open(DATOUT, ">> $dest");
457 <                for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
458 <                        print DATOUT "0\n";
450 >                if ( active_phase() ) {
451 >                        open(DATOUT, "> $dest");
452 >                        print DATOUT "{\n";
453 >                        close DATOUT;
454 >                        # print STDERR "Running: $cmd\n";
455 >                        system "$cmd >> $dest";
456 >                        die "Failure running rcalc" if ( $? );
457 >                        open(DATOUT, ">> $dest");
458 >                        for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
459 >                                print DATOUT "0\n";
460 >                        }
461 >                        print DATOUT "}\n";
462 >                        close DATOUT;
463                  }
440                print DATOUT "}\n";
441                close DATOUT;
464          }
465          if ( "$spec" ne "$curspec" ) {
466                  $wrapper .= " -s $spec";
# Line 461 | Line 483 | sub do_matrix_bsdf {
483   # Call rfluxmtx and process tensor tree BSDF for the given direction
484   sub do_matrix_dir {
485          my $forw = shift;
486 <        my $r = do_phase();
487 <        if (!$r) { return; }
466 <        $r = ($r < 0) ? " -r" : "";
467 <        my $cmd;
486 >        my $dop = do_phase();
487 >        my $r = ($dop < 0) ? " -r" : "";
488          my $sender = ($bsender,$fsender)[$forw];
489 <        $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
490 <        print STDERR "Starting: $cmd\n";
491 <        system $cmd;
492 <        die "Failure running rfluxmtx" if ( $? );
489 >        my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
490 >        if ( $dop ) {
491 >                # print STDERR "Running: $cmd\n";
492 >                system $cmd;
493 >                die "Failure running rfluxmtx" if ( $? );
494 >        }
495          matrix_out($forw);
496   }       # end of do_matrix_dir()
497  
# Line 514 | Line 536 | sub matrix_comp {
536                  $cmd .= " -c 0.0241 0.1229 0.8530";
537          }
538          $cmd .= " $src | rcollate -ho -oc 145";
539 <        print STDERR "Running: $cmd\n";
518 <        system "$cmd > $dest";
519 <        die "Failure running rmtxop" if ( $? );
539 >        run_check "$cmd > $dest";
540          if ( "$spec" ne "$curspec" ) {
541                  $wrapper .= " -s $spec";
542                  $curspec = $spec;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines