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

Comparing ray/src/util/genBSDF.pl (file contents):
Revision 2.73 by greg, Tue Jan 31 23:13:17 2017 UTC vs.
Revision 2.75 by greg, Tue Feb 14 07:06:55 2017 UTC

# 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;
# Line 170 | 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 201 | 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 328 | 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";

Diff Legend

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