Mapgen: write SuperUltraSigmaMapgen part 8.3

This commit is contained in:
Van
2025-11-27 22:31:33 +03:00
parent f556e4349e
commit d07b7c811f
7 changed files with 151 additions and 42 deletions

View File

@@ -1,8 +1,6 @@
---@class Item.Callbacks ---@class Item.Callbacks
local Callbacks = {} local Callbacks = {}
-- TODO: Разобраться с дубликатами аннотаций полей. Приоритетно брать аннотации из util/ide-helper
---Called when the 'place' key was pressed with the item in hand ---Called when the 'place' key was pressed with the item in hand
---and pointing at a node. ---and pointing at a node.
---Shall place item and return the leftover itemstack ---Shall place item and return the leftover itemstack

View File

@@ -40,7 +40,7 @@ local Cavern = require('MapGen.Cavern')
---@field layersByName table<string, MapGen.Layer> ---@field layersByName table<string, MapGen.Layer>
---@field layersList MapGen.Layer[] ---@field layersList MapGen.Layer[]
---@field peaksMultinoiseInitialized boolean Is the fractal noise of the peaks initialized? This is necessary for a one-time noise initialization. ---@field peaksMultinoiseInitialized boolean Is the fractal noise of the peaks initialized? This is necessary for a one-time noise initialization.
---@field cavernsNoiseInitialized boolean TODO: описание ---@field cavernsNoiseInitialized boolean Is the fractal noise of the caverns initialized? This is necessary for a one-time noise initialization.
---@field isRunning boolean A static field that guarantees that only one instance of the `MapGen` class will work. ---@field isRunning boolean A static field that guarantees that only one instance of the `MapGen` class will work.
---@field nodeIDs table<string, number> ---@field nodeIDs table<string, number>
---@field waterLevel number ---@field waterLevel number
@@ -92,17 +92,16 @@ end
--- ---
---Note: layers must not overlap. ---Note: layers must not overlap.
---@param name string The name that will be assigned to the layer. The name must be unique for each layer. ---@param name string The name that will be assigned to the layer. The name must be unique for each layer.
---@param minY number Minimum layer generation height. ---@param def MapGen.LayerDef Layer description table, see details `MapGen.LayerDef`
---@param maxY number Maximum layer generation height. function MapGen:RegisterLayer(name, def)
function MapGen:RegisterLayer(name, minY, maxY)
-- Layers with the same name cannot exist. -- Layers with the same name cannot exist.
assert(self.layersByName[name] == nil, ('A layer named `%s` is already registered.'):format(name)) assert(self.layersByName[name] == nil, ('A layer named `%s` is already registered.'):format(name))
-- Layers cannot overlap. -- Layers cannot overlap.
assert(self:getLayerByHeight(minY) == nil and self:getLayerByHeight(maxY) == nil, 'Registered layers must not overlap!') assert(self:getLayerByHeight(def.minY) == nil and self:getLayerByHeight(def.maxY) == nil, 'Registered layers must not overlap!')
---@type MapGen.Layer ---@type MapGen.Layer
local layer = Layer:new(name, minY, maxY) local layer = Layer:new(name, def)
self.layersByName[name] = layer self.layersByName[name] = layer
table.insert(self.layersList, layer) table.insert(self.layersList, layer)
@@ -286,9 +285,12 @@ end
---@param y number ---@param y number
---@param z number ---@param z number
local function generateNode(mapGenerator, layer, height, temp, humidity, data, index, x, y, z) local function generateNode(mapGenerator, layer, height, temp, humidity, data, index, x, y, z)
height, temp, humidity = mathRound(height), mathRound(temp), mathRound(humidity)
local ids = mapGenerator.nodeIDs local ids = mapGenerator.nodeIDs
local waterLevel = mapGenerator.waterLevel local waterLevel = mapGenerator.waterLevel
-- TODO: оформить это по-нормальному
local m = math.random(-5, 5) local m = math.random(-5, 5)
temp = mathMin(100, mathMax(0, temp + m)) temp = mathMin(100, mathMax(0, temp + m))
@@ -296,7 +298,7 @@ local function generateNode(mapGenerator, layer, height, temp, humidity, data, i
--_height = mathMin(layer.maxY, mathMax(layer.minY, y + m)) --_height = mathMin(layer.maxY, mathMax(layer.minY, y + m))
---@type MapGen.Biome ---@type MapGen.Biome
local biome = layer.biomesDiagram[y][mathRound(temp)][mathRound(humidity)] local biome = layer.biomesDiagram[y][temp][humidity]
if y > height and y > waterLevel then if y > height and y > waterLevel then
data[index] = ids.air data[index] = ids.air
@@ -412,7 +414,7 @@ local function calcNoises2dValues(triangle, x, y, z)
noiseHumidityValue = noiseHumidityValue + peak3:getMultinoise().humidityNoise:get_2d({x = x, y = z}) * weight noiseHumidityValue = noiseHumidityValue + peak3:getMultinoise().humidityNoise:get_2d({x = x, y = z}) * weight
totalWeight = totalWeight + weight totalWeight = totalWeight + weight
return mathRound(noiseHeightValue / totalWeight), mathRound(noiseTempValue / totalWeight), mathRound(noiseHumidityValue / totalWeight) return noiseHeightValue / totalWeight, noiseTempValue / totalWeight, noiseHumidityValue / totalWeight
end end
---Calculates a smoothed 2D noise value based on a preliminary space partitioning. ---Calculates a smoothed 2D noise value based on a preliminary space partitioning.
@@ -431,6 +433,8 @@ function MapGen:getNoises2dValues(layer, x, y, z)
if pastNoise2DCalc.triangle ~= nil and pointInTriangle(x, z, pastNoise2DCalc.triangle) then if pastNoise2DCalc.triangle ~= nil and pointInTriangle(x, z, pastNoise2DCalc.triangle) then
local noiseHeightValue, noiseTempValue, noiseHumidityValue = calcNoises2dValues(pastNoise2DCalc.triangle, x, y, z) local noiseHeightValue, noiseTempValue, noiseHumidityValue = calcNoises2dValues(pastNoise2DCalc.triangle, x, y, z)
noiseTempValue, noiseHumidityValue = layer:calcTemp(noiseTempValue, y), layer:calcHumidity(noiseHumidityValue, y)
pastNoise2DCalc.x = x pastNoise2DCalc.x = x
pastNoise2DCalc.z = z pastNoise2DCalc.z = z
pastNoise2DCalc.noiseValues = { pastNoise2DCalc.noiseValues = {
@@ -447,6 +451,8 @@ function MapGen:getNoises2dValues(layer, x, y, z)
if pointInTriangle(x, z,triangle) then if pointInTriangle(x, z,triangle) then
local noiseHeightValue, noiseTempValue, noiseHumidityValue = calcNoises2dValues(triangle, x, y, z) local noiseHeightValue, noiseTempValue, noiseHumidityValue = calcNoises2dValues(triangle, x, y, z)
noiseTempValue, noiseHumidityValue = layer:calcTemp(noiseTempValue, y), layer:calcHumidity(noiseHumidityValue, y)
pastNoise2DCalc.triangle = triangle pastNoise2DCalc.triangle = triangle
pastNoise2DCalc.x = x pastNoise2DCalc.x = x
pastNoise2DCalc.z = z pastNoise2DCalc.z = z
@@ -574,7 +580,7 @@ local function generatorHandler(mapGenerator, data, index, x, y, z)
-- Calculating landscape height -- Calculating landscape height
local noiseHeightValue, noiseTempValue, noiseHumidityValue = mapGenerator:getNoises2dValues(layer, x, y, z) local noiseHeightValue, noiseTempValue, noiseHumidityValue = mapGenerator:getNoises2dValues(layer, x, y, z)
-- If the height of the landscape is zero, -- If the height of the landscape is `nil`,
-- then the point does not fall within any of the triangles. -- then the point does not fall within any of the triangles.
if noiseHeightValue == nil then if noiseHeightValue == nil then
noiseHeightValue = 0.0 noiseHeightValue = 0.0

View File

@@ -1,3 +1,5 @@
local id = core.get_content_id
---@class MapGen.Biome ---@class MapGen.Biome
---@field name string ---@field name string
---@field tempPoint number ---@field tempPoint number
@@ -5,8 +7,10 @@
---@field minY number ---@field minY number
---@field maxY number ---@field maxY number
---@field groundNodes MapGen.Biome.GroundNodes ---@field groundNodes MapGen.Biome.GroundNodes
---@field groundNodesIds MapGen.Biome.GroundNodesIds
---@field soilHeight number ---@field soilHeight number
---@field generateRock fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number) ---@field generateRock fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)
---@field generateTurf fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)
---@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number) ---@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)
---@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number) ---@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)
local Biome = {} local Biome = {}
@@ -22,6 +26,7 @@ local Biome = {}
---@field groundNodes MapGen.Biome.GroundNodes ---@field groundNodes MapGen.Biome.GroundNodes
---@field soilHeight number ---@field soilHeight number
---@field generateRock fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)? ---@field generateRock fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)?
---@field generateTurf fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)?
---@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)? ---@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)?
---@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)? ---@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)?
@@ -36,7 +41,18 @@ local Biome = {}
---@param y number ---@param y number
---@param z number ---@param z number
local defaultGenerateRock = function(mapGenerator, biome, data, index, x, y, z) local defaultGenerateRock = function(mapGenerator, biome, data, index, x, y, z)
--TODO: минимальную логику генерации прописать data[index] = biome.groundNodesIds.rock
end
---@param mapGenerator MapGen
---@param biome MapGen.Biome
---@param data number[]
---@param index number
---@param x number
---@param y number
---@param z number
local defaultGenerateTurf = function(mapGenerator, biome, data, index, x, y, z)
data[index] = biome.groundNodesIds.turf
end end
---@param mapGenerator MapGen ---@param mapGenerator MapGen
@@ -47,7 +63,7 @@ end
---@param y number ---@param y number
---@param z number ---@param z number
local defaultGenerateSoil = function(mapGenerator, biome, data, index, x, y, z) local defaultGenerateSoil = function(mapGenerator, biome, data, index, x, y, z)
--TODO: минимальную логику генерации прописать data[index] = biome.groundNodesIds.soil
end end
---@param mapGenerator MapGen ---@param mapGenerator MapGen
@@ -58,7 +74,7 @@ end
---@param y number ---@param y number
---@param z number ---@param z number
local defaultGenerateBottom = function(mapGenerator, biome, data, index, x, y, z) local defaultGenerateBottom = function(mapGenerator, biome, data, index, x, y, z)
--TODO: минимальную логику генерации прописать data[index] = biome.groundNodesIds.bottom
end end
@@ -67,20 +83,31 @@ end
---@return MapGen.Biome ---@return MapGen.Biome
function Biome:new(name, def) function Biome:new(name, def)
if def.generateRock == nil then if def.generateRock == nil then
Logger.warningLog('MapGen.Biome: The `%s` biome does not have a specified `generateRock()` function. The default function is used.', name) Logger.infoLog('MapGen.Biome: The `%s` biome does not have a specified `generateRock()` function. The default function is used.', name)
def.generateRock = defaultGenerateRock def.generateRock = defaultGenerateRock
end end
if def.generateTurf == nil then
Logger.infoLog('MapGen.Biome: The `%s` biome does not have a specified `generateTurf()` function. The default function is used.', name)
def.generateTurf = defaultGenerateTurf
end
if def.generateSoil == nil then if def.generateSoil == nil then
Logger.warningLog('MapGen.Biome: The `%s` biome does not have a specified `generateSoil()` function. The default function is used.', name) Logger.infoLog('MapGen.Biome: The `%s` biome does not have a specified `generateSoil()` function. The default function is used.', name)
def.generateSoil = defaultGenerateSoil def.generateSoil = defaultGenerateSoil
end end
if def.generateBottom == nil then if def.generateBottom == nil then
Logger.warningLog('MapGen.Biome: The `%s` biome does not have a specified `generateBottom()` function. The default function is used.', name) Logger.infoLog('MapGen.Biome: The `%s` biome does not have a specified `generateBottom()` function. The default function is used.', name)
def.generateBottom = defaultGenerateBottom def.generateBottom = defaultGenerateBottom
end end
local groundNodesIds = {}
-- Converting node names to IDs
for k, v in pairs(def.groundNodes) do
groundNodesIds[k] = id(v)
end
---@type MapGen.Biome ---@type MapGen.Biome
local instance = setmetatable({ local instance = setmetatable({
name = name, name = name,
@@ -89,10 +116,12 @@ function Biome:new(name, def)
minY = def.minY, minY = def.minY,
maxY = def.maxY, maxY = def.maxY,
groundNodes = def.groundNodes, groundNodes = def.groundNodes,
groundNodesIds = groundNodesIds,
soilHeight = def.soilHeight, soilHeight = def.soilHeight,
generateRock = def.generateRock or defaultGenerateRock, generateRock = def.generateRock,
generateSoil = def.generateSoil or defaultGenerateSoil, generateSoil = def.generateSoil,
generateBottom = def.generateBottom or defaultGenerateBottom, generateTurf = def.generateTurf,
generateBottom = def.generateBottom,
}, {__index = self}) }, {__index = self})
return instance return instance

View File

@@ -4,6 +4,8 @@
---@class MapGen.Biome.GroundNodes ---@class MapGen.Biome.GroundNodes
---@field turf string The soil covering the surface of the biome ---@field turf string The soil covering the surface of the biome
---@field soil string The soil beneath the turf. The height of this layer depends on `Biome.soilHeight` ---@field soil string The soil beneath the turf. The height of this layer depends on `Biome.soilHeight`
---@field rock string The rock found beneath the soil of a biome.
---@field bottom string Covering the bottom of reservoirs.
local GroundNodes = {} local GroundNodes = {}
return GroundNodes return GroundNodes

View File

@@ -0,0 +1,11 @@
--- Only for EmmyLua
---**Only for EmmyLua.**
---@class MapGen.Biome.GroundNodesIds
---@field turf number The soil covering the surface of the biome
---@field soil number The soil beneath the turf. The height of this layer depends on `Biome.soilHeight`
---@field rock number The rock found beneath the soil of a biome.
---@field bottom number Covering the bottom of reservoirs.
local GroundNodes = {}
return GroundNodes

View File

@@ -2,6 +2,12 @@
---@field name string ---@field name string
---@field minY number ---@field minY number
---@field maxY number ---@field maxY number
---@field minTemp number
---@field maxTemp number
---@field minHumidity number
---@field maxHumidity number
---@field calcTemp fun(self:MapGen.Layer, value:number, height:number):number
---@field calcHumidity fun(self:MapGen.Layer, value:number, height:number):number
---@field peaksList MapGen.Peak[] ---@field peaksList MapGen.Peak[]
---@field biomesByName table<string, MapGen.Biome> ---@field biomesByName table<string, MapGen.Biome>
---@field biomesList MapGen.Biome[] ---@field biomesList MapGen.Biome[]
@@ -21,16 +27,52 @@ local Layer = {
tetrahedronsList = {}, tetrahedronsList = {},
} }
---Definition table for the `MapGen.Layer`.
---
---**Only for EmmyLua.**
---@class MapGen.LayerDef
---@field minY number
---@field maxY number
---@field minTemp number
---@field maxTemp number
---@field minHumidity number
---@field maxHumidity number
---@field calcTemp (fun(self:MapGen.Layer, value:number, height:number):number)?
---@field calcHumidity (fun(self:MapGen.Layer, value:number, height:number):number)?
---@param self MapGen.Layer
---@param value number
---@param height number
---@return number
local function defaultCalcFunc(self, value, height)
return value
end
---@param name string ---@param name string
---@param minY number ---@param def MapGen.LayerDef
---@param maxY number
---@return MapGen.Layer ---@return MapGen.Layer
function Layer:new(name, minY, maxY) function Layer:new(name, def)
if def.calcTemp == nil then
Logger.infoLog('MapGen.Layer: The `%s` layer does not have a specified `calcTemp()` function. The default function is used.', name)
def.calcTemp = defaultCalcFunc
end
if def.calcHumidity == nil then
Logger.infoLog('MapGen.Layer: The `%s` layer does not have a specified `calcHumidity()` function. The default function is used.', name)
def.calcHumidity = defaultCalcFunc
end
---@type MapGen.Layer ---@type MapGen.Layer
local instance = setmetatable({ local instance = setmetatable({
name = name, name = name,
minY = minY, minY = def.minY,
maxY = maxY, maxY = def.maxY,
minTemp = def.minTemp,
maxTemp = def.maxTemp,
minHumidity = def.minHumidity,
maxHumidity = def.maxHumidity,
calcTemp = def.calcTemp,
calcHumidity = def.calcHumidity,
}, {__index = self}) }, {__index = self})
return instance return instance
@@ -98,10 +140,10 @@ function Layer:initBiomesDiagram()
end end
pastBiomesNames = newBiomesNames pastBiomesNames = newBiomesNames
for temp = 0, 100 do for temp = self.minTemp, self.maxTemp do
diagram[height][temp] = {} diagram[height][temp] = {}
for humidity = 0, 100 do for humidity = self.minHumidity, self.maxHumidity do
local minDistance = math.huge local minDistance = math.huge
local closestBiome = nil local closestBiome = nil

View File

@@ -63,7 +63,24 @@ local mapGenerator = MapGen:new({
}, 10 }, 10
) )
mapGenerator:RegisterLayer("world", -1000, 500) local function calcTemp(layer, value, height)
return value
end
local function calcHumidity(layer, value, height)
return value
end
mapGenerator:RegisterLayer("world", {
minY = -50,
maxY = 50,
minTemp = 0,
maxTemp = 100,
minHumidity = 0,
maxHumidity = 100,
calcTemp = calcTemp,
calcHumidity = calcHumidity,
})
local land1 = { local land1 = {
offset = -20, offset = -20,
@@ -182,7 +199,7 @@ local rocksNoiseParams ={
} }
local function generateRock(mapGenerator, biome, data, index, x, y, z) local function generateRock(mapGenerator, biome, data, index, x, y, z)
local ids = mapGenerator.nodeIDs --TODO перенести камни в Biome local ids = mapGenerator.nodeIDs
if rocksNoise == nil then if rocksNoise == nil then
rocksNoise = core.get_value_noise(rocksNoiseParams) rocksNoise = core.get_value_noise(rocksNoiseParams)
@@ -209,7 +226,7 @@ local function generateRock(mapGenerator, biome, data, index, x, y, z)
end end
local function generateSoil(mapGenerator, biome, data, index, x, y, z) local function generateSoil(mapGenerator, biome, data, index, x, y, z)
data[index] = core.get_content_id(biome.groundNodes.turf) -- TODO: убрать тут get_content_id(), переместить его куда-то "выше" data[index] = biome.groundNodesId.turf
end end
mapGenerator:registerBiome('world', "biome1", { mapGenerator:registerBiome('world', "biome1", {
@@ -220,10 +237,12 @@ mapGenerator:registerBiome('world', "biome1", {
groundNodes = { groundNodes = {
soil = "soils:clay_soil_baren", soil = "soils:clay_soil_baren",
turf = "soils:clay_soil_baren", turf = "soils:clay_soil_baren",
rock = "rocks:sylite",
bottom = "soils:rocky_soil_baren",
}, },
soilHeight = 1, soilHeight = 1,
generateRock = generateRock, --generateRock = generateRock,
generateSoil = generateSoil, --generateSoil = generateSoil,
}) })
mapGenerator:registerBiome('world', "biome2", { mapGenerator:registerBiome('world', "biome2", {
@@ -234,10 +253,12 @@ mapGenerator:registerBiome('world', "biome2", {
groundNodes = { groundNodes = {
soil = "soils:rocky_soil_baren", soil = "soils:rocky_soil_baren",
turf = "soils:rocky_soil_baren", turf = "soils:rocky_soil_baren",
rock = "rocks:felhor",
bottom = "soils:clay_soil_baren",
}, },
soilHeight = 1, soilHeight = 1,
generateRock = generateRock, --generateRock = generateRock,
generateSoil = generateSoil, --generateSoil = generateSoil,
}) })
mapGenerator:run() mapGenerator:run()