From 3e66be9705008d5f6bdf6bab1b2d34061fe66d90 Mon Sep 17 00:00:00 2001 From: Vanic Date: Wed, 29 Oct 2025 21:37:17 +0300 Subject: [PATCH] Mapgen: write SuperUltraSigmaMapgen part 1 --- mods/CORE/MapGen/init.lua | 1 - mods/CORE/MapGen/src/MapGen/Cell.lua | 70 +++++++++++++++++ .../MapGen/{Region => Cell}/Multinoise.lua | 2 +- .../{Region => Cell}/MultinoiseParams.lua | 2 +- mods/CORE/MapGen/src/MapGen/Layer.lua | 64 +++++++++------- mods/CORE/MapGen/src/MapGen/Region.lua | 76 ------------------- 6 files changed, 110 insertions(+), 105 deletions(-) create mode 100644 mods/CORE/MapGen/src/MapGen/Cell.lua rename mods/CORE/MapGen/src/MapGen/{Region => Cell}/Multinoise.lua (83%) rename mods/CORE/MapGen/src/MapGen/{Region => Cell}/MultinoiseParams.lua (82%) delete mode 100644 mods/CORE/MapGen/src/MapGen/Region.lua diff --git a/mods/CORE/MapGen/init.lua b/mods/CORE/MapGen/init.lua index 1d4e918..847ec48 100644 --- a/mods/CORE/MapGen/init.lua +++ b/mods/CORE/MapGen/init.lua @@ -3,4 +3,3 @@ local MapGen = Mod:new() MapGen.Class = MapGen.require('MapGen') Api.addModToGlobalSpace(MapGen, 'Core.MapGen') - diff --git a/mods/CORE/MapGen/src/MapGen/Cell.lua b/mods/CORE/MapGen/src/MapGen/Cell.lua new file mode 100644 index 0000000..4d6982a --- /dev/null +++ b/mods/CORE/MapGen/src/MapGen/Cell.lua @@ -0,0 +1,70 @@ +---@class MapGen.Cell +---@field getCellPos fun():vector +---@field getMultinoiseParams fun():MapGen.Cell.MultinoiseParams +---@field getMultinoise fun():MapGen.Cell.Multinoise +---@field initMultinoise fun() +---@field getWeightFactor fun():number +local Cell = {} + +---@param multinoiseParams MapGen.Cell.MultinoiseParams +---@return MapGen.Cell.Multinoise +local function multinoiseParamsToMultinoise(multinoiseParams) + ---@type MapGen.Cell.Multinoise + local multinoise = {} + + for noiseName, noiseParams in pairs(multinoiseParams) do + multinoise[noiseName] = core.get_value_noise(noiseParams) + end + + return multinoise +end + +---@param cellPos vector +---@param multinoiseParams MapGen.Cell.MultinoiseParams +---@param weightFactor number TODO: возможно этот параметр не пригодится +---@return MapGen.Cell +function Cell:new(cellPos, multinoiseParams, weightFactor) + ---@type vector + local _cellPos = cellPos + ---@type MapGen.Cell.MultinoiseParams + local _multinoiseParams = multinoiseParams + + if weightFactor < 0 then + weightFactor = 1 + end + + ---@type MapGen.Cell.Multinoise + local _multinoise = {} -- note: must be empty until luanti mapgen objects are loaded. + + ---@type MapGen.Cell + local instance = setmetatable({}, {__index = self}) + + function instance:getCellPos() + return _cellPos + end + + function instance:getMultinoiseParams() + return _multinoiseParams + end + + function instance:getMultinoise() + return _multinoise + end + + function instance:initMultinoise() + if not table.is_empty(_multinoise) then + minetest.log('warning', 'Multinoise has already been initialized. Re-initialization is not recommended.') + end + + _multinoise = multinoiseParamsToMultinoise(_multinoiseParams) + print(dump(_multinoise)) + end + + function instance.getWeightFactor() + return weightFactor + end + + return instance +end + +return Cell diff --git a/mods/CORE/MapGen/src/MapGen/Region/Multinoise.lua b/mods/CORE/MapGen/src/MapGen/Cell/Multinoise.lua similarity index 83% rename from mods/CORE/MapGen/src/MapGen/Region/Multinoise.lua rename to mods/CORE/MapGen/src/MapGen/Cell/Multinoise.lua index bdf8043..7cfe985 100644 --- a/mods/CORE/MapGen/src/MapGen/Region/Multinoise.lua +++ b/mods/CORE/MapGen/src/MapGen/Cell/Multinoise.lua @@ -1,6 +1,6 @@ ---For EmmyLua only ----@class MapGen.Region.Multinoise +---@class MapGen.Cell.Multinoise ---@field landscapeNoise ValueNoise? ---@field tempNoise ValueNoise? ---@field humidityNoise ValueNoise? diff --git a/mods/CORE/MapGen/src/MapGen/Region/MultinoiseParams.lua b/mods/CORE/MapGen/src/MapGen/Cell/MultinoiseParams.lua similarity index 82% rename from mods/CORE/MapGen/src/MapGen/Region/MultinoiseParams.lua rename to mods/CORE/MapGen/src/MapGen/Cell/MultinoiseParams.lua index 18d872c..96b4acf 100644 --- a/mods/CORE/MapGen/src/MapGen/Region/MultinoiseParams.lua +++ b/mods/CORE/MapGen/src/MapGen/Cell/MultinoiseParams.lua @@ -1,6 +1,6 @@ ---For EmmyLua only ----@class MapGen.Region.MultinoiseParams +---@class MapGen.Cell.MultinoiseParams ---@field landscapeNoise NoiseParams? ---@field tempNoise NoiseParams? ---@field humidityNoise NoiseParams? diff --git a/mods/CORE/MapGen/src/MapGen/Layer.lua b/mods/CORE/MapGen/src/MapGen/Layer.lua index 720d433..a8095a0 100644 --- a/mods/CORE/MapGen/src/MapGen/Layer.lua +++ b/mods/CORE/MapGen/src/MapGen/Layer.lua @@ -2,9 +2,9 @@ ---@field name string ---@field minY number ---@field maxY number ----@field regionsList table +---@field cellsList table local Layer = { - regionsList = {} + cellsList = {} } ---@param name string @@ -22,42 +22,54 @@ function Layer:new(name, minY, maxY) return instance end ----@param region MapGen.Region -function Layer:addRegion(region) - table.insert(self.regionsList, region) +---@param cell MapGen.Cell +function Layer:addCell(cell) + table.insert(self.cellsList, cell) + -- TODO: добавить сортировку массива для оптимизации. + -- Вероятно будет лучше в отдельной фунции и засунуть её в MapGen.run end +---Returns the two closest cells. ---@param xPos number ---@param yPos number ---@param zPos number ----@return MapGen.Region[] -function Layer:getRegionsByPos(xPos, yPos, zPos) - -- TODO: возможно здесь получится сделать более оптимизированный алгоритм - -- учитывая тот факт, что эта функция вызывается для каждой ноды в on_generated - -- и может быть даже не один раз - -- Можно подумать над тем, чтобы использовать сортированный список +---@return MapGen.Cell?, MapGen.Cell? +function Layer:getCellsByPos(xPos, yPos, zPos) + -- TODO: дописать алгоритмы оптимизации: + -- * по сортированному массиву + -- * с помощью минимальных расстояний-гарантов - ---@type MapGen.Region[] - local regions = {} + ---@type MapGen.Cell, MapGen.Cell + local cellA, cellB - ---@param region MapGen.Region - for _, region in ipairs(self.regionsList) do + -- Note: to optimize the distance, the dots are always in a square. + local pastDistance = math.huge + local newDistance = 0.0 - if ( - xPos >= region:getMinPos().x and - yPos >= region:getMinPos().y and - zPos >= region:getMinPos().z) and - ( - xPos <= region:getMaxPos().x and - yPos <= region:getMaxPos().y and - zPos <= region:getMaxPos().z - ) then - table.insert(regions, region) + --- @type vector + local cellPos + + ---@param cell MapGen.Cell + for _, cell in ipairs(self.cellsList) do + + if cellA == nil then + cellA = cell + goto continue end + cellPos = cell.getCellPos() + newDistance = (xPos - cellPos.x)^2 + (yPos - cellPos.y)^2 + (zPos - cellPos.z)^2 + + if newDistance < pastDistance then + cellB = cellA + cellA = cellB + pastDistance = newDistance + end + + ::continue:: end - return regions + return cellA, cellB end return Layer diff --git a/mods/CORE/MapGen/src/MapGen/Region.lua b/mods/CORE/MapGen/src/MapGen/Region.lua deleted file mode 100644 index 0c98e16..0000000 --- a/mods/CORE/MapGen/src/MapGen/Region.lua +++ /dev/null @@ -1,76 +0,0 @@ ----@class MapGen.Region ----@field getMinPos fun():vector ----@field getMaxPos fun():vector ----@field getMultinoiseParams fun():MapGen.Region.MultinoiseParams ----@field getMultinoise fun():MapGen.Region.Multinoise ----@field initMultinoise fun() ----@field getWeightFactor fun():number -local Region = {} - ----@param multinoiseParams MapGen.Region.MultinoiseParams ----@return MapGen.Region.Multinoise -local function multinoiseParamsToMultinoise(multinoiseParams) - ---@type MapGen.Region.Multinoise - local multinoise = {} - - for noiseName, noiseParams in pairs(multinoiseParams) do - multinoise[noiseName] = core.get_value_noise(noiseParams) - end - - return multinoise -end - ----@param minPos vector ----@param maxPos vector ----@param multinoiseParams MapGen.Region.MultinoiseParams ----@param weightFactor number ----@return MapGen.Region -function Region:new(minPos, maxPos, multinoiseParams, weightFactor) - - ---@type vector - local _minPos = minPos - ---@type vector - local _maxPos = maxPos - ---@type MapGen.Region.MultinoiseParams - local _multinoiseParams = multinoiseParams - - if weightFactor < 0 then - weightFactor = 1 - end - - ---@type MapGen.Region.Multinoise - local _multinoise = {} - - ---@type MapGen.Region - local instance = setmetatable({}, {__index = self}) - - function instance:getMinPos() - return _minPos - end - - ---@return vector - function instance:getMaxPos() - return _maxPos - end - - function instance:getMultinoiseParams() - return _multinoiseParams - end - - function instance:getMultinoise() - return _multinoise - end - - function instance:initMultinoise() - _multinoise = multinoiseParamsToMultinoise(_multinoiseParams) - print(dump(_multinoise)) - end - - function instance.getWeightFactor() - return weightFactor - end - - return instance -end - -return Region