X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fnoise.h;h=05c877b3237c6b0f66a90d0a0465792250094737;hb=63867b1a372a4d1a4a4ffdec9d0862b094211a89;hp=ace6d7eb4cb714e48c5aa40fa3e022f522e89c63;hpb=feb7de91ec34ef1ca3152270a7bc62b2e308f1bd;p=minetest.git diff --git a/src/noise.h b/src/noise.h index ace6d7eb4..05c877b32 100644 --- a/src/noise.h +++ b/src/noise.h @@ -1,28 +1,38 @@ /* -Minetest -Copyright (C) 2010-2013 celeron55, Perttu Ahola -Copyright (C) 2010-2013 kwolekr, Ryan Kwolek - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + * Minetest + * Copyright (C) 2010-2014 celeron55, Perttu Ahola + * Copyright (C) 2010-2014 kwolekr, Ryan Kwolek + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #ifndef NOISE_HEADER #define NOISE_HEADER #include "debug.h" #include "irr_v3d.h" +#include "util/string.h" + +#define PSEUDORANDOM_MAX 32767 + +extern FlagDesc flagdesc_noiseparams[]; class PseudoRandom { @@ -37,15 +47,15 @@ class PseudoRandom { m_next = seed; } - // Returns 0...32767 + // Returns 0...PSEUDORANDOM_MAX int next() { m_next = m_next * 1103515245 + 12345; - return((unsigned)(m_next/65536) % 32768); + return((unsigned)(m_next/65536) % (PSEUDORANDOM_MAX + 1)); } int range(int min, int max) { - if(max-min > 32768/10) + if (max-min > (PSEUDORANDOM_MAX + 1) / 10) { //dstream<<"WARNING: PseudoRandom::range: max > 32767"<((x), "f,f,v3,s32,s32,f") -#define setNoiseParams(x, y) setStruct((x), "f,f,v3,s32,s32,f", (y)) +// Convenience macros for getting/setting NoiseParams in Settings as a string +// WARNING: Deprecated, use Settings::getNoiseParamsFromValue() instead +#define NOISEPARAMS_FMT_STR "f,f,v3,s32,u16,f" +//#define getNoiseParams(x, y) getStruct((x), NOISEPARAMS_FMT_STR, &(y), sizeof(y)) +//#define setNoiseParams(x, y) setStruct((x), NOISEPARAMS_FMT_STR, &(y)) class Noise { public: - NoiseParams *np; + NoiseParams np; int seed; int sx; int sy; int sz; - float *noisebuf; - float *buf; + float *noise_buf; + float *gradient_buf; + float *persist_buf; float *result; - Noise(NoiseParams *np, int seed, int sx, int sy); - Noise(NoiseParams *np, int seed, int sx, int sy, int sz); + Noise(NoiseParams *np, int seed, int sx, int sy, int sz=1); ~Noise(); - virtual void init(NoiseParams *np, int seed, int sx, int sy, int sz); - void setSize(int sx, int sy); - void setSize(int sx, int sy, int sz); + void setSize(int sx, int sy, int sz=1); void setSpreadFactor(v3f spread); void setOctaves(int octaves); - void resizeNoiseBuf(bool is3d); void gradientMap2D( float x, float y, @@ -105,62 +149,83 @@ class Noise { float x, float y, float z, float step_x, float step_y, float step_z, int seed); - float *perlinMap2D(float x, float y); - float *perlinMap2DModulated(float x, float y, float *persist_map); - float *perlinMap3D(float x, float y, float z); - void transformNoiseMap(); + + float *perlinMap2D(float x, float y, float *persistence_map=NULL); + float *perlinMap3D(float x, float y, float z, float *persistence_map=NULL); + + inline float *perlinMap2D_PO(float x, float xoff, float y, float yoff, + float *persistence_map=NULL) + { + return perlinMap2D( + x + xoff * np.spread.X, + y + yoff * np.spread.Y, + persistence_map); + } + + inline float *perlinMap3D_PO(float x, float xoff, float y, float yoff, + float z, float zoff, float *persistence_map=NULL) + { + return perlinMap3D( + x + xoff * np.spread.X, + y + yoff * np.spread.Y, + z + zoff * np.spread.Z, + persistence_map); + } + +private: + void allocBuffers(); + void resizeNoiseBuf(bool is3d); + void updateResults(float g, float *gmap, float *persistence_map, size_t bufsize); + }; +float NoisePerlin2D(NoiseParams *np, float x, float y, int seed); +float NoisePerlin3D(NoiseParams *np, float x, float y, float z, int seed); + +inline float NoisePerlin2D_PO(NoiseParams *np, float x, float xoff, + float y, float yoff, int seed) +{ + return NoisePerlin2D(np, + x + xoff * np->spread.X, + y + yoff * np->spread.Y, + seed); +} + +inline float NoisePerlin3D_PO(NoiseParams *np, float x, float xoff, + float y, float yoff, float z, float zoff, int seed) +{ + return NoisePerlin3D(np, + x + xoff * np->spread.X, + y + yoff * np->spread.Y, + z + zoff * np->spread.Z, + seed); +} + // Return value: -1 ... 1 float noise2d(int x, int y, int seed); float noise3d(int x, int y, int z, int seed); -float noise2d_gradient(float x, float y, int seed); -float noise3d_gradient(float x, float y, float z, int seed); +float noise2d_gradient(float x, float y, int seed, bool eased=true); +float noise3d_gradient(float x, float y, float z, int seed, bool eased=false); float noise2d_perlin(float x, float y, int seed, - int octaves, float persistence); + int octaves, float persistence, bool eased=true); float noise2d_perlin_abs(float x, float y, int seed, - int octaves, float persistence); + int octaves, float persistence, bool eased=true); float noise3d_perlin(float x, float y, float z, int seed, - int octaves, float persistence); + int octaves, float persistence, bool eased=false); float noise3d_perlin_abs(float x, float y, float z, int seed, - int octaves, float persistence); + int octaves, float persistence, bool eased=false); -inline float easeCurve(float t) { +inline float easeCurve(float t) +{ return t * t * t * (t * (6.f * t - 15.f) + 10.f); } -#define NoisePerlin2D(np, x, y, s) \ - ((np)->offset + (np)->scale * noise2d_perlin( \ - (float)(x) / (np)->spread.X, \ - (float)(y) / (np)->spread.Y, \ - (s) + (np)->seed, (np)->octaves, (np)->persist)) - -#define NoisePerlin2DNoTxfm(np, x, y, s) \ - (noise2d_perlin( \ - (float)(x) / (np)->spread.X, \ - (float)(y) / (np)->spread.Y, \ - (s) + (np)->seed, (np)->octaves, (np)->persist)) - -#define NoisePerlin2DPosOffset(np, x, xoff, y, yoff, s) \ - ((np)->offset + (np)->scale * noise2d_perlin( \ - (float)(xoff) + (float)(x) / (np)->spread.X, \ - (float)(yoff) + (float)(y) / (np)->spread.Y, \ - (s) + (np)->seed, (np)->octaves, (np)->persist)) - -#define NoisePerlin2DNoTxfmPosOffset(np, x, xoff, y, yoff, s) \ - (noise2d_perlin( \ - (float)(xoff) + (float)(x) / (np)->spread.X, \ - (float)(yoff) + (float)(y) / (np)->spread.Y, \ - (s) + (np)->seed, (np)->octaves, (np)->persist)) - -#define NoisePerlin3D(np, x, y, z, s) ((np)->offset + (np)->scale * \ - noise3d_perlin((float)(x) / (np)->spread.X, (float)(y) / (np)->spread.Y, \ - (float)(z) / (np)->spread.Z, (s) + (np)->seed, (np)->octaves, (np)->persist)) +float contour(float v); #endif