/*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+ * Minetest
+ * Copyright (C) 2010-2014 celeron55, Perttu Ahola <celeron55@gmail.com>
+ * Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+ * 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.
+ */
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+#ifndef NOISE_HEADER
+#define NOISE_HEADER
-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 General Public License for more details.
+#include "debug.h"
+#include "irr_v3d.h"
+#include "util/string.h"
-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.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+#define PSEUDORANDOM_MAX 32767
-#ifndef NOISE_HEADER
-#define NOISE_HEADER
+extern FlagDesc flagdesc_noiseparams[];
-double easeCurve(double t);
-
-// Return value: -1 ... 1
-double noise2d(int x, int y, int seed);
-double noise3d(int x, int y, int z, int seed);
+class PseudoRandom
+{
+public:
+ PseudoRandom(): m_next(0)
+ {
+ }
+ PseudoRandom(int seed): m_next(seed)
+ {
+ }
+ void seed(int seed)
+ {
+ m_next = seed;
+ }
+ // Returns 0...PSEUDORANDOM_MAX
+ int next()
+ {
+ m_next = m_next * 1103515245 + 12345;
+ return((unsigned)(m_next/65536) % (PSEUDORANDOM_MAX + 1));
+ }
+ int range(int min, int max)
+ {
+ if (max-min > (PSEUDORANDOM_MAX + 1) / 10)
+ {
+ //dstream<<"WARNING: PseudoRandom::range: max > 32767"<<std::endl;
+ assert(0);
+ }
+ if(min > max)
+ {
+ assert(0);
+ return max;
+ }
+ return (next()%(max-min+1))+min;
+ }
+private:
+ int m_next;
+};
-double noise2d_gradient(double x, double y, int seed);
-double noise3d_gradient(double x, double y, double z, int seed);
+#define NOISE_FLAG_DEFAULTS 0x01
+#define NOISE_FLAG_EASED 0x02
+#define NOISE_FLAG_ABSVALUE 0x04
-double noise2d_perlin(double x, double y, int seed,
- int octaves, double persistence);
+//// TODO(hmmmm): implement these!
+#define NOISE_FLAG_POINTBUFFER 0x08
+#define NOISE_FLAG_SIMPLEX 0x10
-double noise2d_perlin_abs(double x, double y, int seed,
- int octaves, double persistence);
+struct NoiseParams {
+ float offset;
+ float scale;
+ v3f spread;
+ s32 seed;
+ u16 octaves;
+ float persist;
+ float lacunarity;
+ u32 flags;
-double noise3d_perlin(double x, double y, double z, int seed,
- int octaves, double persistence);
+ NoiseParams() {
+ offset = 0.0f;
+ scale = 1.0f;
+ spread = v3f(250, 250, 250);
+ seed = 12345;
+ octaves = 3;
+ persist = 0.6f;
+ lacunarity = 2.0f;
+ flags = NOISE_FLAG_DEFAULTS;
+ }
-double noise3d_perlin_abs(double x, double y, double z, int seed,
- int octaves, double persistence);
+ NoiseParams(float offset_, float scale_, v3f spread_, s32 seed_,
+ u16 octaves_, float persist_, float lacunarity_,
+ u32 flags_=NOISE_FLAG_DEFAULTS)
+ {
+ offset = offset_;
+ scale = scale_;
+ spread = spread_;
+ seed = seed_;
+ octaves = octaves_;
+ persist = persist_;
+ lacunarity = lacunarity_;
+ flags = flags_;
+ }
+};
-class NoiseBuffer
-{
+
+// 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:
- NoiseBuffer();
- ~NoiseBuffer();
-
- void clear();
- void create(int seed, int octaves, double persistence,
- double pos_scale,
- double first_x, double first_y, double first_z,
- double last_x, double last_y, double last_z,
- double samplelength_x, double samplelength_y, double samplelength_z);
-
- void intSet(int x, int y, int z, double d);
- double intGet(int x, int y, int z);
- double get(double x, double y, double z);
+ NoiseParams np;
+ int seed;
+ int sx;
+ int sy;
+ int sz;
+ float *noise_buf;
+ float *gradient_buf;
+ float *persist_buf;
+ float *result;
+
+ Noise(NoiseParams *np, int seed, int sx, int sy, int sz=1);
+ ~Noise();
+
+ void setSize(int sx, int sy, int sz=1);
+ void setSpreadFactor(v3f spread);
+ void setOctaves(int octaves);
+
+ void gradientMap2D(
+ float x, float y,
+ float step_x, float step_y,
+ int seed);
+ void gradientMap3D(
+ float x, float y, float z,
+ float step_x, float step_y, float step_z,
+ int seed);
+
+ 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:
- double *m_data;
- double m_start_x, m_start_y, m_start_z;
- double m_samplelength_x, m_samplelength_y, m_samplelength_z;
- int m_size_x, m_size_y, m_size_z;
+ 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, 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, bool eased=true);
+
+float noise2d_perlin_abs(float x, float y, int seed,
+ int octaves, float persistence, bool eased=true);
+
+float noise3d_perlin(float x, float y, float z, int seed,
+ int octaves, float persistence, bool eased=false);
+
+float noise3d_perlin_abs(float x, float y, float z, int seed,
+ int octaves, float persistence, bool eased=false);
+
+inline float easeCurve(float t)
+{
+ return t * t * t * (t * (6.f * t - 15.f) + 10.f);
+}
+
+float contour(float v);
+
#endif
projects / minetest.git / blobdiff