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

Comparing ray/src/rt/rayinit.cal (file contents):
Revision 2.11 by greg, Thu Oct 31 11:05:35 1996 UTC vs.
Revision 2.12 by gwlarson, Mon Oct 19 15:45:30 1998 UTC

# Line 99 | Line 99 | mod(n,d) : n - floor(n/d)*d;
99   tri(n,d) : abs( d - mod(n-d,2*d) );
100   linterp(t,p0,p1) : (1-t)*p0 + t*p1;
101  
102 < noop(v) = v;
103 < clip(v) = bound(0,v,1);
104 < noneg(v) = if(v,v,0);
105 < red(r,g,b) = if(r,r,0);
106 < green(r,g,b) = if(g,g,0);
107 < blue(r,g,b) = if(b,b,0);
108 < grey(r,g,b) = noneg(.265074126*r + .670114631*g + .064811243*b);
109 < clip_r(r,g,b) = bound(0,r,1);
110 < clip_g(r,g,b) = bound(0,g,1);
111 < clip_b(r,g,b) = bound(0,b,1);
112 < clipgrey(r,g,b) = min(grey(r,g,b),1);
102 > noop(v) : v;
103 > clip(v) : bound(0,v,1);
104 > noneg(v) : if(v,v,0);
105 > red(r,g,b) : if(r,r,0);
106 > green(r,g,b) : if(g,g,0);
107 > blue(r,g,b) : if(b,b,0);
108 > grey(r,g,b) : noneg(.265074126*r + .670114631*g + .064811243*b);
109 > clip_r(r,g,b) : bound(0,r,1);
110 > clip_g(r,g,b) : bound(0,g,1);
111 > clip_b(r,g,b) : bound(0,b,1);
112 > clipgrey(r,g,b) : min(grey(r,g,b),1);
113  
114   dot(v1,v2) : v1(1)*v2(1) + v1(2)*v2(2) + v1(3)*v2(3);
115   cross(i,v1,v2) : select(i,      v1(2)*v2(3) - v1(3)*v2(2),
116                                  v1(3)*v2(1) - v1(1)*v2(3),
117                                  v1(1)*v2(2) - v1(2)*v2(1));
118  
119 < fade(near_val,far_val,dist) = far_val +
119 > fade(near_val,far_val,dist) : far_val +
120                  if (16-dist, (near_val-far_val)/(1+dist*dist), 0);
121  
122 < bezier(p1, p2, p3, p4, t) =     p1 * (1+t*(-3+t*(3-t))) +
122 > bezier(p1, p2, p3, p4, t) :     p1 * (1+t*(-3+t*(3-t))) +
123                                  p2 * 3*t*(1+t*(-2+t)) +
124                                  p3 * 3*t*t*(1-t) +
125                                  p4 * t*t*t ;
126  
127 < bspline(pp, p0, p1, pn, t) =    pp * (1/6+t*(-.5+t*(.5-1/6*t))) +
127 > bspline(pp, p0, p1, pn, t) :    pp * (1/6+t*(-.5+t*(.5-1/6*t))) +
128                                  p0 * (2/3+t*t*(-1+.5*t)) +
129                                  p1 * (1/6+t*(.5+t*(.5-.5*t))) +
130                                  pn * (1/6*t*t*t) ;
131  
132 < turbulence(x,y,z,s) = if( s-1.01, 0, abs(noise3(x/s,y/s,z/s)*s) +
132 > turbulence(x,y,z,s) : if( s-1.01, 0, abs(noise3(x/s,y/s,z/s)*s) +
133                                                  turbulence(x,y,z,2*s) );
134 < turbulencea(x,y,z,s) = if( s-1.01, 0,
134 > turbulencex(x,y,z,s) : if( s-1.01, 0,
135                          sgn(noise3(x/s,y/s,z/s))*noise3x(x/s,y/s,z/s) +
136 <                        turbulencea(x,y,z,2*s) );
137 < turbulenceb(x,y,z,s) = if( s-1.01, 0,
136 >                        turbulencex(x,y,z,2*s) );
137 > turbulencey(x,y,z,s) : if( s-1.01, 0,
138                          sgn(noise3(x/s,y/s,z/s))*noise3y(x/s,y/s,z/s) +
139 <                        turbulenceb(x,y,z,2*s) );
140 < turbulencec(x,y,z,s) = if( s-1.01, 0,
139 >                        turbulencey(x,y,z,2*s) );
140 > turbulencez(x,y,z,s) : if( s-1.01, 0,
141                          sgn(noise3(x/s,y/s,z/s))*noise3z(x/s,y/s,z/s) +
142 <                        turbulencec(x,y,z,2*s) );
142 >                        turbulencez(x,y,z,2*s) );
143  
144                          { Normal distribution from uniform range (0,1) }
145  
146 < un2`private(t) : t - (2.515517+t*(.802853+t*.010328))/
146 > un2`P(t) : t - (2.515517+t*(.802853+t*.010328))/
147                  (1+t*(1.432788+t*(.189269+t*.001308))) ;
148 < un1`private(p) : un2`private(sqrt(-2*log(p))) ;
148 > un1`P(p) : un2`P(sqrt(-2*log(p))) ;
149  
150 < unif2norm(p) : if( .5-p, -un1`private(p), un1`private(1-p) ) ;
150 > unif2norm(p) : if( .5-p, -un1`P(p), un1`P(1-p) ) ;
151  
152   nrand(x) = unif2norm(rand(x));
153  
154                          { Local (u,v) coordinates for planar surfaces }
155 < crosslen`private = Nx*Nx + Ny*Ny;
155 > crosslen`P = Nx*Nx + Ny*Ny;
156                          { U is distance from projected Z-axis }
157 < U = if( crosslen`private - FTINY,
158 <                (Py*Nx - Px*Ny)/crosslen`private,
157 > U = if( crosslen`P - FTINY,
158 >                (Py*Nx - Px*Ny)/crosslen`P,
159                  Px);
160                          { V is defined so that N = U x V }
161 < V = if( crosslen`private - FTINY,
162 <                Pz - Nz*(Px*Nx + Py*Ny)/crosslen`private,
161 > V = if( crosslen`P - FTINY,
162 >                Pz - Nz*(Px*Nx + Py*Ny)/crosslen`P,
163                  Py);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines