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.6 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.9 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   *     (ref. SIGGRAPH Vol 19, No 3, pp 287-96)
9   */
10  
11 < /* ====================================================================
12 < * The Radiance Software License, Version 1.0
13 < *
14 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
15 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
16 < *
17 < * Redistribution and use in source and binary forms, with or without
18 < * modification, are permitted provided that the following conditions
19 < * are met:
20 < *
21 < * 1. Redistributions of source code must retain the above copyright
22 < *         notice, this list of conditions and the following disclaimer.
23 < *
24 < * 2. Redistributions in binary form must reproduce the above copyright
25 < *       notice, this list of conditions and the following disclaimer in
26 < *       the documentation and/or other materials provided with the
27 < *       distribution.
28 < *
29 < * 3. The end-user documentation included with the redistribution,
30 < *           if any, must include the following acknowledgment:
31 < *             "This product includes Radiance software
32 < *                 (http://radsite.lbl.gov/)
33 < *                 developed by the Lawrence Berkeley National Laboratory
34 < *               (http://www.lbl.gov/)."
35 < *       Alternately, this acknowledgment may appear in the software itself,
36 < *       if and wherever such third-party acknowledgments normally appear.
37 < *
38 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
39 < *       and "The Regents of the University of California" must
40 < *       not be used to endorse or promote products derived from this
41 < *       software without prior written permission. For written
42 < *       permission, please contact [email protected].
43 < *
44 < * 5. Products derived from this software may not be called "Radiance",
45 < *       nor may "Radiance" appear in their name, without prior written
46 < *       permission of Lawrence Berkeley National Laboratory.
47 < *
48 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
49 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
50 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
51 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
52 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
53 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
54 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
55 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
56 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
57 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
58 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59 < * SUCH DAMAGE.
60 < * ====================================================================
61 < *
62 < * This software consists of voluntary contributions made by many
63 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
64 < * information on Lawrence Berkeley National Laboratory, please see
65 < * <http://www.lbl.gov/>.
66 < */
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 91 | 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(), argument(), 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 101 | 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 122 | 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
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 136 | 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 148 | 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 169 | 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 195 | 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