From fee34d7874a89e8be22d69d2e1bfe9965abf7e54 Mon Sep 17 00:00:00 2001 From: Doloment Date: Fri, 26 Sep 2025 23:19:22 +0700 Subject: [PATCH] Mapgen improvements, still WIP though --- mods/CORE/MapGen/src/MapGen.lua | 14 ++--- mods/CORE/MapGen/src/MapGen/Region.lua | 63 +++++++++---------- mods/CORE/MapGen/src/MapGen/Region/Noises.lua | 8 --- .../MapGen/src/MapGen/Region/Trinoise.lua | 9 +++ .../src/MapGen/Region/TrinoiseParams.lua | 19 ++++++ 5 files changed, 64 insertions(+), 49 deletions(-) delete mode 100644 mods/CORE/MapGen/src/MapGen/Region/Noises.lua create mode 100644 mods/CORE/MapGen/src/MapGen/Region/Trinoise.lua create mode 100644 mods/CORE/MapGen/src/MapGen/Region/TrinoiseParams.lua diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index 9b1b6d5..5a0c212 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -11,8 +11,8 @@ local id_air = id("air") -- --- End Node's IDs -local modInfo = Mod.getInfo() -local require = modInfo.require +local modInfo = Mod.getInfo() +local require = modInfo.require ---@type MapGen.Layer local Layer = require("MapGen.Layer") @@ -81,9 +81,9 @@ end ---@param layerName string ---@param minPos table ---@param maxPos table ----@param noises table +---@param multinoise table ---@param regionIs2D boolean? -function MapGen:RegisterRegion(layerName, minPos, maxPos, noises, regionIs2D) +function MapGen:RegisterRegion(layerName, minPos, maxPos, multinoise, regionIs2D) ---@type MapGen.Layer local layer = self.layersByName[layerName] @@ -97,7 +97,7 @@ function MapGen:RegisterRegion(layerName, minPos, maxPos, noises, regionIs2D) end ---@type MapGen.Region - local region = Region:new(minPos, maxPos, noises) + local region = Region:new(minPos, maxPos, multinoise) --TODO: реализовать регистрацию допольнительных регионов для сглаживания шумов @@ -128,8 +128,8 @@ function MapGen:landscapeGeneration(data, area, x, y, z) -- The height noise values ​​of all regions that a node is part of are added together... ---@param region MapGen.Region for _, region in ipairs(regions) do - if region.noises.landscapeNoise ~= nil then - local noise = core.get_value_noise(region.noises.landscapeNoise) + if region.multinoise.landscapeNoise ~= nil then + local noise = core.get_value_noise(region.multinoise.landscapeNoise) noiseHeightValue = noiseHeightValue + noise:get_2d({x = x, y = z}) end diff --git a/mods/CORE/MapGen/src/MapGen/Region.lua b/mods/CORE/MapGen/src/MapGen/Region.lua index 77aea6f..949541c 100644 --- a/mods/CORE/MapGen/src/MapGen/Region.lua +++ b/mods/CORE/MapGen/src/MapGen/Region.lua @@ -1,55 +1,50 @@ ---============================================================ ---=======================WARNING!!!=========================== ---============================================================ ---======================THIS=FILE=IS========================== ---=======================STILL==WIP=========================== ---=========================BY==ME============================= ---============================================================ ---===================================Doloment================= ---============================================================ - -- TODO: replace `table` with `vector` for minPos and maxPos ---@class MapGen.Region ----@field minPos table ----@field maxPos table ----@field noises MapGen.Region.Noises ----@field noisesParams MapGen.Region.Noises -- ??? TODO: should be it's own class in EmmyLua + local Region = {} ----@param noisesParams MapGen.Region.Noises -- ??? TODO: should be it's own class in EmmyLua ----@return MapGen.Region.Noises -local function paramsToNoises(noisesParams) - ---@type MapGen.Region.Noises - local noises = {} +---@param multinoiseParams MapGen.Region.MultinoiseParams -- ??? TODO: should be it's own class in EmmyLua +---@return MapGen.Region.Multinoise +local function multinoiseParamsToMultinoise(multinoiseParams) + ---@type MapGen.Region.Multinoise + local multinoise = {} - for noiseName, noiseParams in pairs(noisesParams) do - noises[noiseName] = core.get_value_noise(noiseParams) + for noiseName, noiseParams in pairs(multinoiseParams) do + multinoise[noiseName] = core.get_value_noise(noiseParams) end - return noises + return multinoise end ----@param minPos table ----@param maxPos table ----@param noisesParams MapGen.Region.Noises +---@param minPos table +---@param maxPos table +---@param multinoiseParams MapGen.Region.MultinoiseParams ---@return MapGen.Region -function Region:new(minPos, maxPos, noisesParams) +function Region:new(minPos, maxPos, multinoiseParams) local _minPos = minPos local _maxPos = maxPos - local _noisesParams = noisesParams + local _multinoiseParams = multinoiseParams - local _noises = {} + local _multinoise = {} local instance = setmetatable({}, {__index = self}) - function instance:getMinPos() return _minPos end - function instance:getMaxPos() return _maxPos end - function instance:getNoisesParams() return _noisesParams end - function instance:getNoises() return _noises end + function instance:getMinPos() + return _minPos + end + function instance:getMaxPos() + return _maxPos + end + function instance:getMultinoiseParams() + return _multinoiseParams + end + function instance:getMultinoise() + return _multinoise + end - function instance:initNoises() - _noises = paramsToNoises(_noisesParams) + function instance:initMultinoise() + _multinoise = multinoiseParamsToMultinoise(_multinoiseParams) end return instance diff --git a/mods/CORE/MapGen/src/MapGen/Region/Noises.lua b/mods/CORE/MapGen/src/MapGen/Region/Noises.lua deleted file mode 100644 index 25abb33..0000000 --- a/mods/CORE/MapGen/src/MapGen/Region/Noises.lua +++ /dev/null @@ -1,8 +0,0 @@ ----Only for EmmyLua ----@class MapGen.Region.Noises ----@field landscapeNoise table? ----@field tempNoise table? ----@field humidityNoise table? -local Noises = {} - -return Noises \ No newline at end of file diff --git a/mods/CORE/MapGen/src/MapGen/Region/Trinoise.lua b/mods/CORE/MapGen/src/MapGen/Region/Trinoise.lua new file mode 100644 index 0000000..738054f --- /dev/null +++ b/mods/CORE/MapGen/src/MapGen/Region/Trinoise.lua @@ -0,0 +1,9 @@ +---For EmmyLua only + +---@class MapGen.Region.Multinoise +---@field landscapeNoise ValueNoise? -- TODO: describe ValueNoise class from Luanti (push Alek) +---@field tempNoise ValueNoise? +---@field humidityNoise ValueNoise? +local Multinoise = {} + +return Multinoise \ No newline at end of file diff --git a/mods/CORE/MapGen/src/MapGen/Region/TrinoiseParams.lua b/mods/CORE/MapGen/src/MapGen/Region/TrinoiseParams.lua new file mode 100644 index 0000000..b418aa9 --- /dev/null +++ b/mods/CORE/MapGen/src/MapGen/Region/TrinoiseParams.lua @@ -0,0 +1,19 @@ +---For EmmyLua only + +---@class MapGen.Region.NoiseParams +---@field offset number +---@field scale number +---@field spread vector -- TODO: describe vector class from Luanti (push Alek) +---@field seed number +---@field octaves number +---@field persistence number +---@field lacunarity number +---@field flags string? + +---@class MapGen.Region.MultinoiseParams +---@field landscapeNoiseParams MapGen.Region.NoiseParams? +---@field tempNoiseParams MapGen.Region.NoiseParams? +---@field humidityNoiseParams MapGen.Region.NoiseParams? +local MultinoiseParams = {} + +return MultinoiseParams \ No newline at end of file