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.75 by greg, Tue Feb 14 07:06:55 2017 UTC vs.
Revision 2.79 by greg, Tue Apr 17 18:11:17 2018 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\"][-s \"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][{+|-}a][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom units] [input ..]\n";
13          exit 1;
14   }
15   my ($td,$radscn,$mgfscn,$octree,$fsender,$bsender,$receivers,$facedat,$behinddat,$rmtmp);
# Line 88 | Line 88 | my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6 -w-";
88   my $wrapper = "wrapBSDF";
89   my $tensortree = 0;
90   my $ttlog2 = 4;
91 + my $dorecip = 1;
92   my $nsamp = 2000;
93   my $mgfin = 0;
94   my $geout = 1;
# Line 115 | Line 116 | while ($#ARGV >= 0) {
116                  shift @ARGV;
117          } elsif ("$ARGV[0]" =~ /^[-+]C/) {
118                  $docolor = ("$ARGV[0]" =~ /^\+/);
119 +        } elsif ("$ARGV[0]" =~ /^[-+]a/) {
120 +                $dorecip = ("$ARGV[0]" =~ /^\+/);
121          } elsif ("$ARGV[0]" =~ /^[-+]f/) {
122                  $doforw = ("$ARGV[0]" =~ /^\+/);
123          } elsif ("$ARGV[0]" =~ /^[-+]b/) {
# Line 186 | Line 189 | $wrapper .= " -g $mgfscn" if ( $geout );
189   my $CIEuv =     'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' .
190                  'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' .
191                  'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' .
192 <                'den=Xi+15*Yi+3*Zi;' .
192 >                'den=Xi+15*Yi+3*Zi+1e-9;' .
193                  'uprime=4*Xi/den;vprime=9*Yi/den;' ;
194   my $FEPS = 1e-5;
195   my $ns = 2**$ttlog2;
# Line 424 | Line 427 | sub ttree_comp {
427                  }
428          }
429          if ($pctcull >= 0) {
430 <                my $avg = ( "$typ" =~ /^r[fb]/ ) ? " -a" : "";
430 >                my $avg = ( $dorecip && "$typ" =~ /^r[fb]/ ) ? " -a" : "";
431                  my $pcull = ("$spec" eq "Visible") ? $pctcull :
432                                                       (100 - (100-$pctcull)*.25) ;
433                  if ($windoz) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines