--- ray/src/rt/noise3.c 1991/08/02 13:57:09 1.6 +++ ray/src/rt/noise3.c 1991/10/10 16:43:40 1.7 @@ -25,11 +25,16 @@ static char SCCSid[] = "$SunId$ LBL"; #define rand3c(x,y,z) frand(89*(x)+97*(y)+101*(z)) #define rand3d(x,y,z) frand(103*(x)+107*(y)+109*(z)) -#define hermite(p0,p1,r0,r1,t) ( p0*((2.0*t-3.0)*t*t+1.0) + \ - p1*(-2.0*t+3.0)*t*t + \ - r0*((t-2.0)*t+1.0)*t + \ - r1*(t-1.0)*t*t ) +#define hpoly1(t) ((2.0*t-3.0)*t*t+1.0) +#define hpoly2(t) (-2.0*t+3.0)*t*t +#define hpoly3(t) ((t-2.0)*t+1.0)*t +#define hpoly4(t) (t-1.0)*t*t +#define hermite(p0,p1,r0,r1,t) ( p0*hpoly1(t) + \ + p1*hpoly2(t) + \ + r0*hpoly3(t) + \ + r1*hpoly4(t) ) + static char noise_name[4][8] = {"noise3a", "noise3b", "noise3c", "noise3"}; static char fnoise_name[] = "fnoise3"; static char hermite_name[] = "hermite"; @@ -117,7 +122,7 @@ interpolate(f, i, n) double f[4]; register int i, n; { - double f0[4], f1[4]; + double f0[4], f1[4], hp1, hp2; if (n == 0) { f[A] = rand3a(xlim[0][i&1],xlim[1][i>>1&1],xlim[2][i>>2]); @@ -128,10 +133,12 @@ register int i, n; n--; interpolate(f0, i, n); interpolate(f1, i | 1<