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.65 by greg, Thu Aug 18 15:09:29 2016 UTC vs.
Revision 2.66 by greg, Fri Sep 16 17:54:56 2016 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);
17 < if ($windoz) {
16 > my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz,$cph,$sav);
17 > my ($curphase, $recovery);
18 > if ($#ARGV == 1 && "$ARGV[0]" =~ /^-rec/) {
19 >        $td = $ARGV[1];
20 >        open(MYAVH, "< $td/savedARGV.txt") or die "$td: invalid path\n";
21 >        @ARGV = <MYAVH>;
22 >        close MYAVH;
23 >        chomp @ARGV;
24 >        if (open(MYPH, "< $td/phase.txt")) {
25 >                while (<MYPH>) {
26 >                        chomp($recovery = $_);
27 >                }
28 >                close MYPH;
29 >        }
30 > } elsif ($windoz) {
31          my $tmploc = `echo \%TMP\%`;
32 <        chomp($tmploc);
32 >        chomp $tmploc;
33          $td = mkdtemp("$tmploc\\genBSDF.XXXXXX");
34 + } else {
35 +        $td = mkdtemp("/tmp/genBSDF.XXXXXX");
36 +        chomp $td;
37 + }
38 + if ($windoz) {
39          $radscn = "$td\\device.rad";
40          $mgfscn = "$td\\device.mgf";
41          $octree = "$td\\device.oct";
# Line 38 | Line 56 | if ($windoz) {
56          $rfz = "$td\\rfz.dat";
57          $tbz = "$td\\tbz.dat";
58          $rbz = "$td\\rbz.dat";
59 <        chomp $td;
59 >        $cph = "$td\\phase.txt";
60          $rmtmp = "rd /S /Q $td";
61   } else {
44 –        $td = mkdtemp("/tmp/genBSDF.XXXXXX");
45 –        chomp $td;
62          $radscn = "$td/device.rad";
63          $mgfscn = "$td/device.mgf";
64          $octree = "$td/device.oct";
# Line 63 | Line 79 | if ($windoz) {
79          $rfz = "$td/rfz.dat";
80          $tbz = "$td/tbz.dat";
81          $rbz = "$td/rbz.dat";
82 +        $cph = "$td/phase.txt";
83          $rmtmp = "rm -rf $td";
84   }
85   my @savedARGV = @ARGV;
# Line 136 | Line 153 | while ($#ARGV >= 0) {
153   }
154   # Check that we're actually being asked to do something
155   die "Must have at least one of +forward or +backward\n" if (!$doforw && !$doback);
139 – # Issue warning for unhandled reciprocity case
140 – print STDERR "Warning: recommend both +forward and +backward with -t3\n" if
141 –                ($tensortree==3 && !($doforw && $doback));
156   $wrapper .= $tensortree ? " -a t$tensortree" : " -a kf -c";
157   $wrapper .= " -u $gunit";
158 < # Get scene description and dimensions
159 < if ( $mgfin ) {
160 <        system "mgf2rad @ARGV > $radscn";
161 <        die "Could not load MGF input\n" if ( $? );
162 < } else {
163 <        system "xform -e @ARGV > $radscn";
164 <        die "Could not load Radiance input\n" if ( $? );
158 > if (!defined $recovery) {
159 >        # Issue warning for unhandled reciprocity case
160 >        print STDERR "Warning: recommend both +forward and +backward with -t3\n" if
161 >                        ($tensortree==3 && !($doforw && $doback));
162 >        # Get scene description and dimensions
163 >        if ( $mgfin ) {
164 >                system "mgf2rad @ARGV > $radscn";
165 >                die "Could not load MGF input\n" if ( $? );
166 >        } else {
167 >                system "xform -e @ARGV > $radscn";
168 >                die "Could not load Radiance input\n" if ( $? );
169 >        }
170   }
171   if ($#dim != 5) {
172          @dim = split ' ', `getbbox -h $radscn`;
# Line 161 | Line 180 | if ($dim[5] > 1e-5) {
180   # Assume Zmax==0 to derive thickness so pkgBSDF will work
181   $wrapper .= ' -f "t=' . (-$dim[4]) . ';w=' . ($dim[1] - $dim[0]) .
182                  ';h=' . ($dim[3] - $dim[2]) . '"';
183 < # Generate octree
184 < system "oconv -w $radscn > $octree";
185 < die "Could not compile scene\n" if ( $? );
186 < # Add MGF description if requested
187 < if ( $geout ) {
188 <        open(MGFSCN, "> $mgfscn");
170 <        printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
171 <        close MGFSCN;
172 <        if ( $mgfin ) {
173 <                system qq{mgfilt "#,o,xf,c,cxy,cspec,cmix,m,sides,rd,td,rs,ts,ir,v,p,n,f,fh,sph,cyl,cone,prism,ring,torus" @ARGV >> $mgfscn};
174 <        } else {
175 <                system "rad2mgf $radscn >> $mgfscn";
176 <        }
177 <        open(MGFSCN, ">> $mgfscn");
178 <        print MGFSCN "xf\n";
179 <        close MGFSCN;
180 <        $wrapper .= " -g $mgfscn";
181 < }
182 < # Create receiver & sender surfaces (rectangular)
183 > # Calculate CIE (u',v') from Radiance RGB:
184 > my $CIEuv =     'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
185 >                'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
186 >                'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
187 >                'den=Xi+15*Yi+3*Zi;' .
188 >                'uprime=4*Xi/den;vprime=9*Yi/den;' ;
189   my $FEPS = 1e-5;
190 + my $ns = 2**$ttlog2;
191   my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1);
192   my $ny = int($nsamp/$nx + 1);
193   $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";
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 ' . ($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;
198 – # Finish rfluxmtx command and prepare sender surfaces
194   $rfluxmtx .= " -n $nproc -c $nsamp";
195 < if ( $tensortree != 3 ) {       # Isotropic tensor tree is exception
196 <        open (RADSCN, "> $fsender");
197 <        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
198 <        print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
199 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
200 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
201 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
202 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
195 > if (!defined $recovery) {
196 >        open(MYAVH, "> $td/savedARGV.txt");
197 >        foreach (@savedARGV) {
198 >                print MYAVH "$_\n";
199 >        }
200 >        close MYAVH;
201 >        # Generate octree
202 >        system "oconv -w $radscn > $octree";
203 >        die "Could not compile scene\n" if ( $? );
204 >        # Add MGF description if requested
205 >        if ( $geout ) {
206 >                open(MGFSCN, "> $mgfscn");
207 >                printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
208 >                close MGFSCN;
209 >                if ( $mgfin ) {
210 >                        system qq{mgfilt "#,o,xf,c,cxy,cspec,cmix,m,sides,rd,td,rs,ts,ir,v,p,n,f,fh,sph,cyl,cone,prism,ring,torus" @ARGV >> $mgfscn};
211 >                } else {
212 >                        system "rad2mgf $radscn >> $mgfscn";
213 >                }
214 >                open(MGFSCN, ">> $mgfscn");
215 >                print MGFSCN "xf\n";
216 >                close MGFSCN;
217 >                $wrapper .= " -g $mgfscn";
218 >        }
219 >        # Create receiver & sender surfaces (rectangular)
220 >        open(RADSCN, "> $receivers");
221 >        print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n");
222 >        print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n";
223 >        print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n";
224 >        print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n";
225 >        print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n");
226 >        print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n";
227 >        print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n";
228 >        print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n";
229          close RADSCN;
230 <        open (RADSCN, "> $bsender");
231 <        print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
232 <        print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
233 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
234 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
235 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
236 <        printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
237 <        close RADSCN;
230 >        # Prepare sender surfaces
231 >        if ( $tensortree != 3 ) {       # Isotropic tensor tree is exception
232 >                open (RADSCN, "> $fsender");
233 >                print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n");
234 >                print RADSCN "void polygon fwd_sender\n0\n0\n12\n";
235 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS;
236 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS;
237 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS;
238 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS;
239 >                close RADSCN;
240 >                open (RADSCN, "> $bsender");
241 >                print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n");
242 >                print RADSCN "void polygon bwd_sender\n0\n0\n12\n";
243 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS;
244 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS;
245 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS;
246 >                printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS;
247 >                close RADSCN;
248 >        }
249 >        print STDERR "Recover using: $0 -recover $td\n";
250   }
251 < # Calculate CIE (u',v') from Radiance RGB:
252 < my $CIEuv =     'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
253 <                'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
254 <                'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
255 <                'den=Xi+15*Yi+3*Zi;' .
256 <                'uprime=4*Xi/den;vprime=9*Yi/den;' ;
251 > open(MYPH, ">> $td/phase.txt");
252 > {               # unbuffer output to MYPH
253 >        my $ofh = select MYPH;
254 >        $| = 1;
255 >        select $ofh;
256 > }
257 > $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 > }
268   # Create data segments (all the work happens here)
269   if ( $tensortree ) {
270          do_tree_bsdf();
# Line 228 | Line 272 | if ( $tensortree ) {
272          do_matrix_bsdf();
273   }
274   # Output XML
275 < # print STDERR "Running: $wrapper\n";
275 > print STDERR "Running: $wrapper\n";
276   system "$wrapper -C \"Created by: genBSDF @savedARGV\"";
277   die "Could not wrap BSDF data\n" if ( $? );
278   # Clean up temporary files and exit
# Line 248 | Line 292 | sub do_tree_bsdf {
292   # Call rfluxmtx and process tensor tree BSDF for the given direction
293   sub do_ttree_dir {
294          my $forw = shift;
295 +        my $r = do_phase();
296 +        if (!$r) { return; }
297 +        $r = ($r < 0) ? " -r" : "";
298          my $cmd;
299          if ( $tensortree == 3 ) {
300                  # Isotropic BSDF
# Line 263 | Line 310 | sub do_ttree_dir {
310                                  qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
311                                  qq{-e "\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz" } .
312                                  qq{-e "\$4=Dx;\$5=Dy;\$6=myDz" } .
313 <                                "| $rfluxmtx -fa -y $ns2 - $receivers -i $octree";
313 >                                "| $rfluxmtx$r -fa -y $ns2 - $receivers -i $octree";
314                  } else {
315                          $cmd = "cnt $ns2 $ny $nx " .
316                                  qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } .
# Line 275 | Line 322 | sub do_ttree_dir {
322                                  qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } .
323                                  qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } .
324                                  qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } .
325 <                                "| $rfluxmtx -h -ff -y $ns2 - $receivers -i $octree";
325 >                                "| $rfluxmtx$r -h -ff -y $ns2 - $receivers -i $octree";
326                  }
327          } else {
328                  # Anisotropic BSDF
329                  my $sender = ($bsender,$fsender)[$forw];
330                  if ($windoz) {
331 <                        $cmd = "$rfluxmtx -fa $sender $receivers -i $octree";
331 >                        $cmd = "$rfluxmtx$r -fa $sender $receivers -i $octree";
332                  } else {
333 <                        $cmd = "$rfluxmtx -h -ff $sender $receivers -i $octree";
333 >                        $cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree";
334                  }
335          }
336 <        # print STDERR "Starting: $cmd\n";
336 >        print STDERR "Starting: $cmd\n";
337          system $cmd;
338          die "Failure running rfluxmtx" if ( $? );
339          ttree_out($forw);
# Line 371 | Line 418 | sub ttree_comp {
418                          $cmd .= " -of $src " .
419                                          "| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2";
420                  }
421 <                # print STDERR "Running: $cmd\n";
421 >                print STDERR "Running: $cmd\n";
422                  system "$cmd > $dest";
423                  die "Failure running rttree_reduce" if ( $? );
424          } else {
# Line 383 | Line 430 | sub ttree_comp {
430                  open(DATOUT, "> $dest");
431                  print DATOUT "{\n";
432                  close DATOUT;
433 <                # print STDERR "Running: $cmd\n";
433 >                print STDERR "Running: $cmd\n";
434                  system "$cmd >> $dest";
435                  die "Failure running rcalc" if ( $? );
436                  open(DATOUT, ">> $dest");
# Line 414 | Line 461 | sub do_matrix_bsdf {
461   # Call rfluxmtx and process tensor tree BSDF for the given direction
462   sub do_matrix_dir {
463          my $forw = shift;
464 +        my $r = do_phase();
465 +        if (!$r) { return; }
466 +        $r = ($r < 0) ? " -r" : "";
467          my $cmd;
468          my $sender = ($bsender,$fsender)[$forw];
469 <        $cmd = "$rfluxmtx -fd $sender $receivers -i $octree";
470 <        # print STDERR "Starting: $cmd\n";
469 >        $cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree";
470 >        print STDERR "Starting: $cmd\n";
471          system $cmd;
472          die "Failure running rfluxmtx" if ( $? );
473          matrix_out($forw);
# Line 464 | Line 514 | sub matrix_comp {
514                  $cmd .= " -c 0.0241 0.1229 0.8530";
515          }
516          $cmd .= " $src | rcollate -ho -oc 145";
517 <        # print STDERR "Running: $cmd\n";
517 >        print STDERR "Running: $cmd\n";
518          system "$cmd > $dest";
519          die "Failure running rmtxop" if ( $? );
520          if ( "$spec" ne "$curspec" ) {

Diff Legend

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