Add option 'eased' to NoiseParams

Signed-off-by: Craig Robbins <kde.psych@gmail.com>

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 698efbe8af2d0ad98e7b8485df392ddd55ecc79c..e4a016b1a02dbde269606c6dccb0036bf3fdf1d6 100644 (file)
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2796,3 +2796,16 @@ ParticleSpawner definition (add_particlespawner)
     playername = "singleplayer"
     ^ Playername is optional, if specified spawns particle only on the player's client
 }
+
+NoiseParams definition (PerlinNoiseMap)
+{
+    offset = 0,
+    scale = 0,
+    spread = 0,
+    seed = 0,
+    octaves = 0,
+    ^ A higher value will result in more details, this means more operations
+    persist = 0,
+    eased = false
+    ^ Whether it should create curves in 3D perlin maps
+}

diff --git a/src/noise.h b/src/noise.h
index 00d3612af1e93ad4526a3012c4a38b382107f9ae..39805283787da6d64cae11c1398424323cd05ff3 100644 (file)
--- a/src/noise.h
+++ b/src/noise.h
@@ -73,11 +73,12 @@ struct NoiseParams {
        int seed;
        int octaves;
        float persist;
+       bool eased;
 
        NoiseParams() {}
 
        NoiseParams(float offset_, float scale_, v3f spread_,
-               int seed_, int octaves_, float persist_)
+               int seed_, int octaves_, float persist_, bool eased_=false)
        {
                offset  = offset_;
                scale   = scale_;
@@ -85,6 +86,7 @@ struct NoiseParams {
                seed    = seed_;
                octaves = octaves_;
                persist = persist_;
+               eased   = eased_;
        }
 };
 

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 0e1e608c4ce9cfe9d12513f1bdc9a3092f3a06de..1972c40e0be98a502d83db253d7c21c14a31cd3f 100644 (file)
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -1000,6 +1000,7 @@ bool read_noiseparams_nc(lua_State *L, int index, NoiseParams *np)
        np->persist = getfloatfield_default(L, index, "persist", 0.0);
        np->seed    = getintfield_default(L,   index, "seed",    0);
        np->octaves = getintfield_default(L,   index, "octaves", 0);
+       np->eased   = getboolfield_default(L,  index, "eased",   false);
 
        lua_getfield(L, index, "spread");
        np->spread  = read_v3f(L, -1);

diff --git a/src/script/lua_api/l_noise.cpp b/src/script/lua_api/l_noise.cpp
index 263ecfd6999aab49f96610d29f5b6d765f88ce8e..4f230b76e0074dc084ae27df4852f20df1ad7344 100644 (file)
--- a/src/script/lua_api/l_noise.cpp
+++ b/src/script/lua_api/l_noise.cpp
@@ -190,7 +190,7 @@ int LuaPerlinNoiseMap::l_get3dMap(lua_State *L)
        v3f p = read_v3f(L, 2);
 
        Noise *n = o->noise;
-       n->perlinMap3D(p.X, p.Y, p.Z);
+       n->perlinMap3D(p.X, p.Y, p.Z, n->np->eased);
 
        lua_newtable(L);
        for (int z = 0; z != n->sz; z++) {
@@ -216,7 +216,7 @@ int LuaPerlinNoiseMap::l_get3dMap_flat(lua_State *L)
        v3f p = read_v3f(L, 2);
 
        Noise *n = o->noise;
-       n->perlinMap3D(p.X, p.Y, p.Z);
+       n->perlinMap3D(p.X, p.Y, p.Z, n->np->eased);
 
 
        int maplen = n->sx * n->sy * n->sz;