Mapgen: write SuperUltraSigmaMapgen part 1

This commit is contained in:
Van
2025-10-29 21:37:17 +03:00
parent 3306941c43
commit 3e66be9705
6 changed files with 110 additions and 105 deletions

View File

@@ -3,4 +3,3 @@ local MapGen = Mod:new()
MapGen.Class = MapGen.require('MapGen') MapGen.Class = MapGen.require('MapGen')
Api.addModToGlobalSpace(MapGen, 'Core.MapGen') Api.addModToGlobalSpace(MapGen, 'Core.MapGen')

View File

@@ -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

View File

@@ -1,6 +1,6 @@
---For EmmyLua only ---For EmmyLua only
---@class MapGen.Region.Multinoise ---@class MapGen.Cell.Multinoise
---@field landscapeNoise ValueNoise? ---@field landscapeNoise ValueNoise?
---@field tempNoise ValueNoise? ---@field tempNoise ValueNoise?
---@field humidityNoise ValueNoise? ---@field humidityNoise ValueNoise?

View File

@@ -1,6 +1,6 @@
---For EmmyLua only ---For EmmyLua only
---@class MapGen.Region.MultinoiseParams ---@class MapGen.Cell.MultinoiseParams
---@field landscapeNoise NoiseParams? ---@field landscapeNoise NoiseParams?
---@field tempNoise NoiseParams? ---@field tempNoise NoiseParams?
---@field humidityNoise NoiseParams? ---@field humidityNoise NoiseParams?

View File

@@ -2,9 +2,9 @@
---@field name string ---@field name string
---@field minY number ---@field minY number
---@field maxY number ---@field maxY number
---@field regionsList table ---@field cellsList table
local Layer = { local Layer = {
regionsList = {} cellsList = {}
} }
---@param name string ---@param name string
@@ -22,42 +22,54 @@ function Layer:new(name, minY, maxY)
return instance return instance
end end
---@param region MapGen.Region ---@param cell MapGen.Cell
function Layer:addRegion(region) function Layer:addCell(cell)
table.insert(self.regionsList, region) table.insert(self.cellsList, cell)
-- TODO: добавить сортировку массива для оптимизации.
-- Вероятно будет лучше в отдельной фунции и засунуть её в MapGen.run
end end
---Returns the two closest cells.
---@param xPos number ---@param xPos number
---@param yPos number ---@param yPos number
---@param zPos number ---@param zPos number
---@return MapGen.Region[] ---@return MapGen.Cell?, MapGen.Cell?
function Layer:getRegionsByPos(xPos, yPos, zPos) function Layer:getCellsByPos(xPos, yPos, zPos)
-- TODO: возможно здесь получится сделать более оптимизированный алгоритм -- TODO: дописать алгоритмы оптимизации:
-- учитывая тот факт, что эта функция вызывается для каждой ноды в on_generated -- * по сортированному массиву
-- и может быть даже не один раз -- * с помощью минимальных расстояний-гарантов
-- Можно подумать над тем, чтобы использовать сортированный список
---@type MapGen.Region[] ---@type MapGen.Cell, MapGen.Cell
local regions = {} local cellA, cellB
---@param region MapGen.Region -- Note: to optimize the distance, the dots are always in a square.
for _, region in ipairs(self.regionsList) do local pastDistance = math.huge
local newDistance = 0.0
if ( --- @type vector
xPos >= region:getMinPos().x and local cellPos
yPos >= region:getMinPos().y and
zPos >= region:getMinPos().z) and ---@param cell MapGen.Cell
( for _, cell in ipairs(self.cellsList) do
xPos <= region:getMaxPos().x and
yPos <= region:getMaxPos().y and if cellA == nil then
zPos <= region:getMaxPos().z cellA = cell
) then goto continue
table.insert(regions, region)
end 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 end
return regions return cellA, cellB
end end
return Layer return Layer

View File

@@ -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