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

Comparing ray/src/rt/noise3.c (file contents):
Revision 1.5 by greg, Fri May 24 14:23:33 1991 UTC vs.
Revision 1.7 by greg, Thu Oct 10 16:43:40 1991 UTC

# Line 25 | Line 25 | static char SCCSid[] = "$SunId$ LBL";
25   #define  rand3c(x,y,z)  frand(89*(x)+97*(y)+101*(z))
26   #define  rand3d(x,y,z)  frand(103*(x)+107*(y)+109*(z))
27  
28 < #define  hermite(p0,p1,r0,r1,t)  (      p0*((2.0*t-3.0)*t*t+1.0) + \
29 <                                        p1*(-2.0*t+3.0)*t*t + \
30 <                                        r0*((t-2.0)*t+1.0)*t + \
31 <                                        r1*(t-1.0)*t*t )
28 > #define  hpoly1(t)      ((2.0*t-3.0)*t*t+1.0)
29 > #define  hpoly2(t)      (-2.0*t+3.0)*t*t
30 > #define  hpoly3(t)      ((t-2.0)*t+1.0)*t
31 > #define  hpoly4(t)      (t-1.0)*t*t
32  
33 < static char  *noise_name[4] = {"noise3a", "noise3b", "noise3c", "noise3"};
33 > #define  hermite(p0,p1,r0,r1,t)  (      p0*hpoly1(t) + \
34 >                                        p1*hpoly2(t) + \
35 >                                        r0*hpoly3(t) + \
36 >                                        r1*hpoly4(t) )
37 >
38 > static char  noise_name[4][8] = {"noise3a", "noise3b", "noise3c", "noise3"};
39   static char  fnoise_name[] = "fnoise3";
40   static char  hermite_name[] = "hermite";
41  
# Line 61 | Line 66 | register char  *nam;
66          while (i--)
67                  if (nam == noise_name[i])
68                          return(noise3(x)[i]);
69 <        eputs("Bad call to l_noise3()!\n");
69 >        eputs(nam);
70 >        eputs(": called l_noise3!\n");
71          quit(1);
72   }
73  
# Line 116 | Line 122 | interpolate(f, i, n)
122   double  f[4];
123   register int  i, n;
124   {
125 <        double  f0[4], f1[4];
125 >        double  f0[4], f1[4], hp1, hp2;
126  
127          if (n == 0) {
128                  f[A] = rand3a(xlim[0][i&1],xlim[1][i>>1&1],xlim[2][i>>2]);
# Line 127 | Line 133 | register int  i, n;
133                  n--;
134                  interpolate(f0, i, n);
135                  interpolate(f1, i | 1<<n, n);
136 <                f[A] = (1.0-xarg[n])*f0[A] + xarg[n]*f1[A];
137 <                f[B] = (1.0-xarg[n])*f0[B] + xarg[n]*f1[B];
138 <                f[C] = (1.0-xarg[n])*f0[C] + xarg[n]*f1[C];
139 <                f[D] = hermite(f0[D], f1[D], f0[n], f1[n], xarg[n]);
136 >                hp1 = hpoly1(xarg[n]); hp2 = hpoly2(xarg[n]);
137 >                f[A] = f0[A]*hp1 + f1[A]*hp2;
138 >                f[B] = f0[B]*hp1 + f1[B]*hp2;
139 >                f[C] = f0[C]*hp1 + f1[C]*hp2;
140 >                f[D] = f0[D]*hp1 + f1[D]*hp2 +
141 >                                f0[n]*hpoly3(xarg[n]) + f1[n]*hpoly4(xarg[n]);
142          }
143   }
144  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines