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.8 by greg, Mon Aug 4 22:37:53 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  "calcomp.h"
14 +
15 + #include  <math.h>
16 +
17   #define  A              0
18   #define  B              1
19   #define  C              2
# Line 25 | Line 24 | static char SCCSid[] = "$SunId$ LBL";
24   #define  rand3c(x,y,z)  frand(89*(x)+97*(y)+101*(z))
25   #define  rand3d(x,y,z)  frand(103*(x)+107*(y)+109*(z))
26  
27 < #define  hermite(p0,p1,r0,r1,t)  (      p0*((2.0*t-3.0)*t*t+1.0) + \
28 <                                        p1*(-2.0*t+3.0)*t*t + \
29 <                                        r0*((t-2.0)*t+1.0)*t + \
30 <                                        r1*(t-1.0)*t*t )
27 > #define  hpoly1(t)      ((2.0*t-3.0)*t*t+1.0)
28 > #define  hpoly2(t)      (-2.0*t+3.0)*t*t
29 > #define  hpoly3(t)      ((t-2.0)*t+1.0)*t
30 > #define  hpoly4(t)      (t-1.0)*t*t
31  
32 < static char  noise_name[4][8] = {"noise3a", "noise3b", "noise3c", "noise3"};
32 > #define  hermite(p0,p1,r0,r1,t)  (      p0*hpoly1(t) + \
33 >                                        p1*hpoly2(t) + \
34 >                                        r0*hpoly3(t) + \
35 >                                        r1*hpoly4(t) )
36 >
37 > static char  noise_name[4][8] = {"noise3x", "noise3y", "noise3z", "noise3"};
38   static char  fnoise_name[] = "fnoise3";
39   static char  hermite_name[] = "hermite";
40  
41 < double  *noise3(), fnoise3(), argument(), frand();
41 > double  *noise3(), fnoise3(), frand();
42 > static  interpolate();
43  
44   static long  xlim[3][2];
45   static double  xarg[3];
46  
47 < #define  EPSILON        .0001           /* error allowed in fractal */
47 > #define  EPSILON        .001            /* error allowed in fractal */
48  
49   #define  frand3(x,y,z)  frand(17*(x)+23*(y)+29*(z))
50  
# Line 68 | Line 73 | register char  *nam;
73  
74  
75   double
76 < l_hermite()                     /* library call for hermite interpolation */
76 > l_hermite(char *nm)             /* library call for hermite interpolation */
77   {
78          double  t;
79          
# Line 94 | Line 99 | double *
99   noise3(xnew)                    /* compute the noise function */
100   register double  xnew[3];
101   {
97        extern double  floor();
102          static double  x[3] = {-100000.0, -100000.0, -100000.0};
103          static double  f[4];
104  
# Line 117 | Line 121 | interpolate(f, i, n)
121   double  f[4];
122   register int  i, n;
123   {
124 <        double  f0[4], f1[4];
124 >        double  f0[4], f1[4], hp1, hp2;
125  
126          if (n == 0) {
127                  f[A] = rand3a(xlim[0][i&1],xlim[1][i>>1&1],xlim[2][i>>2]);
# Line 128 | Line 132 | register int  i, n;
132                  n--;
133                  interpolate(f0, i, n);
134                  interpolate(f1, i | 1<<n, n);
135 <                f[A] = (1.0-xarg[n])*f0[A] + xarg[n]*f1[A];
136 <                f[B] = (1.0-xarg[n])*f0[B] + xarg[n]*f1[B];
137 <                f[C] = (1.0-xarg[n])*f0[C] + xarg[n]*f1[C];
138 <                f[D] = hermite(f0[D], f1[D], f0[n], f1[n], xarg[n]);
135 >                hp1 = hpoly1(xarg[n]); hp2 = hpoly2(xarg[n]);
136 >                f[A] = f0[A]*hp1 + f1[A]*hp2;
137 >                f[B] = f0[B]*hp1 + f1[B]*hp2;
138 >                f[C] = f0[C]*hp1 + f1[C]*hp2;
139 >                f[D] = f0[D]*hp1 + f1[D]*hp2 +
140 >                                f0[n]*hpoly3(xarg[n]) + f1[n]*hpoly4(xarg[n]);
141          }
142   }
143  
# Line 149 | Line 155 | double
155   fnoise3(p)                      /* compute fractal noise function */
156   double  p[3];
157   {
152        double  floor();
158          long  t[3], v[3], beg[3];
159          double  fval[8], fc;
160          int  branch;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines