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.89 by greg, Wed Mar 2 21:15:18 2022 UTC vs.
Revision 2.92 by greg, Sun Dec 8 17:36:32 2024 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);
16 > my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz);
17   my ($curphase, $recovery);
18   if ($#ARGV == 1 && "$ARGV[0]" =~ /^-rec/) {
19          $td = $ARGV[1];
# Line 57 | Line 57 | if ($windoz) {
57          $rfz = "$td\\rfz.dat";
58          $tbz = "$td\\tbz.dat";
59          $rbz = "$td\\rbz.dat";
60        $cph = "$td\\phase.txt";
60          $rmtmp = "rd /S /Q $td";
61   } else {
62          $radscn = "$td/device.rad";
# Line 80 | Line 79 | if ($windoz) {
79          $rfz = "$td/rfz.dat";
80          $tbz = "$td/tbz.dat";
81          $rbz = "$td/rbz.dat";
83        $cph = "$td/phase.txt";
82          $rmtmp = "rm -rf $td";
83   }
84   my @savedARGV = @ARGV;
# Line 165 | Line 163 | if ( !defined $recovery ) {
163                          ($tensortree==3 && !($doforw && $doback));
164          # Get scene description
165          if ( $mgfin ) {
166 <                system "mgf2rad @ARGV > $radscn";
166 >                my $mgfcv = $docolor ? "mgf2rad -s" : "mgf2rad";
167 >                system "$mgfcv @ARGV > $radscn";
168                  die "Could not load MGF input\n" if ( $? );
169          } else {
170                  system "xform -e @ARGV > $radscn";
# Line 197 | Line 196 | my $ns = 2**$ttlog2;
196   my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1);
197   my $ny = int($nsamp/$nx + 1);
198   $nsamp = $nx * $ny;
199 < $rfluxmtx .= " -n $nproc -c $nsamp";
199 > $rfluxmtx .= " -n $nproc -c $nsamp -cs 3";
200   if ( !defined $recovery ) {
201          open(MYAVH, "> $td/savedARGV.txt");
202          foreach (@savedARGV) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines