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 2.9 by schorsch, Tue Mar 30 16:13:01 2004 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 + #include  "calcomp.h"
16 + #include  "func.h"
17 +
18   #define  A              0
19   #define  B              1
20   #define  C              2
# 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] = {"noise3x", "noise3y", "noise3z", "noise3"};
39   static char  fnoise_name[] = "fnoise3";
40   static char  hermite_name[] = "hermite";
41  
42 < double  *noise3(), fnoise3(), argument(), frand();
42 > //double  *noise3(), fnoise3(), frand();
43 > //static  interpolate();
44  
45   static long  xlim[3][2];
46   static double  xarg[3];
47  
48 < #define  EPSILON        .0001           /* error allowed in fractal */
48 > #define  EPSILON        .001            /* error allowed in fractal */
49  
50   #define  frand3(x,y,z)  frand(17*(x)+23*(y)+29*(z))
51  
52 + static double l_noise3(char  *nam);
53 + static double l_hermite(char *nm);
54 + static double * noise3(double  xnew[3]);
55 + static void interpolate(double  f[4], int  i, int  n);
56 + static double frand(long  s);
57 + static double fnoise3(double  p[3]);
58  
59 +
60   static double
61 < l_noise3(nam)                   /* compute a noise function */
62 < register char  *nam;
61 > l_noise3(                       /* compute a noise function */
62 >        register char  *nam
63 > )
64   {
65          register int  i;
66          double  x[3];
# Line 61 | Line 75 | register char  *nam;
75          while (i--)
76                  if (nam == noise_name[i])
77                          return(noise3(x)[i]);
78 <        eputs("Bad call to l_noise3()!\n");
78 >        eputs(nam);
79 >        eputs(": called l_noise3!\n");
80          quit(1);
81 +        return 1; /* pro forma return */
82   }
83  
84  
85 < double
86 < l_hermite()                     /* library call for hermite interpolation */
85 > static double
86 > l_hermite(char *nm)             /* library call for hermite interpolation */
87   {
88          double  t;
89          
# Line 77 | Line 93 | l_hermite()                    /* library call for hermite interpolatio
93   }
94  
95  
96 < setnoisefuncs()                 /* add noise functions to library */
96 > extern void
97 > setnoisefuncs(void)                     /* add noise functions to library */
98   {
99          register int  i;
100  
# Line 89 | Line 106 | setnoisefuncs()                        /* add noise functions to library */
106   }
107  
108  
109 < double *
110 < noise3(xnew)                    /* compute the noise function */
111 < register double  xnew[3];
109 > static double *
110 > noise3(                 /* compute the noise function */
111 >        register double  xnew[3]
112 > )
113   {
96        extern double  floor();
114          static double  x[3] = {-100000.0, -100000.0, -100000.0};
115          static double  f[4];
116  
# Line 111 | Line 128 | register double  xnew[3];
128   }
129  
130  
131 < static
132 < interpolate(f, i, n)
133 < double  f[4];
134 < register int  i, n;
131 > static void
132 > interpolate(
133 >        double  f[4],
134 >        register int  i,
135 >        register int  n
136 > )
137   {
138 <        double  f0[4], f1[4];
138 >        double  f0[4], f1[4], hp1, hp2;
139  
140          if (n == 0) {
141                  f[A] = rand3a(xlim[0][i&1],xlim[1][i>>1&1],xlim[2][i>>2]);
# Line 127 | Line 146 | register int  i, n;
146                  n--;
147                  interpolate(f0, i, n);
148                  interpolate(f1, i | 1<<n, n);
149 <                f[A] = (1.0-xarg[n])*f0[A] + xarg[n]*f1[A];
150 <                f[B] = (1.0-xarg[n])*f0[B] + xarg[n]*f1[B];
151 <                f[C] = (1.0-xarg[n])*f0[C] + xarg[n]*f1[C];
152 <                f[D] = hermite(f0[D], f1[D], f0[n], f1[n], xarg[n]);
149 >                hp1 = hpoly1(xarg[n]); hp2 = hpoly2(xarg[n]);
150 >                f[A] = f0[A]*hp1 + f1[A]*hp2;
151 >                f[B] = f0[B]*hp1 + f1[B]*hp2;
152 >                f[C] = f0[C]*hp1 + f1[C]*hp2;
153 >                f[D] = f0[D]*hp1 + f1[D]*hp2 +
154 >                                f0[n]*hpoly3(xarg[n]) + f1[n]*hpoly4(xarg[n]);
155          }
156   }
157  
158  
159 < double
160 < frand(s)                        /* get random number from seed */
161 < register long  s;
159 > static double
160 > frand(                  /* get random number from seed */
161 >        register long  s
162 > )
163   {
164          s = s<<13 ^ s;
165          return(1.0-((s*(s*s*15731+789221)+1376312589)&0x7fffffff)/1073741824.0);
166   }
167  
168  
169 < double
170 < fnoise3(p)                      /* compute fractal noise function */
171 < double  p[3];
169 > static double
170 > fnoise3(                        /* compute fractal noise function */
171 >        double  p[3]
172 > )
173   {
151        double  floor();
174          long  t[3], v[3], beg[3];
175          double  fval[8], fc;
176          int  branch;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines