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.54 by greg, Wed Mar 25 22:50:48 2015 UTC vs.
Revision 2.64 by greg, Wed Jul 13 00:51:17 2016 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\"][-f \"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][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom units] [input ..]\n";
13          exit 1;
14   }
15   my ($td,$radscn,$mgfscn,$octree,$fsender,$bsender,$receivers,$facedat,$behinddat,$rmtmp);
# Line 39 | Line 39 | if ($windoz) {
39          $tbz = "$td\\tbz.dat";
40          $rbz = "$td\\rbz.dat";
41          chomp $td;
42 <        $rmtmp = "rmdir /S /Q $td";
42 >        $rmtmp = "rd /S /Q $td";
43   } else {
44          $td = mkdtemp("/tmp/genBSDF.XXXXXX");
45          chomp $td;
# Line 104 | Line 104 | while ($#ARGV >= 0) {
104          } elsif ("$ARGV[0]" eq "-t") {
105                  # Use value < 0 for rttree_reduce bypass
106                  $pctcull = $ARGV[1];
107 +                if ($pctcull >= 100) {
108 +                        die "Illegal -t culling percentage, must be < 100\n";
109 +                }
110                  shift @ARGV;
111          } elsif ("$ARGV[0]" =~ /^-t[34]$/) {
112                  $tensortree = substr($ARGV[0], 2, 1);
113                  $ttlog2 = $ARGV[1];
114                  shift @ARGV;
115 <        } elsif ("$ARGV[0]" eq "-f") {
115 >        } elsif ("$ARGV[0]" eq "-s") {
116                  $wrapper .= " -f \"$ARGV[1]\"";
117                  shift @ARGV;
118          } elsif ("$ARGV[0]" eq "-W") {
# Line 149 | Line 152 | if ( $mgfin ) {
152   if ($#dim != 5) {
153          @dim = split ' ', `getbbox -h $radscn`;
154   }
155 < print STDERR "Warning: Device extends into room\n" if ($dim[5] > 1e-5);
156 < $wrapper .= ' -f "t=' . ($dim[5] - $dim[4]) . ';w=' . ($dim[1] - $dim[0]) .
155 > die "Device entirely inside room!\n" if ($dim[4] >= 0);
156 > if ($dim[5] > 1e-5) {
157 >        print STDERR "Warning: Device extends into room\n";
158 > } elsif ($dim[5]*$dim[5] < .01*($dim[1]-$dim[0])*($dim[3]-$dim[2])) {
159 >        print STDERR "Warning: Device far behind Z==0 plane\n";
160 > }
161 > # Assume Zmax==0 to derive thickness so pkgBSDF will work
162 > $wrapper .= ' -f "t=' . (-$dim[4]) . ';w=' . ($dim[1] - $dim[0]) .
163                  ';h=' . ($dim[3] - $dim[2]) . '"';
164   # Generate octree
165   system "oconv -w $radscn > $octree";
# Line 171 | Line 180 | if ( $geout ) {
180          $wrapper .= " -g $mgfscn";
181   }
182   # Create receiver & sender surfaces (rectangular)
183 + my $FEPS = 1e-5;
184   my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1);
185   my $ny = int($nsamp/$nx + 1);
186   $nsamp = $nx * $ny;
187   my $ns = 2**$ttlog2;
188   open(RADSCN, "> $receivers");
189 < print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=sc$ns\n" : "h=kf\n");
190 < print RADSCN '#@rfluxmtx ' . "u=Y o=$facedat\n\n";
189 > print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n");
190 > print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n";
191   print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n";
192   print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n";
193 < print RADSCN '#@rfluxmtx ' . "u=Y o=$behinddat\n\n";
193 > print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n");
194 > print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n";
195   print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n";
196   print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n";
197   close RADSCN;
# Line 188 | Line 199 | close RADSCN;
199   $rfluxmtx .= " -n $nproc -c $nsamp";
200   if ( $tensortree != 3 ) {       # Isotropic tensor tree is exception
201          open (RADSCN, "> $fsender");
202 <        print RADSCN '#@rfluxmtx u=Y ' . ($tensortree ? "h=sc$ns\n\n" : "h=kf\n\n");
202 >        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
203          print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
204 <        printf RADSCN "\t%f\t%f\t%f\n", $dim[0], $dim[2], $dim[4];
205 <        printf RADSCN "\t%f\t%f\t%f\n", $dim[0], $dim[3], $dim[4];
206 <        printf RADSCN "\t%f\t%f\t%f\n", $dim[1], $dim[3], $dim[4];
207 <        printf RADSCN "\t%f\t%f\t%f\n", $dim[1], $dim[2], $dim[4];
204 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
205 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
206 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
207 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
208          close RADSCN;
209          open (RADSCN, "> $bsender");
210 <        print RADSCN '#@rfluxmtx u=Y ' . ($tensortree ? "h=sc$ns\n\n" : "h=kf\n\n");
211 <        print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
212 <        printf RADSCN "\t%f\t%f\t%f\n", $dim[0], $dim[2], $dim[5];
213 <        printf RADSCN "\t%f\t%f\t%f\n", $dim[1], $dim[2], $dim[5];
214 <        printf RADSCN "\t%f\t%f\t%f\n", $dim[1], $dim[3], $dim[5];
215 <        printf RADSCN "\t%f\t%f\t%f\n", $dim[0], $dim[3], $dim[5];
210 >        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
211 >        print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
212 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
213 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
214 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
215 >        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
216          close RADSCN;
217   }
218   # Calculate CIE (u',v') from Radiance RGB:
# Line 217 | Line 228 | if ( $tensortree ) {
228          do_matrix_bsdf();
229   }
230   # Output XML
220 my $old_fh = select(STDOUT);
221 $| = 1;
222 select($old_fh);
223 print "<!-- Created by: genBSDF @savedARGV -->\n";
231   # print STDERR "Running: $wrapper\n";
232 < system $wrapper;
232 > system "$wrapper -C \"Created by: genBSDF @savedARGV\"";
233   die "Could not wrap BSDF data\n" if ( $? );
234   # Clean up temporary files and exit
235   exec $rmtmp;
# Line 355 | Line 362 | sub ttree_comp {
362          if ($pctcull >= 0) {
363                  my $avg = ( "$typ" =~ /^r[fb]/ ) ? " -a" : "";
364                  my $pcull = ("$spec" eq "Visible") ? $pctcull :
365 <                                                     (100 - (100-$pctcull)/3) ;
365 >                                                     (100 - (100-$pctcull)*.25) ;
366                  if ($windoz) {
367                          $cmd = "rcollate -ho -oc 1 $src | " .
368                                          $cmd .
# Line 450 | Line 457 | sub matrix_comp {
457          my $dest = shift;
458          my $cmd = "rmtxop -fa -t";
459          if ("$spec" eq "Visible") {
460 <                $cmd .= " -c 0.265 0.670 0.065";
460 >                $cmd .= " -c 0.2651 0.6701 0.0648";
461          } elsif ("$spec" eq "CIE-X") {
462 <                $cmd .= " -c 0.514 0.324 0.162";
462 >                $cmd .= " -c 0.5141 0.3239 0.1620";
463          } elsif ("$spec" eq "CIE-Z") {
464 <                $cmd .= " -c 0.024 0.123 0.853";
464 >                $cmd .= " -c 0.0241 0.1229 0.8530";
465          }
466          $cmd .= " $src | rcollate -ho -oc 145";
467          # print STDERR "Running: $cmd\n";
468          system "$cmd > $dest";
469 <        die "Failure running rttree_reduce" if ( $? );
469 >        die "Failure running rmtxop" if ( $? );
470          if ( "$spec" ne "$curspec" ) {
471                  $wrapper .= " -s $spec";
472                  $curspec = $spec;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines