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.67 by greg, Fri Sep 16 19:47:41 2016 UTC vs.
Revision 2.80 by greg, Thu Apr 19 17:02:13 2018 UTC

# Line 9 | Line 9 | use strict;
9   my $windoz = ($^O eq "MSWin32" or $^O eq "MSWin64");
10   use File::Temp qw/ :mktemp  /;
11   sub userror {
12 <        print STDERR "Usage: genBSDF [-n Nproc][-c Nsamp][-W][-t{3|4} Nlog2][-r \"ropts\"][-s \"x=string;y=string\"][-dim xmin xmax ymin ymax zmin zmax][{+|-}C][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom units] [input ..]\n";
12 >        print STDERR "Usage: genBSDF [-n Nproc][-c Nsamp][-W][-t{3|4} Nlog2][-r \"ropts\"][-s \"x=string;y=string\"][-dim xmin xmax ymin ymax zmin zmax][{+|-}C][{+|-}a][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom units] [input ..]\n";
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 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;
91 + my $dorecip = 1;
92   my $nsamp = 2000;
93   my $mgfin = 0;
94   my $geout = 1;
# Line 114 | Line 116 | while ($#ARGV >= 0) {
116                  shift @ARGV;
117          } elsif ("$ARGV[0]" =~ /^[-+]C/) {
118                  $docolor = ("$ARGV[0]" =~ /^\+/);
119 +        } elsif ("$ARGV[0]" =~ /^[-+]a/) {
120 +                $dorecip = ("$ARGV[0]" =~ /^\+/);
121          } elsif ("$ARGV[0]" =~ /^[-+]f/) {
122                  $doforw = ("$ARGV[0]" =~ /^\+/);
123          } elsif ("$ARGV[0]" =~ /^[-+]b/) {
# Line 169 | Line 173 | if ( !defined $recovery ) {
173          }
174   }
175   if ( $#dim != 5 ) {
176 <        @dim = split ' ', `getbbox -h $radscn`;
176 >        @dim = split ' ', `getbbox -h -w $radscn`;
177   }
178   die "Device entirely inside room!\n" if ( $dim[4] >= 0 );
179   if ( $dim[5] > 1e-5 ) {
# Line 186 | Line 190 | my $CIEuv =    'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
190                  'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
191                  'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
192                  'den=Xi+15*Yi+3*Zi;' .
193 <                'uprime=4*Xi/den;vprime=9*Yi/den;' ;
193 >                'uprime=if(Yi,4*Xi/den,4/19);' .
194 >                'vprime=if(Yi,9*Yi/den,9/19);' ;
195   my $FEPS = 1e-5;
196   my $ns = 2**$ttlog2;
197   my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1);
# Line 200 | Line 205 | if ( !defined $recovery ) {
205          }
206          close MYAVH;
207          # Generate octree
208 <        system "oconv -w $radscn > $octree";
208 >        system "oconv -w -f $radscn > $octree";
209          die "Could not compile scene\n" if ( $? );
210          # Add MGF description if requested
211          if ( $geout ) {
# Line 248 | Line 253 | if ( !defined $recovery ) {
253          }
254          print STDERR "Recover using: $0 -recover $td\n";
255   }
251 – # Open unbuffered progress file
252 – open(MYPH, ">> $td/phase.txt");
253 – {
254 –        my $ofh = select MYPH;
255 –        $| = 1;
256 –        select $ofh;
257 – }
256   $curphase = 0;
257   # Create data segments (all the work happens here)
258   if ( $tensortree ) {
# Line 274 | Line 272 | exec $rmtmp;
272   # Function to determine if next phase should be skipped or recovered
273   sub do_phase {
274          $curphase++;
275 <        if (defined $recovery) {
276 <                if ($recovery > $curphase) { return 0; }
277 <                if ($recovery == $curphase) { return -1; }
275 >        if ( defined $recovery ) {
276 >                if ( $recovery > $curphase ) { return 0; }
277 >                if ( $recovery == $curphase ) { return -1; }
278          }
279 +        open(MYPH, ">> $td/phase.txt");
280          print MYPH "$curphase\n";
281 +        close MYPH;
282          return 1;
283   }
284  
285 + # Check if we are in active phase (not skipping parts)
286 + sub active_phase {
287 +        if ( defined $recovery ) {
288 +                if ( $recovery > $curphase ) { return 0; }
289 +                if ( $recovery == $curphase ) { return -1; }
290 +        }
291 +        return 1;
292 + }
293 +
294 + # Function to run program and check output if in active phase
295 + sub run_check {
296 +        if ( !active_phase() ) { return; }
297 +        my $cmd = shift;
298 +        # print STDERR "Running: $cmd\n";
299 +        system $cmd;
300 +        die "Failure running: $cmd\n" if ( $? );
301 + }
302 +
303   #++++++++++++++ Tensor tree BSDF generation ++++++++++++++#
304   sub do_tree_bsdf {
305  
# Line 294 | Line 312 | sub do_tree_bsdf {
312   # Call rfluxmtx and process tensor tree BSDF for the given direction
313   sub do_ttree_dir {
314          my $forw = shift;
315 <        my $r = do_phase();
316 <        if (!$r) { return; }
299 <        $r = ($r < 0) ? " -r" : "";
315 >        my $dop = do_phase();
316 >        my $r = ($dop < 0) ? " -r" : "";
317          my $cmd;
318          if ( $tensortree == 3 ) {
319                  # Isotropic BSDF
# Line 315 | Line 332 | sub do_ttree_dir {
332                                  "| $rfluxmtx$r -fa -y $ns2 - $receivers -i $octree";
333                  } else {
334                          $cmd = "cnt $ns2 $ny $nx " .
335 <                                qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
336 <                                qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
337 <                                qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
338 <                                qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
339 <                                qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
340 <                                qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
341 <                                qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
335 >                                qq{| rcalc -e 'r1=rand(.8681*recno-.673892)' } .
336 >                                qq{-e 'r2=rand(-5.37138*recno+67.1737811)' } .
337 >                                qq{-e 'r3=rand(+3.17603772*recno+83.766771)' } .
338 >                                qq{-e 'Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' } .
339 >                                qq{-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' } .
340 >                                qq{-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' } .
341 >                                qq{-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' } .
342                                  qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } .
343                                  qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } .
344                                  "| $rfluxmtx$r -h -ff -y $ns2 - $receivers -i $octree";
# Line 335 | Line 352 | sub do_ttree_dir {
352                          $cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
353                  }
354          }
355 <        # print STDERR "Starting: $cmd\n";
356 <        system $cmd;
357 <        die "Failure running rfluxmtx" if ( $? );
355 >        if ( $dop ) {
356 >                # print STDERR "Running: $cmd\n";
357 >                system $cmd;
358 >                die "Failure running rfluxmtx" if ( $? );
359 >        }
360          ttree_out($forw);
361   }       # end of do_ttree_dir()
362  
# Line 409 | Line 428 | sub ttree_comp {
428                  }
429          }
430          if ($pctcull >= 0) {
431 <                my $avg = ( "$typ" =~ /^r[fb]/ ) ? " -a" : "";
431 >                my $avg = ( $dorecip && "$typ" =~ /^r[fb]/ ) ? " -a" : "";
432                  my $pcull = ("$spec" eq "Visible") ? $pctcull :
433                                                       (100 - (100-$pctcull)*.25) ;
434                  if ($windoz) {
# Line 420 | Line 439 | sub ttree_comp {
439                          $cmd .= " -of $src " .
440                                          "| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
441                  }
442 <                # print STDERR "Running: $cmd\n";
424 <                system "$cmd > $dest";
425 <                die "Failure running rttree_reduce" if ( $? );
442 >                run_check "$cmd > $dest";
443          } else {
444                  if ($windoz) {
445                          $cmd = "rcollate -ho -oc 1 $src | " . $cmd ;
446                  } else {
447                          $cmd .= " $src";
448                  }
449 <                open(DATOUT, "> $dest");
450 <                print DATOUT "{\n";
451 <                close DATOUT;
452 <                # print STDERR "Running: $cmd\n";
453 <                system "$cmd >> $dest";
454 <                die "Failure running rcalc" if ( $? );
455 <                open(DATOUT, ">> $dest");
456 <                for (my $i = ($tensortree==3)*$ns*$ns*$ns/2; $i-- > 0; ) {
457 <                        print DATOUT "0\n";
449 >                if ( active_phase() ) {
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";
459 >                        }
460 >                        print DATOUT "}\n";
461 >                        close DATOUT;
462                  }
442 –                print DATOUT "}\n";
443 –                close DATOUT;
463          }
464          if ( "$spec" ne "$curspec" ) {
465                  $wrapper .= " -s $spec";
# Line 463 | Line 482 | sub do_matrix_bsdf {
482   # Call rfluxmtx and process tensor tree BSDF for the given direction
483   sub do_matrix_dir {
484          my $forw = shift;
485 <        my $r = do_phase();
486 <        if (!$r) { return; }
468 <        $r = ($r < 0) ? " -r" : "";
469 <        my $cmd;
485 >        my $dop = do_phase();
486 >        my $r = ($dop < 0) ? " -r" : "";
487          my $sender = ($bsender,$fsender)[$forw];
488 <        $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
489 <        # print STDERR "Starting: $cmd\n";
490 <        system $cmd;
491 <        die "Failure running rfluxmtx" if ( $? );
488 >        my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
489 >        if ( $dop ) {
490 >                # print STDERR "Running: $cmd\n";
491 >                system $cmd;
492 >                die "Failure running rfluxmtx" if ( $? );
493 >        }
494          matrix_out($forw);
495   }       # end of do_matrix_dir()
496  
# Line 515 | Line 534 | sub matrix_comp {
534          } elsif ("$spec" eq "CIE-Z") {
535                  $cmd .= " -c 0.0241 0.1229 0.8530";
536          }
537 <        $cmd .= " $src | rcollate -ho -oc 145";
538 <        # print STDERR "Running: $cmd\n";
520 <        system "$cmd > $dest";
521 <        die "Failure running rmtxop" if ( $? );
537 >        $cmd .= " $src | getinfo -";
538 >        run_check "$cmd > $dest";
539          if ( "$spec" ne "$curspec" ) {
540                  $wrapper .= " -s $spec";
541                  $curspec = $spec;

Diff Legend

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