voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-10 21:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

add heightmap.normalNoise flag

Browse source
This commit is contained in:
MihailRis 2026-08-24 19:00:03 +03:00
parent 136cf48605
commit ab64f90687
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/logic/scripting/lua/usertypes/lua_type_heightmap.cpp
View file

@ -110,6 +110,7 @@ static int l_noise(lua::State* L) {
if (gettop(L) > 6) { if (gettop(L) > 6) {
shiftMapY = touserdata<LuaHeightmap>(L, 7); shiftMapY = touserdata<LuaHeightmap>(L, 7);
} }
bool normalizedNoise = heightmap->normalizedNoise;
noise->noise_type = noise_type; noise->noise_type = noise_type;
for (uint y = 0; y < h; y++) { for (uint y = 0; y < h; y++) {
for (uint x = 0; x < w; x++) { for (uint x = 0; x < w; x++) {
@ -126,8 +127,14 @@ static int l_noise(lua::State* L) {
v += shiftMapY->getValues()[i]; v += shiftMapY->getValues()[i];
} }
value += fnlGetNoise2D(noise, u, v) / float noiseValue = fnlGetNoise2D(noise, u, v);
static_cast<float>(1 << c) * multiplier; if (normalizedNoise) {
float t = 1.0f / (static_cast<float>(1 << c) * multiplier);
value = value * (1.0f - t) + noiseValue * t;
} else {
float t = 1.0f / static_cast<float>(1 << c) * multiplier;
value += noiseValue * t;
}
heights[i] = value; heights[i] = value;
} }
} }
@ -317,6 +324,8 @@ static int l_meta_newindex(lua::State* L) {
auto fieldname = tostring(L, 2); auto fieldname = tostring(L, 2);
if (!std::strcmp(fieldname, "noiseSeed")) { if (!std::strcmp(fieldname, "noiseSeed")) {
map->setSeed(tointeger(L, 3)); map->setSeed(tointeger(L, 3));
} else if (!std::strcmp(fieldname, "normalNoise")) {
map->normalizedNoise = toboolean(L, 3);
} }
} }
return 0; return 0;

2
src/logic/scripting/lua/usertypes/lua_type_heightmap.hpp
View file

@ -10,6 +10,8 @@ namespace lua {
std::shared_ptr<Heightmap> map; std::shared_ptr<Heightmap> map;
std::unique_ptr<fnl_state> noise; std::unique_ptr<fnl_state> noise;
public: public:
bool normalizedNoise = false;
LuaHeightmap(const std::shared_ptr<Heightmap>& map); LuaHeightmap(const std::shared_ptr<Heightmap>& map);
LuaHeightmap(uint width, uint height); LuaHeightmap(uint width, uint height);