diff options
Diffstat (limited to 'source/blender/blenlib/intern/noise.c')
-rw-r--r-- | source/blender/blenlib/intern/noise.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index 66e9a65dba5..343589d9a41 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. @@ -43,8 +43,8 @@ /* local */ static float noise3_perlin(float vec[3]); -static float turbulence_perlin(float *point, float lofreq, float hifreq); -static float turbulencep(float noisesize, float x, float y, float z, int nr); +//static float turbulence_perlin(float *point, float lofreq, float hifreq); +//static float turbulencep(float noisesize, float x, float y, float z, int nr); #define HASHVEC(x,y,z) hashvectf+3*hash[ (hash[ (hash[(z) & 255]+(y)) & 255]+(x)) & 255] @@ -976,6 +976,7 @@ static float noise3_perlin(float vec[3]) return 1.5 * lerp(sz, c, d); /* interpolate in z */ } +#if 0 static float turbulence_perlin(float *point, float lofreq, float hifreq) { float freq, t, p[3]; @@ -993,6 +994,7 @@ static float turbulence_perlin(float *point, float lofreq, float hifreq) } return t - 0.3; /* readjust to make mean value = 0.0 */ } +#endif /* for use with BLI_gNoise/gTurbulence, returns signed noise */ static float orgPerlinNoise(float x, float y, float z) @@ -1029,7 +1031,7 @@ float BLI_hnoisep(float noisesize, float x, float y, float z) return noise3_perlin(vec); } -static float turbulencep(float noisesize, float x, float y, float z, int nr) +/*static float turbulencep(float noisesize, float x, float y, float z, int nr) { float vec[3]; @@ -1038,7 +1040,7 @@ static float turbulencep(float noisesize, float x, float y, float z, int nr) vec[2]= z/noisesize; nr++; return turbulence_perlin(vec, 1.0, (float)(1<<nr)); -} +}*/ /******************/ /* VORONOI/WORLEY */ |