Mapgen improvements, still WIP though

This commit is contained in:
2025-09-26 23:19:22 +07:00
parent 330a847888
commit fee34d7874
5 changed files with 64 additions and 49 deletions

View File

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

View File

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

View File

@@ -1,8 +0,0 @@
---Only for EmmyLua
---@class MapGen.Region.Noises
---@field landscapeNoise table?
---@field tempNoise table?
---@field humidityNoise table?
local Noises = {}
return Noises

View File

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

View File

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