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.70 by greg, Mon Sep 19 16:20:08 2016 UTC vs.
Revision 2.76 by greg, Wed May 31 17:25:21 2017 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);
# Line 84 | 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 115 | 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 170 | 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 201 | Line 204 | if ( !defined $recovery ) {
204          }
205          close MYAVH;
206          # Generate octree
207 <        system "oconv -w $radscn > $octree";
207 >        system "oconv -w -f $radscn > $octree";
208          die "Could not compile scene\n" if ( $? );
209          # Add MGF description if requested
210          if ( $geout ) {
# Line 249 | Line 252 | if ( !defined $recovery ) {
252          }
253          print STDERR "Recover using: $0 -recover $td\n";
254   }
252 # Open unbuffered progress file
253 open(MYPH, ">> $td/phase.txt");
254 {
255        my $ofh = select MYPH;
256        $| = 1;
257        select $ofh;
258 }
255   $curphase = 0;
256   # Create data segments (all the work happens here)
257   if ( $tensortree ) {
# Line 279 | Line 275 | sub do_phase {
275                  if ( $recovery > $curphase ) { return 0; }
276                  if ( $recovery == $curphase ) { return -1; }
277          }
278 +        open(MYPH, ">> $td/phase.txt");
279          print MYPH "$curphase\n";
280 +        close MYPH;
281          return 1;
282   }
283  
# Line 333 | Line 331 | sub do_ttree_dir {
331                                  "| $rfluxmtx$r -fa -y $ns2 - $receivers -i $octree";
332                  } else {
333                          $cmd = "cnt $ns2 $ny $nx " .
334 <                                qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
335 <                                qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
336 <                                qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
337 <                                qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
338 <                                qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
339 <                                qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
340 <                                qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
334 >                                qq{| rcalc -e 'r1=rand(.8681*recno-.673892)' } .
335 >                                qq{-e 'r2=rand(-5.37138*recno+67.1737811)' } .
336 >                                qq{-e 'r3=rand(+3.17603772*recno+83.766771)' } .
337 >                                qq{-e 'Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' } .
338 >                                qq{-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' } .
339 >                                qq{-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' } .
340 >                                qq{-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' } .
341                                  qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } .
342                                  qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } .
343                                  "| $rfluxmtx$r -h -ff -y $ns2 - $receivers -i $octree";
# Line 353 | Line 351 | sub do_ttree_dir {
351                          $cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
352                  }
353          }
354 <        run_check $cmd;
354 >        if ( $dop ) {
355 >                # print STDERR "Running: $cmd\n";
356 >                system $cmd;
357 >                die "Failure running rfluxmtx" if ( $? );
358 >        }
359          ttree_out($forw);
360   }       # end of do_ttree_dir()
361  
# Line 425 | Line 427 | sub ttree_comp {
427                  }
428          }
429          if ($pctcull >= 0) {
430 <                my $avg = ( "$typ" =~ /^r[fb]/ ) ? " -a" : "";
430 >                my $avg = ( $dorecip && "$typ" =~ /^r[fb]/ ) ? " -a" : "";
431                  my $pcull = ("$spec" eq "Visible") ? $pctcull :
432                                                       (100 - (100-$pctcull)*.25) ;
433                  if ($windoz) {
# Line 482 | Line 484 | sub do_matrix_dir {
484          my $dop = do_phase();
485          my $r = ($dop < 0) ? " -r" : "";
486          my $sender = ($bsender,$fsender)[$forw];
487 <        run_check "$rfluxmtx$r -fd $sender $receivers -i $octree";
487 >        my $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
488 >        if ( $dop ) {
489 >                # print STDERR "Running: $cmd\n";
490 >                system $cmd;
491 >                die "Failure running rfluxmtx" if ( $? );
492 >        }
493          matrix_out($forw);
494   }       # end of do_matrix_dir()
495  
# Line 526 | Line 533 | sub matrix_comp {
533          } elsif ("$spec" eq "CIE-Z") {
534                  $cmd .= " -c 0.0241 0.1229 0.8530";
535          }
536 <        $cmd .= " $src | rcollate -ho -oc 145";
536 >        $cmd .= " $src | getinfo -";
537          run_check "$cmd > $dest";
538          if ( "$spec" ne "$curspec" ) {
539                  $wrapper .= " -s $spec";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines