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.75 by greg, Tue Feb 14 07:06:55 2017 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 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 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) {
173 <        @dim = split ' ', `getbbox -h $radscn`;
172 > if ( $#dim != 5 ) {
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) {
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";
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 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   }
251 – open(MYPH, ">> $td/phase.txt");
252 – {               # unbuffer output to MYPH
253 –        my $ofh = select MYPH;
254 –        $| = 1;
255 –        select $ofh;
256 – }
252   $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 – }
253   # Create data segments (all the work happens here)
254   if ( $tensortree ) {
255          do_tree_bsdf();
# Line 272 | Line 257 | if ( $tensortree ) {
257          do_matrix_bsdf();
258   }
259   # Output XML
260 < print STDERR "Running: $wrapper\n";
260 > # print STDERR "Running: $wrapper\n";
261   system "$wrapper -C \"Created by: genBSDF @savedARGV\"";
262   die "Could not wrap BSDF data\n" if ( $? );
263   # Clean up temporary files and exit
264   exec $rmtmp;
265  
266 < #-------------- End of main program segment --------------#
266 > #============== End of main program segment ==============#
267  
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; }
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 292 | 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; }
297 <        $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 313 | Line 328 | sub do_ttree_dir {
328                                  "| $rfluxmtx$r -fa -y $ns2 - $receivers -i $octree";
329                  } else {
330                          $cmd = "cnt $ns2 $ny $nx " .
331 <                                qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
332 <                                qq{-e "r2=rand(-5.37138*recno+67.1737811)" } .
333 <                                qq{-e "r3=rand(+3.17603772*recno+83.766771)" } .
334 <                                qq{-e "Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)" } .
335 <                                qq{-e "xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]" } .
336 <                                qq{-e "yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]" } .
337 <                                qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
331 >                                qq{| rcalc -e 'r1=rand(.8681*recno-.673892)' } .
332 >                                qq{-e 'r2=rand(-5.37138*recno+67.1737811)' } .
333 >                                qq{-e 'r3=rand(+3.17603772*recno+83.766771)' } .
334 >                                qq{-e 'Dx=1-2*(\$1+r1)/$ns;Dy:0;Dz=sqrt(1-Dx*Dx)' } .
335 >                                qq{-e 'xp=(\$3+r2)*(($dim[1]-$dim[0])/$nx)+$dim[0]' } .
336 >                                qq{-e 'yp=(\$2+r3)*(($dim[3]-$dim[2])/$ny)+$dim[2]' } .
337 >                                qq{-e 'zp=$dim[5-$forw]' -e 'myDz=Dz*($forw*2-1)' } .
338                                  qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } .
339                                  qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } .
340                                  "| $rfluxmtx$r -h -ff -y $ns2 - $receivers -i $octree";
# Line 333 | 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 418 | 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";
422 <                system "$cmd > $dest";
423 <                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                  }
440 –                print DATOUT "}\n";
441 –                close DATOUT;
459          }
460          if ( "$spec" ne "$curspec" ) {
461                  $wrapper .= " -s $spec";
# Line 461 | 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; }
466 <        $r = ($r < 0) ? " -r" : "";
467 <        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 513 | 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";
518 <        system "$cmd > $dest";
519 <        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