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.11 by greg, Fri Sep 3 21:16:50 2010 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  
94 – double  *noise3(), fnoise3(), argument(), frand();
95 – static  interpolate();
96 –
42   static long  xlim[3][2];
43   static double  xarg[3];
44  
# Line 101 | Line 46 | static double  xarg[3];
46  
47   #define  frand3(x,y,z)  frand(17*(x)+23*(y)+29*(z))
48  
49 + static double l_noise3(char  *nam);
50 + static double l_hermite(char *nm);
51 + static double * noise3(double  xnew[3]);
52 + static void interpolate(double  f[4], int  i, int  n);
53 + static double frand(long  s);
54 + static double fnoise3(double  p[3]);
55  
56 +
57   static double
58 < l_noise3(nam)                   /* compute a noise function */
59 < register char  *nam;
58 > l_noise3(                       /* compute a noise function */
59 >        register char  *nam
60 > )
61   {
62          register int  i;
63          double  x[3];
# Line 122 | Line 75 | register char  *nam;
75          eputs(nam);
76          eputs(": called l_noise3!\n");
77          quit(1);
78 +        return 1; /* pro forma return */
79   }
80  
81  
82 < double
83 < l_hermite()                     /* library call for hermite interpolation */
82 > static double
83 > l_hermite(char *nm)             /* library call for hermite interpolation */
84   {
85          double  t;
86          
# Line 136 | Line 90 | l_hermite()                    /* library call for hermite interpolatio
90   }
91  
92  
93 < setnoisefuncs()                 /* add noise functions to library */
93 > extern void
94 > setnoisefuncs(void)                     /* add noise functions to library */
95   {
96          register int  i;
97  
# Line 148 | Line 103 | setnoisefuncs()                        /* add noise functions to library */
103   }
104  
105  
106 < double *
107 < noise3(xnew)                    /* compute the noise function */
108 < register double  xnew[3];
106 > static double *
107 > noise3(                 /* compute the noise function */
108 >        register double  xnew[3]
109 > )
110   {
111          static double  x[3] = {-100000.0, -100000.0, -100000.0};
112          static double  f[4];
# Line 169 | Line 125 | register double  xnew[3];
125   }
126  
127  
128 < static
129 < interpolate(f, i, n)
130 < double  f[4];
131 < register int  i, n;
128 > static void
129 > interpolate(
130 >        double  f[4],
131 >        register int  i,
132 >        register int  n
133 > )
134   {
135          double  f0[4], f1[4], hp1, hp2;
136  
# Line 195 | Line 153 | register int  i, n;
153   }
154  
155  
156 < double
157 < frand(s)                        /* get random number from seed */
158 < register long  s;
156 > static double
157 > frand(                  /* get random number from seed */
158 >        register long  s
159 > )
160   {
161          s = s<<13 ^ s;
162          return(1.0-((s*(s*s*15731+789221)+1376312589)&0x7fffffff)/1073741824.0);
163   }
164  
165  
166 < double
167 < fnoise3(p)                      /* compute fractal noise function */
168 < double  p[3];
166 > static double
167 > fnoise3(                        /* compute fractal noise function */
168 >        double  p[3]
169 > )
170   {
171          long  t[3], v[3], beg[3];
172          double  fval[8], fc;
# Line 258 | Line 218 | double  p[3];
218                          v[i] = beg[i] + s;
219                  }
220                  for (i = 0; i < 3; i++) {       /* do edges */
221 <                        j = (i+1)%3;
221 >                        if ((j = i+1) == 3) j = 0;
222                          if (branch & 1<<j)
223                                  v[j] += s;
224                          else
225                                  v[j] -= s;
226 <                        j = (i+2)%3;
226 >                        if (++j == 3) j = 0;
227                          if (branch & 1<<j)
228                                  v[j] += s;
229                          else
# Line 272 | Line 232 | double  p[3];
232                          fc += fval[branch | 1<<i];
233                          fc = 0.5*fc + s*EPSILON*frand3(v[0],v[1],v[2]);
234                          fval[branch^1<<i] = fc;
235 <                        j = (i+1)%3;
235 >                        if ((j = i+1) == 3) j = 0;
236                          v[j] = beg[j] + s;
237 <                        j = (i+2)%3;
237 >                        if (++j == 3) j = 0;
238                          v[j] = beg[j] + s;
239                  }
240                  for (i = 0; i < 3; i++)         /* new cube */

Diff Legend

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