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.10 by greg, Tue Feb 22 22:51:23 2011 UTC vs.
Revision 2.11 by greg, Thu Feb 24 20:14:26 2011 UTC

# Line 106 | Line 106 | KprojOmega = PI * if(Kbin-.5,
106   # Compute Klems bin from exiting ray direction (forward or backward)
107   my $kcal = '
108   DEGREE : PI/180;
109 + abs(x) : if(x, x, -x);
110   Acos(x) : 1/DEGREE * if(x-1, 0, if(-1-x, 0, acos(x)));
111   posangle(a) : if(-a, a + 2*PI, a);
112   Atan2(y,x) : 1/DEGREE * posangle(atan2(y,x));
# Line 126 | Line 127 | kbin2(pol,azi) = select(kfindrow(1, pol),
127                  kaccum(7) + kazn(azi,360/knaz(8)),
128                  kaccum(8) + kazn(azi,360/knaz(9))
129          );
130 < kbin = if(Dz, kbin2(Acos(Dz),Atan2(Dy,Dx)), kbin2(Acos(-Dz),Atan2(-Dy,-Dx)));
130 > kbin = kbin2(Acos(abs(Dz)),Atan2(Dy,Dx));
131   ';
132   my $ndiv = 145;
133   my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + .5);
# Line 146 | Line 147 | my $rccmd = "rcalc -e '$tcal' " .
147          q{-if3 -e '$1=(0.265*$1+0.670*$2+0.065*$3)/KprojOmega'};
148   if ( $doforw ) {
149   $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
150 <        "-e 'xp=(\$3+rand(.35*recno-15))*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
151 <        "-e 'yp=(\$2+rand(.86*recno+11))*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
150 >        "-e 'xp=(\$3+rand(.12*recno+288))*(($dim[1]-$dim[0])/$nx)+$dim[0]' " .
151 >        "-e 'yp=(\$2+rand(.37*recno-44))*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
152          "-e 'zp:$dim[4]' " .
153 <        q{-e 'Kbin=$1;x1=rand(1.21*recno+2.75);x2=rand(-3.55*recno-7.57)' } .
153 >        q{-e 'Kbin=$1;x1=rand(2.75*recno+3.1);x2=rand(-2.01*recno-3.37)' } .
154          q{-e '$1=xp-Dx;$2=yp-Dy;$3=zp-Dz;$4=Dx;$5=Dy;$6=Dz' } .
155          "| $rtcmd";
156   system "$cmd" || die "Failure running: $cmd\n";
# Line 164 | Line 165 | $cmd = "cnt $ndiv $ny $nx | rcalc -of -e '$tcal' " .
165          "-e 'yp=(\$2+rand(.86*recno+11))*(($dim[3]-$dim[2])/$ny)+$dim[2]' " .
166          "-e 'zp:$dim[5]' " .
167          q{-e 'Kbin=$1;x1=rand(1.21*recno+2.75);x2=rand(-3.55*recno-7.57)' } .
168 <        q{-e '$1=xp+Dx;$2=yp+Dy;$3=zp+Dz;$4=-Dx;$5=-Dy;$6=-Dz' } .
168 >        q{-e '$1=xp-Dx;$2=yp-Dy;$3=zp+Dz;$4=Dx;$5=Dy;$6=-Dz' } .
169          "| $rtcmd";
170   system "$cmd" || die "Failure running: $cmd\n";
171   @tbarr = `$rccmd $td/$bmodnm.flt`;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines