Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-24 00:23:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for lacunarity in legacy NoiseParams string format

Browse Source
This commit is contained in:
kwolekr 2014-12-10 01:31:21 -05:00
parent daefd0ab36
commit a89f37bb65
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings.cpp
View File

@ -473,7 +473,11 @@ bool Settings::getNoiseParamsFromValue(const std::string &name,
f.next(","); f.next(",");
np.seed = stoi(f.next(",")); np.seed = stoi(f.next(","));
np.octaves = stoi(f.next(",")); np.octaves = stoi(f.next(","));
np.persist = stof(f.next("")); np.persist = stof(f.next(","));
std::string optional_params = f.next("");
if (optional_params != "")
np.lacunarity = stof(optional_params);
return true; return true;
} }

8
src/test.cpp
View File

@ -440,7 +440,7 @@ struct TestPath: public TestBase
"some multiline text\n" \ "some multiline text\n" \
" with leading whitespace!\n" \ " with leading whitespace!\n" \
"\"\"\"\n" \ "\"\"\"\n" \
"np_terrain = 5, 40, (250, 250, 250), 12345, 5, 0.7\n" \ "np_terrain = 5, 40, (250, 250, 250), 12341, 5, 0.7, 2.4\n" \
"zoop = true" "zoop = true"
#define TEST_CONFIG_TEXT_AFTER \ #define TEST_CONFIG_TEXT_AFTER \
@ -467,12 +467,12 @@ struct TestPath: public TestBase
"\"\"\"\n" \ "\"\"\"\n" \
"np_terrain = {\n" \ "np_terrain = {\n" \
" flags = defaults\n" \ " flags = defaults\n" \
" lacunarity = 2\n" \ " lacunarity = 2.4\n" \
" octaves = 6\n" \ " octaves = 6\n" \
" offset = 3.5\n" \ " offset = 3.5\n" \
" persistence = 0.7\n" \ " persistence = 0.7\n" \
" scale = 40\n" \ " scale = 40\n" \
" seed = 12345\n" \ " seed = 12341\n" \
" spread = (250,250,250)\n" \ " spread = (250,250,250)\n" \
"}\n" \ "}\n" \
"zoop = true\n" \ "zoop = true\n" \
@ -552,7 +552,7 @@ struct TestSettings: public TestBase
UASSERT(fabs(np.spread.X - 250) < 0.001); UASSERT(fabs(np.spread.X - 250) < 0.001);
UASSERT(fabs(np.spread.Y - 250) < 0.001); UASSERT(fabs(np.spread.Y - 250) < 0.001);
UASSERT(fabs(np.spread.Z - 250) < 0.001); UASSERT(fabs(np.spread.Z - 250) < 0.001);
UASSERT(np.seed == 12345); UASSERT(np.seed == 12341);
UASSERT(np.octaves == 5); UASSERT(np.octaves == 5);
UASSERT(fabs(np.persist - 0.7) < 0.001); UASSERT(fabs(np.persist - 0.7) < 0.001);