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.6 by greg, Fri Aug 2 13:57:09 1991 UTC vs.
Revision 2.7 by greg, Tue Feb 25 02:47:22 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1988 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  noise3.c - noise functions for random textures.
6   *
7   *     Credit for the smooth algorithm goes to Ken Perlin.
8   *     (ref. SIGGRAPH Vol 19, No 3, pp 287-96)
12 *
13 *     4/15/86
14 *     5/19/88  Added fractal noise function
9   */
10  
11 + #include "copyright.h"
12  
13 + #include  <math.h>
14 +
15   #define  A              0
16   #define  B              1
17   #define  C              2
# Line 25 | Line 22 | static char SCCSid[] = "$SunId$ LBL";
22   #define  rand3c(x,y,z)  frand(89*(x)+97*(y)+101*(z))
23   #define  rand3d(x,y,z)  frand(103*(x)+107*(y)+109*(z))
24  
25 < #define  hermite(p0,p1,r0,r1,t)  (      p0*((2.0*t-3.0)*t*t+1.0) + \
26 <                                        p1*(-2.0*t+3.0)*t*t + \
27 <                                        r0*((t-2.0)*t+1.0)*t + \
28 <                                        r1*(t-1.0)*t*t )
25 > #define  hpoly1(t)      ((2.0*t-3.0)*t*t+1.0)
26 > #define  hpoly2(t)      (-2.0*t+3.0)*t*t
27 > #define  hpoly3(t)      ((t-2.0)*t+1.0)*t
28 > #define  hpoly4(t)      (t-1.0)*t*t
29  
30 < static char  noise_name[4][8] = {"noise3a", "noise3b", "noise3c", "noise3"};
30 > #define  hermite(p0,p1,r0,r1,t)  (      p0*hpoly1(t) + \
31 >                                        p1*hpoly2(t) + \
32 >                                        r0*hpoly3(t) + \
33 >                                        r1*hpoly4(t) )
34 >
35 > static char  noise_name[4][8] = {"noise3x", "noise3y", "noise3z", "noise3"};
36   static char  fnoise_name[] = "fnoise3";
37   static char  hermite_name[] = "hermite";
38  
39   double  *noise3(), fnoise3(), argument(), frand();
40 + static  interpolate();
41  
42   static long  xlim[3][2];
43   static double  xarg[3];
44  
45 < #define  EPSILON        .0001           /* error allowed in fractal */
45 > #define  EPSILON        .001            /* error allowed in fractal */
46  
47   #define  frand3(x,y,z)  frand(17*(x)+23*(y)+29*(z))
48  
# Line 94 | Line 97 | double *
97   noise3(xnew)                    /* compute the noise function */
98   register double  xnew[3];
99   {
97        extern double  floor();
100          static double  x[3] = {-100000.0, -100000.0, -100000.0};
101          static double  f[4];
102  
# Line 117 | Line 119 | interpolate(f, i, n)
119   double  f[4];
120   register int  i, n;
121   {
122 <        double  f0[4], f1[4];
122 >        double  f0[4], f1[4], hp1, hp2;
123  
124          if (n == 0) {
125                  f[A] = rand3a(xlim[0][i&1],xlim[1][i>>1&1],xlim[2][i>>2]);
# Line 128 | Line 130 | register int  i, n;
130                  n--;
131                  interpolate(f0, i, n);
132                  interpolate(f1, i | 1<<n, n);
133 <                f[A] = (1.0-xarg[n])*f0[A] + xarg[n]*f1[A];
134 <                f[B] = (1.0-xarg[n])*f0[B] + xarg[n]*f1[B];
135 <                f[C] = (1.0-xarg[n])*f0[C] + xarg[n]*f1[C];
136 <                f[D] = hermite(f0[D], f1[D], f0[n], f1[n], xarg[n]);
133 >                hp1 = hpoly1(xarg[n]); hp2 = hpoly2(xarg[n]);
134 >                f[A] = f0[A]*hp1 + f1[A]*hp2;
135 >                f[B] = f0[B]*hp1 + f1[B]*hp2;
136 >                f[C] = f0[C]*hp1 + f1[C]*hp2;
137 >                f[D] = f0[D]*hp1 + f1[D]*hp2 +
138 >                                f0[n]*hpoly3(xarg[n]) + f1[n]*hpoly4(xarg[n]);
139          }
140   }
141  
# Line 149 | Line 153 | double
153   fnoise3(p)                      /* compute fractal noise function */
154   double  p[3];
155   {
152        double  floor();
156          long  t[3], v[3], beg[3];
157          double  fval[8], fc;
158          int  branch;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines