ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cal/cal/klems_int.cal
(Generate patch)

Comparing ray/src/cal/cal/klems_int.cal (file contents):
Revision 1.2 by greg, Mon Jun 15 19:31:24 2009 UTC vs.
Revision 1.7 by greg, Mon Feb 20 02:56:19 2012 UTC

# Line 1 | Line 1
1   { RCSid $Id$ }
2   {
3 <        Compute interior bin for (full) Klems BSDF basis
3 >        Compute interior bin for (full) Klems BSDF basis (0-144)
4  
5          Modified from Tregenza.cal, which is similar but different
6  
7          6/14/2009       G. Ward
8   }
9   DEGREE : PI/180;
10 < Acos(x) : 1/DEGREE * if(x-1, 0, if(-1-x, 0, acos(x)));
11 < posangle(a) : if(-a, a + 2*PI, a);
12 < Atan2(y,x) : 1/DEGREE * posangle(atan2(y,x));
10 > Acos(x) : if(x-1, 0, if(-1-x, PI, acos(x))) / DEGREE;
11 > posangle(a) : if(-a, a + 2*PI, a) / DEGREE;
12 > Atan2(y,x) : posangle(atan2(y,x));
13  
14   kpola(r) : select(r, 5, 15, 25, 35, 45, 55, 65, 75, 90);
15   knaz(r) : select(r, 1, 8, 16, 20, 24, 24, 24, 16, 12);
# Line 17 | Line 17 | kaccum(r) : if(r-.5, knaz(r) + kaccum(r-1), 0);
17   kfindrow(r, pol) : if(r-kpola(0)+.5, r,
18                  if(pol-kpola(r), kfindrow(r+1, pol), r) );
19  
20 < kazn(azi,inc) : if(azi-(360-.5*inc), 0, floor((azi+.5*inc)/inc));
20 > kazn(azi,inc) : if((360-.5*inc)-azi, floor((azi+.5*inc)/inc), 0);
21  
22   kbin2(pol,azi) = select(kfindrow(1, pol),
23                  kazn(azi,360/knaz(1)),
# Line 33 | Line 33 | kbin2(pol,azi) = select(kfindrow(1, pol),
33  
34   kbin(Nx,Ny,Nz,Ux,Uy,Uz) = kbin2(Acos(-Dx*Nx-Dy*Ny-Dz*Nz),
35          Atan2(-Dx*Ux-Dy*Uy-Dz*Uz,
36 <                -Dx*(Ny*Uz-Nz*Uy) - Dy*(Nz*Ux-Nx*Uz) - Dz*(Nx*Uy-Ny*Ux)));
36 >                -Dx*(Uy*Nz-Uz*Ny) - Dy*(Uz*Nx-Ux*Nz) - Dz*(Ux*Ny-Uy*Nx)));
37                                  
38 < kbinN = kbin(0,1,0, 0,0,1);     { North bins }
39 < kbinE = kbin(1,0,0, 0,0,1);     { East bins }
40 < kbinS = kbin(0,-1,0, 0,0,1);    { South bins }
41 < kbinW = kbin(-1,0,0, 0,0,1);    { West bins }
38 > kbinN = kbin(0,-1,0, 0,0,1);    { North bins }
39 > kbinE = kbin(-1,0,0, 0,0,1);    { East bins }
40 > kbinS = kbin(0,1,0, 0,0,1);     { South bins }
41 > kbinW = kbin(1,0,0, 0,0,1);     { West bins }
42  
43 < kbinU = kbin(0,0,1, 0,1,0);     { "Up" bins for skylights }
43 > kbinD = kbin(0,0,-1, 0,1,0);    { Skylight bins }
44  
45 < Nkbins : kaccum(knaz(0));       { total number of bins }
45 > Nkbins : kaccum(knaz(0));       { Number of bins for one elevation }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines