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 2.8 by greg, Mon Aug 4 22:37:53 2003 UTC vs.
Revision 2.9 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10  
11   #include "copyright.h"
12  
13 – #include  "calcomp.h"
14 –
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 38 | Line 39 | static char  noise_name[4][8] = {"noise3x", "noise3y",
39   static char  fnoise_name[] = "fnoise3";
40   static char  hermite_name[] = "hermite";
41  
42 < double  *noise3(), fnoise3(), frand();
43 < static  interpolate();
42 > //double  *noise3(), fnoise3(), frand();
43 > //static  interpolate();
44  
45   static long  xlim[3][2];
46   static double  xarg[3];
# Line 48 | Line 49 | static double  xarg[3];
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 69 | Line 78 | register char  *nam;
78          eputs(nam);
79          eputs(": called l_noise3!\n");
80          quit(1);
81 +        return 1; /* pro forma return */
82   }
83  
84  
85 < double
85 > static double
86   l_hermite(char *nm)             /* library call for hermite interpolation */
87   {
88          double  t;
# Line 83 | Line 93 | l_hermite(char *nm)            /* library call for hermite inter
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 95 | 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   {
114          static double  x[3] = {-100000.0, -100000.0, -100000.0};
115          static double  f[4];
# Line 116 | 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], hp1, hp2;
139  
# Line 142 | Line 156 | register int  i, n;
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   {
174          long  t[3], v[3], beg[3];
175          double  fval[8], fc;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines