MapGen: minor refactoring

This commit is contained in:
Van
2026-03-21 21:26:27 +03:00
parent 79df8f2f52
commit ceb35639b8
4 changed files with 73 additions and 93 deletions

View File

@@ -1,5 +1,5 @@
local mathAbs, mathRound, mathMin, mathMax, mathRandom, mathClamp, tableInsert local mathRound, mathRandom, mathClamp, tableInsert
= math.abs, math.round, math.min, math.max, math.random, math.clamp, table.insert = math.round, math.random, math.clamp, table.insert
local posToString, getUsTime = core.pos_to_string, core.get_us_time local posToString, getUsTime = core.pos_to_string, core.get_us_time
@@ -7,19 +7,12 @@ local pairs, ipairs, assert = pairs, ipairs, assert
local v = vector.new local v = vector.new
local id = core.get_content_id local id = core.get_content_id
local AIR_ID = core.CONTENT_AIR
local getInstance = Class.getInstance local getInstance = Class.getInstance
local LOG_PROFILE = true local LOG_PROFILE = true
local PROFILE_CHUNK = true
local function calculateAverage(t)
if #t == 0 then return 0 end -- Защита от деления на ноль
local sum = 0
for i = 1, #t do
sum = sum + t[i]
end
return sum / #t
end
local function mglog(text, ...) local function mglog(text, ...)
core.log((text):format(...)) core.log((text):format(...))
@@ -28,26 +21,27 @@ end
local modInfo = Mod.getInfo('smc__core__map_gen') local modInfo = Mod.getInfo('smc__core__map_gen')
local require = modInfo.require local require = modInfo.require
---Numeric values ​​defining the surface height and climate for the node.
---@alias MapGen.factors {height:number, temp:number, humidity:number} ---@alias MapGen.factors {height:number, temp:number, humidity:number}
---Table of all past generation factor calculations for nodes.
---
---Contains generation factors by layer name and coordinate.
---@type table<string, table<string, MapGen.factors>> ---@type table<string, table<string, MapGen.factors>>
local pastNoiseValues = {} local pastNoiseValues = {}
---The triangle in which generation occurred for the previous node.
---@type MapGen.Triangle? ---@type MapGen.Triangle?
local pastTriangle local pastTriangle
---@type MapGen.Layer ---@type MapGen.Layer
local Layer = require('MapGen.Layer') local Layer = require('MapGen.Layer')
---@type MapGen.StaticLayer ---@type MapGen.StaticLayer
local StaticLayer = require('MapGen.StaticLayer') local StaticLayer = require('MapGen.StaticLayer')
---@type MapGen.Biome ---@type MapGen.Biome
local Biome = require('MapGen.Biome') local Biome = require('MapGen.Biome')
---@type MapGen.Cavern ---@type MapGen.Cavern
local Cavern = require('MapGen.Cavern') local Cavern = require('MapGen.Cavern')
---@type MapGen.Region ---@type MapGen.Region
local Region = require('MapGen.Region') local Region = require('MapGen.Region')
@@ -59,6 +53,7 @@ local Region = require('MapGen.Region')
---@field isLayersNoisesInitialized boolean Is the fractal noise of the layer initialized? This is necessary for a one-time noise initialization. ---@field isLayersNoisesInitialized boolean Is the fractal noise of the layer initialized? This is necessary for a one-time noise initialization.
---@field isCavernsNoiseInitialized boolean Is the fractal noise of the caverns initialized? This is necessary for a one-time noise initialization. ---@field isCavernsNoiseInitialized 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 nodes table<string, string>
---@field nodeIDs table<string, number> ---@field nodeIDs table<string, number>
local MapGen = { local MapGen = {
layersByName = {}, layersByName = {},
@@ -77,7 +72,7 @@ local MapGen = {
---@field nodes table<string, string> ---@field nodes table<string, string>
---@param def MapGenDef ---@param def MapGenDef
---@return MapGen ---@return MapGen
function MapGen:new(def) function MapGen:new(def)
local nodesIDs = {} local nodesIDs = {}
-- Converting node names to IDs -- Converting node names to IDs
@@ -85,11 +80,9 @@ function MapGen:new(def)
nodesIDs[k] = id(v) nodesIDs[k] = id(v)
end end
---@type MapGen local instance = getInstance(self, {})
local instance = getInstance(self, { instance.nodes = def.nodes
nodes = def.nodes, instance.nodeIDs = nodesIDs
nodeIDs = nodesIDs,
})
return instance return instance
end end
@@ -106,18 +99,16 @@ function MapGen:getLayerByName(layerName)
end end
---Determines which layer a node belongs to based on its height coordinate. ---Determines which layer a node belongs to based on its height coordinate.
---@param yPos number ---@param y number
---@return MapGen.Layer? ---@return MapGen.Layer?
function MapGen:getLayerByHeight(yPos) function MapGen:getLayerByHeight(y)
--- TODO: возможно здесь получится сделать более оптимизированный алгоритм --- TODO: возможно здесь получится сделать более оптимизированный алгоритм
--- учитывая тот факт, что эта функция вызывается для каждой ноды в on_generated
--- и может быть даже не один раз
--- Можно подумать над тем, чтобы использовать сортированный список --- Можно подумать над тем, чтобы использовать сортированный список
---@param layer MapGen.Layer ---@param layer MapGen.Layer
for _, layer in ipairs(self.layersList) do for _, layer in ipairs(self.layersList) do
if yPos >= layer.minY and yPos <= layer.maxY then if y >= layer.minY and y <= layer.maxY then
return layer return layer
end end
@@ -125,9 +116,9 @@ function MapGen:getLayerByHeight(yPos)
end end
---Determines which statics layer a node belongs to based on its height coordinate. ---Determines which statics layer a node belongs to based on its height coordinate.
---@param yPos number ---@param y number
---@return MapGen.StaticLayer? ---@return MapGen.StaticLayer?
function MapGen:getStaticByHeight(yPos) function MapGen:getStaticByHeight(y)
--- TODO: возможно здесь получится сделать более оптимизированный алгоритм --- TODO: возможно здесь получится сделать более оптимизированный алгоритм
--- учитывая тот факт, что эта функция вызывается для каждой ноды в on_generated --- учитывая тот факт, что эта функция вызывается для каждой ноды в on_generated
--- и может быть даже не один раз --- и может быть даже не один раз
@@ -136,7 +127,7 @@ function MapGen:getStaticByHeight(yPos)
---@param static MapGen.StaticLayer ---@param static MapGen.StaticLayer
for _, static in ipairs(self.staticsList) do for _, static in ipairs(self.staticsList) do
if yPos >= static.minY and yPos <= static.maxY then if y >= static.minY and y <= static.maxY then
return static return static
end end
@@ -144,9 +135,9 @@ function MapGen:getStaticByHeight(yPos)
end end
---Returns the `MapGen.Peak` at the coordinates. If there is no peak at these coordinates, it returns `nil`. ---Returns the `MapGen.Peak` at the coordinates. If there is no peak at these coordinates, it returns `nil`.
---@param layer string|MapGen.Layer The layer or name of the layer in which the peak is located. ---@param layer string|MapGen.Layer The layer or name of the layer in which the peak is located.
---@param pos MapPosition Coordinate of the desired peak. ---@param pos MapPosition Coordinate of the desired peak.
---@return MapGen.Peak? ---@return MapGen.Peak?
function MapGen:getPeakByPos(layer, pos) function MapGen:getPeakByPos(layer, pos)
if type(layer) == 'string' then if type(layer) == 'string' then
local layerName = layer local layerName = layer
@@ -163,7 +154,7 @@ end
--- ---
---**Note**: works only with coordinates X-Z. ---**Note**: works only with coordinates X-Z.
---@param triangle MapGen.Triangle ---@param triangle MapGen.Triangle
---@param pointPos vector ---@param pointPos IntegerVector
---@return boolean, MapGen.Triangle? ---@return boolean, MapGen.Triangle?
function MapGen:isPointInTriangle(triangle, pointPos) function MapGen:isPointInTriangle(triangle, pointPos)
local e1, e2, e3 = triangle.e1, triangle.e2, triangle.e3 local e1, e2, e3 = triangle.e1, triangle.e2, triangle.e3
@@ -186,17 +177,22 @@ function MapGen:isPointInTriangle(triangle, pointPos)
return true, triangle return true, triangle
end end
---@param layer MapGen.Layer The layer of the layer the triangle is in. ---Finds the triangle containing the point specified by coordinates X & Z.
---@param layer MapGen.Layer The layer of the layer the triangle is in.
---@param x integer ---@param x integer
---@param z integer ---@param z integer
---@param triangle MapGen.Triangle? ---@param triangle MapGen.Triangle? The triangle from which to begin the search.
--- If not specified, the search will be performed
--- from the triangle at `id = 1`
---@return MapGen.Triangle? ---@return MapGen.Triangle?
function MapGen:findTriangle(layer, x, z, triangle) function MapGen:findTriangle(layer, x, z, triangle)
if triangle == nil then if triangle == nil then
triangle = layer.trianglesList[1] triangle = layer.trianglesList[1]
end end
-- Limit the number of iterations to prevent the loop from going into infinity.
local iterationCount = 1000000 local iterationCount = 1000000
local isFound = false local isFound = false
while not isFound do while not isFound do
if iterationCount < 0 then if iterationCount < 0 then
@@ -217,11 +213,12 @@ function MapGen:findTriangle(layer, x, z, triangle)
end end
---Checks if a point is inside a region. ---Checks if a point is inside a region.
---
---If the point is inside the region, it will also return the distance to the nearest border. ---If the point is inside the region, it will also return the distance to the nearest border.
---@param layer MapGen.Layer The name of the layer in which the region is located. ---@param layer MapGen.Layer The name of the layer in which the region is located.
---@param regionName string The name of the region in which the location of the point is checked. ---@param regionName string The name of the region in which the location of the point is checked.
---@param point MapPosition Point position. ---@param point MapPosition Point position.
---@return boolean, number? ---@return boolean, number?
function MapGen:pointInRegion2D(layer, regionName, point) function MapGen:pointInRegion2D(layer, regionName, point)
local region = layer.regionsByName[regionName] local region = layer.regionsByName[regionName]
@@ -266,7 +263,7 @@ local function vertexKey(peak)
end end
---Creates a canonical (sorted) key for an edge. ---Creates a canonical (sorted) key for an edge.
---@param edge MapGen.Triangulation.Edge ---@param edge MapGen.Edge
---@return string ---@return string
local function edgeKey(edge) local function edgeKey(edge)
local k1 = vertexKey(edge.p1) local k1 = vertexKey(edge.p1)
@@ -286,7 +283,7 @@ end
function MapGen:getTriangulateBoundaryVertices(triangles) function MapGen:getTriangulateBoundaryVertices(triangles)
-- Count how many triangles share each edge -- Count how many triangles share each edge
local edgeCount = {} local edgeCount = {}
---@type table<string, MapGen.Triangulation.Edge> ---@type table<string, MapGen.Edge>
local edgeData = {} local edgeData = {}
for _, triangle in ipairs(triangles) do for _, triangle in ipairs(triangles) do
@@ -305,7 +302,7 @@ function MapGen:getTriangulateBoundaryVertices(triangles)
end end
-- Boundary edges belong to exactly ONE triangle -- Boundary edges belong to exactly ONE triangle
---@type MapGen.Triangulation.Edge[] ---@type MapGen.Edge[]
local boundaryEdges = {} local boundaryEdges = {}
for key, count in pairs(edgeCount) do for key, count in pairs(edgeCount) do
@@ -498,7 +495,7 @@ end
-- --- INITIALIZATION METHODS --- -- --- INITIALIZATION METHODS ---
---Initialize the boundary region for a layer and category. ---Initialize the boundary region for a layer and category.
---@param layer MapGen.Layer ---@param layer MapGen.Layer
function MapGen:initTriangultaionBoundaryRegion(layer) function MapGen:initTriangultaionBoundaryRegion(layer)
local triangles = layer.trianglesList local triangles = layer.trianglesList
local regionVertices = self:getTriangulateBoundaryVertices(triangles) local regionVertices = self:getTriangulateBoundaryVertices(triangles)
@@ -691,7 +688,7 @@ end
---Calculates a weight for a coordinate using the projection onto ---Calculates a weight for a coordinate using the projection onto
---the triangle's height and specifying the distance to the peak ---the triangle's height and specifying the distance to the peak
---for which the weight is calculated. ---for which the weight is calculated.
---@param height MapGen.Triangulation.Edge ---@param height MapGen.Edge
---@param x integer ---@param x integer
---@param y integer ---@param y integer
---@param z integer ---@param z integer
@@ -764,11 +761,11 @@ 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.
--- ---
---Returns `nil` if the point is not included in any triangle. ---Returns `nil` if the point is not included in any triangle.
---@param layer MapGen.Layer ---@param layer MapGen.Layer
---@param x integer ---@param x integer
---@param y integer ---@param y integer
---@param z integer ---@param z integer
---@return number?, number?, number? ---@return number?, number?, number?
function MapGen:getFactors(layer, x, y, z) function MapGen:getFactors(layer, x, y, z)
local posString = posToString({x=x,y=0,z=z}) local posString = posToString({x=x,y=0,z=z})
@@ -835,22 +832,20 @@ end
---@param x integer ---@param x integer
---@param y integer ---@param y integer
---@param z integer ---@param z integer
---@return number, number, number
local function generatorHandler(mapGenerator, layer, data, index, x, y, z) local function generatorHandler(mapGenerator, layer, data, index, x, y, z)
local startGetLayerTime = getUsTime()
-- If the node belongs to a static layer, then a static node is generated. -- If the node belongs to a static layer, then a static node is generated.
local static = mapGenerator:getStaticByHeight(y) local static = mapGenerator:getStaticByHeight(y)
if static ~= nil then if static ~= nil then
static:generateStaticNode(mapGenerator, data, index, x, y, z) static:generateStaticNode(mapGenerator, data, index, x, y, z)
return getUsTime() - startGetLayerTime, 0, 0 return
end end
-- If generation occurs outside the layers, then a void is generated. -- If generation occurs outside the layers, then a void is generated.
if layer == nil then if layer == nil then
data[index] = mapGenerator.nodeIDs.air data[index] = mapGenerator.nodeIDs.air
return getUsTime() - startGetLayerTime, 0, 0 return
end end
local endGetLayerTime = getUsTime() local endGetLayerTime = getUsTime()
@@ -861,7 +856,7 @@ local function generatorHandler(mapGenerator, layer, data, index, x, y, z)
if height == nil or temp == nil or humidity == nil then if height == nil or temp == nil or humidity == nil then
data[index] = core.CONTENT_IGNORE data[index] = core.CONTENT_IGNORE
return endGetLayerTime - startGetLayerTime, getUsTime() - startNoiseCalcTime, 0 return
end end
-- We recalculate the climate based on altitude. -- We recalculate the climate based on altitude.
@@ -875,14 +870,7 @@ local function generatorHandler(mapGenerator, layer, data, index, x, y, z)
humidity = humidity, humidity = humidity,
} }
local endNoiseCalcTime = getUsTime()
local startGenNodeTime = endNoiseCalcTime
generateNode(mapGenerator, layer, factors, data, index, x, y, z) generateNode(mapGenerator, layer, factors, data, index, x, y, z)
local endGenNodeTime = getUsTime()
return endGetLayerTime - startGetLayerTime, endNoiseCalcTime - startNoiseCalcTime, endGenNodeTime - startGenNodeTime
end end
---Chunk generation handler. ---Chunk generation handler.
@@ -892,15 +880,15 @@ end
---@param blockseed number ---@param blockseed number
function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed) function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
local minPosStr, maxPosStr = posToString(minPos), posToString(maxPos) local minPosStr, maxPosStr = posToString(minPos), posToString(maxPos)
local getLayerTime, NoiseCalcTime, GenNodeTime = {}, {}, {} local startTime, endTime = 0.0, 0.0
if LOG_PROFILE then if LOG_PROFILE then
mglog('Chunk run:\n'.. mglog('Chunk run:\n'..
'min_pos: %s\n'.. 'min_pos: %s\n'..
'max_pos: %s\n', 'max_pos: %s\n',
minPosStr, maxPosStr) minPosStr, maxPosStr)
startTime = getUsTime()
end end
local startTime = getUsTime()
local eMin, eMax = voxelManip:get_emerged_area() local eMin, eMax = voxelManip:get_emerged_area()
@@ -928,12 +916,8 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
for y = minPos.y, maxPos.y do for y = minPos.y, maxPos.y do
index = area:index(x, y, z) index = area:index(x, y, z)
if data[index] == core.CONTENT_AIR then if data[index] == AIR_ID then
local t1, t2, t3 = generatorHandler(self, layer, data, index, x, y, z) generatorHandler(self, layer, data, index, x, y, z)
tableInsert(getLayerTime, t1)
tableInsert(NoiseCalcTime, t2)
tableInsert(GenNodeTime, t3)
end end
end end
end end
@@ -968,19 +952,15 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
pastTriangle = nil pastTriangle = nil
local endTime = getUsTime() if PROFILE_CHUNK then
if LOG_PROFILE then endTime = getUsTime()
mglog('Chunk end:\n'.. mglog('Chunk end:\n'..
'min_pos: %s\n'.. 'min_pos: %s\n'..
'max_pos: %s\n'.. 'max_pos: %s\n'..
'time (sec): %.3f\n'.. 'time (sec): %.3f\n'..
'GenerateHandler time (us): %.3f %.3f %.3f\n'..
'---------------', '---------------',
minPosStr, maxPosStr, minPosStr, maxPosStr,
(endTime - startTime)/1000000, (endTime - startTime)/1000000)
calculateAverage(getLayerTime),
calculateAverage(NoiseCalcTime),
calculateAverage(GenNodeTime))
end end
end end

View File

@@ -1,6 +1,6 @@
local getInstance = Class.getInstance local getInstance = Class.getInstance
---@class MapGen.Triangulation.Edge ---@class MapGen.Edge
---@field p1 MapGen.Peak ---@field p1 MapGen.Peak
---@field p2 MapGen.Peak ---@field p2 MapGen.Peak
---@field vec vector ---@field vec vector
@@ -8,9 +8,9 @@ local Edge = {}
---@param p1 MapGen.Peak ---@param p1 MapGen.Peak
---@param p2 MapGen.Peak ---@param p2 MapGen.Peak
---@return MapGen.Triangulation.Edge ---@return MapGen.Edge
function Edge:new( p1, p2 ) function Edge:new( p1, p2 )
---@type MapGen.Triangulation.Edge ---@type MapGen.Edge
local instance = getInstance(self, { local instance = getInstance(self, {
p1 = p1, p1 = p1,
p2 = p2, p2 = p2,
@@ -31,14 +31,14 @@ function Edge:toString()
end end
---Returns true if the edges are equivalent. ---Returns true if the edges are equivalent.
---@param other MapGen.Triangulation.Edge ---@param other MapGen.Edge
---@return boolean ---@return boolean
function Edge:eq(other) function Edge:eq(other)
return self.p1 == other.p1 and self.p2 == other.p2 return self.p1 == other.p1 and self.p2 == other.p2
end end
---Returns true if the edges are similar. ---Returns true if the edges are similar.
---@param other MapGen.Triangulation.Edge ---@param other MapGen.Edge
---@return boolean ---@return boolean
function Edge:same(other) function Edge:same(other)
return (self.p1 == other.p1 and self.p2 == other.p2) return (self.p1 == other.p1 and self.p2 == other.p2)

View File

@@ -7,7 +7,7 @@ local Peak = require('MapGen.Peak')
---Allows you to create a `MapGen.Peak` without specifying a noise parameter. ---Allows you to create a `MapGen.Peak` without specifying a noise parameter.
--- ---
---**WARNING: MUST NOT BE PARTICIPATED IN GENERATION** ---**WARNING: MUST NOT BE PARTICIPATED IN GENERATION**
---@class MapGen.Triangulation.FakePeak : MapGen.Peak ---@class MapGen.FakePeak : MapGen.Peak
---@field id number ---@field id number
---@field getPeakPos fun():vector ---@field getPeakPos fun():vector
local FakePeak = Class.extend(Peak, {}) local FakePeak = Class.extend(Peak, {})

View File

@@ -6,10 +6,10 @@ local getInstance = Class.getInstance
local modInfo = Mod.getInfo('smc__core__map_gen') local modInfo = Mod.getInfo('smc__core__map_gen')
local require = modInfo.require local require = modInfo.require
---@type MapGen.Triangulation.Edge ---@type MapGen.Edge
local Edge = require('MapGen.Triangulation.Edge') local Edge = require('MapGen.Edge')
---@type MapGen.Triangulation.FakePeak ---@type MapGen.FakePeak
local FakePeak = require('MapGen.Triangulation.FakePeak') local FakePeak = require('MapGen.FakePeak')
-- --- Helpers functions --- -- --- Helpers functions ---
@@ -67,12 +67,12 @@ end
---@field p1 MapGen.Peak ---@field p1 MapGen.Peak
---@field p2 MapGen.Peak ---@field p2 MapGen.Peak
---@field p3 MapGen.Peak ---@field p3 MapGen.Peak
---@field e1 MapGen.Triangulation.Edge ---@field e1 MapGen.Edge
---@field e2 MapGen.Triangulation.Edge ---@field e2 MapGen.Edge
---@field e3 MapGen.Triangulation.Edge ---@field e3 MapGen.Edge
---@field h1 MapGen.Triangulation.Edge ---@field h1 MapGen.Edge
---@field h2 MapGen.Triangulation.Edge ---@field h2 MapGen.Edge
---@field h3 MapGen.Triangulation.Edge ---@field h3 MapGen.Edge
---@field neighboursIDs integer[] ---@field neighboursIDs integer[]
---@field neighbours MapGen.Triangle[] ---@field neighbours MapGen.Triangle[]
---@field color ColorString? ---@field color ColorString?
@@ -167,7 +167,7 @@ end
---@param p1 MapGen.Peak ---@param p1 MapGen.Peak
---@param p2 MapGen.Peak ---@param p2 MapGen.Peak
---@param p3 MapGen.Peak ---@param p3 MapGen.Peak
---@return MapGen.Triangulation.Edge ---@return MapGen.Edge
function Triangle:getHeight(p1, p2, p3) function Triangle:getHeight(p1, p2, p3)
local pos1 = p1.pos local pos1 = p1.pos
local pos2 = p2.pos local pos2 = p2.pos
@@ -193,7 +193,7 @@ end
---@param p1 MapGen.Peak ---@param p1 MapGen.Peak
---@param p2 MapGen.Peak ---@param p2 MapGen.Peak
---@param p3 MapGen.Peak ---@param p3 MapGen.Peak
---@return MapGen.Triangulation.Edge ---@return MapGen.Edge
function Triangle:getHeight2D(p1, p2, p3) function Triangle:getHeight2D(p1, p2, p3)
local pos1 = p1.pos local pos1 = p1.pos
local pos2 = p2.pos local pos2 = p2.pos