2 Commits

Author SHA1 Message Date
ceb35639b8 MapGen: minor refactoring 2026-03-21 21:26:27 +03:00
79df8f2f52 MapGen: a little bit more optimizations 2026-03-21 20:53:02 +03:00
4 changed files with 129 additions and 143 deletions

View File

@@ -1,21 +1,18 @@
local mathAbs, mathRound, mathMin, mathMax, posToString
= math.abs, math.round, math.min, math.max, core.pos_to_string
local mathRound, mathRandom, mathClamp, tableInsert
= math.round, math.random, math.clamp, table.insert
local posToString, getUsTime = core.pos_to_string, core.get_us_time
local pairs, ipairs, assert = pairs, ipairs, assert
local v = vector.new
local id = core.get_content_id
local AIR_ID = core.CONTENT_AIR
local getInstance = Class.getInstance
local LOG_PROFILE = 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 PROFILE_CHUNK = true
local function mglog(text, ...)
core.log((text):format(...))
@@ -24,30 +21,30 @@ end
local modInfo = Mod.getInfo('smc__core__map_gen')
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.PastCalcNoiseValue {triangle:MapGen.Triangle?, x:integer?, z:integer?, 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>>
local pastNoiseValues = {}
---@type MapGen.PastCalcNoiseValue
local pastNoisesCalc = {}
---The triangle in which generation occurred for the previous node.
---@type MapGen.Triangle?
local pastTriangle
---@type MapGen.Layer
local Layer = require('MapGen.Layer')
---@type MapGen.StaticLayer
local StaticLayer = require('MapGen.StaticLayer')
---@type MapGen.Biome
local Biome = require('MapGen.Biome')
---@type MapGen.Cavern
local Cavern = require('MapGen.Cavern')
---@type MapGen.Region
local Region = require('MapGen.Region')
local ff2luat = require('MapGen.ff2luat')
---@class MapGen
---@field layersByName table<string, MapGen.Layer>
---@field layersList MapGen.Layer[]
@@ -56,6 +53,7 @@ local ff2luat = require('MapGen.ff2luat')
---@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 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>
local MapGen = {
layersByName = {},
@@ -74,7 +72,7 @@ local MapGen = {
---@field nodes table<string, string>
---@param def MapGenDef
---@return MapGen
---@return MapGen
function MapGen:new(def)
local nodesIDs = {}
-- Converting node names to IDs
@@ -82,11 +80,9 @@ function MapGen:new(def)
nodesIDs[k] = id(v)
end
---@type MapGen
local instance = getInstance(self, {
nodes = def.nodes,
nodeIDs = nodesIDs,
})
local instance = getInstance(self, {})
instance.nodes = def.nodes
instance.nodeIDs = nodesIDs
return instance
end
@@ -103,18 +99,16 @@ function MapGen:getLayerByName(layerName)
end
---Determines which layer a node belongs to based on its height coordinate.
---@param yPos number
---@return MapGen.Layer?
function MapGen:getLayerByHeight(yPos)
---@param y number
---@return MapGen.Layer?
function MapGen:getLayerByHeight(y)
--- TODO: возможно здесь получится сделать более оптимизированный алгоритм
--- учитывая тот факт, что эта функция вызывается для каждой ноды в on_generated
--- и может быть даже не один раз
--- Можно подумать над тем, чтобы использовать сортированный список
---@param layer MapGen.Layer
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
end
@@ -122,9 +116,9 @@ function MapGen:getLayerByHeight(yPos)
end
---Determines which statics layer a node belongs to based on its height coordinate.
---@param yPos number
---@return MapGen.StaticLayer?
function MapGen:getStaticByHeight(yPos)
---@param y number
---@return MapGen.StaticLayer?
function MapGen:getStaticByHeight(y)
--- TODO: возможно здесь получится сделать более оптимизированный алгоритм
--- учитывая тот факт, что эта функция вызывается для каждой ноды в on_generated
--- и может быть даже не один раз
@@ -133,7 +127,7 @@ function MapGen:getStaticByHeight(yPos)
---@param static MapGen.StaticLayer
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
end
@@ -141,9 +135,9 @@ function MapGen:getStaticByHeight(yPos)
end
---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 pos MapPosition Coordinate of the desired peak.
---@return MapGen.Peak?
---@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.
---@return MapGen.Peak?
function MapGen:getPeakByPos(layer, pos)
if type(layer) == 'string' then
local layerName = layer
@@ -160,7 +154,7 @@ end
---
---**Note**: works only with coordinates X-Z.
---@param triangle MapGen.Triangle
---@param pointPos vector
---@param pointPos IntegerVector
---@return boolean, MapGen.Triangle?
function MapGen:isPointInTriangle(triangle, pointPos)
local e1, e2, e3 = triangle.e1, triangle.e2, triangle.e3
@@ -183,17 +177,22 @@ function MapGen:isPointInTriangle(triangle, pointPos)
return true, triangle
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 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?
function MapGen:findTriangle(layer, x, z, triangle)
if triangle == nil then
triangle = layer.trianglesList[1]
end
-- Limit the number of iterations to prevent the loop from going into infinity.
local iterationCount = 1000000
local isFound = false
while not isFound do
if iterationCount < 0 then
@@ -214,11 +213,12 @@ function MapGen:findTriangle(layer, x, z, triangle)
end
---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.
---@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 point MapPosition Point position.
---@return boolean, number?
---@return boolean, number?
function MapGen:pointInRegion2D(layer, regionName, point)
local region = layer.regionsByName[regionName]
@@ -263,7 +263,7 @@ local function vertexKey(peak)
end
---Creates a canonical (sorted) key for an edge.
---@param edge MapGen.Triangulation.Edge
---@param edge MapGen.Edge
---@return string
local function edgeKey(edge)
local k1 = vertexKey(edge.p1)
@@ -283,7 +283,7 @@ end
function MapGen:getTriangulateBoundaryVertices(triangles)
-- Count how many triangles share each edge
local edgeCount = {}
---@type table<string, MapGen.Triangulation.Edge>
---@type table<string, MapGen.Edge>
local edgeData = {}
for _, triangle in ipairs(triangles) do
@@ -302,12 +302,12 @@ function MapGen:getTriangulateBoundaryVertices(triangles)
end
-- Boundary edges belong to exactly ONE triangle
---@type MapGen.Triangulation.Edge[]
---@type MapGen.Edge[]
local boundaryEdges = {}
for key, count in pairs(edgeCount) do
if count == 1 then
table.insert(boundaryEdges, edgeData[key])
tableInsert(boundaryEdges, edgeData[key])
end
end
@@ -331,8 +331,8 @@ function MapGen:getTriangulateBoundaryVertices(triangles)
adjacency[k1] = adjacency[k1] or {}
adjacency[k2] = adjacency[k2] or {}
table.insert(adjacency[k1], k2)
table.insert(adjacency[k2], k1)
tableInsert(adjacency[k1], k2)
tableInsert(adjacency[k2], k1)
end
-- Walk along boundary edges to create ordered vertex list
@@ -352,7 +352,7 @@ function MapGen:getTriangulateBoundaryVertices(triangles)
visited[currentKey] = true
local pos = vertexData[currentKey].pos
table.insert(boundary, {
tableInsert(boundary, {
x = pos.x,
y = 0,
z = pos.z
@@ -394,7 +394,9 @@ function MapGen:registerLayer(name, def)
local layer = Layer:new(name, def)
self.layersByName[name] = layer
table.insert(self.layersList, layer)
tableInsert(self.layersList, layer)
pastNoiseValues[name] = {}
-- Sort layers by maxY descending for processing priority.
table.sort(self.layersList, function(a, b)
@@ -429,7 +431,7 @@ function MapGen:registerStaticLayer(name, def)
local static = StaticLayer:new(name, def)
self.staticsByName[name] = static
table.insert(self.staticsList, static)
tableInsert(self.staticsList, static)
-- Sort srtatics by maxY descending for processing priority.
table.sort(self.staticsList, function(a, b)
@@ -493,12 +495,12 @@ end
-- --- INITIALIZATION METHODS ---
---Initialize the boundary region for a layer and category.
---@param layer MapGen.Layer
function MapGen:initTriangultaionBoundaryRegion(layer, category)
---@param layer MapGen.Layer
function MapGen:initTriangultaionBoundaryRegion(layer)
local triangles = layer.trianglesList
local regionVertices = self:getTriangulateBoundaryVertices(triangles)
local regionName = category..'_boundary'
local regionName = 'triangles_boundary'
local region = Region:new(regionName, {vertices = regionVertices})
@@ -506,12 +508,10 @@ function MapGen:initTriangultaionBoundaryRegion(layer, category)
end
---Initialize border regions for all layers and all categories.
function MapGen:initLayersBoundaryRegions()
function MapGen:initLayersBoundaryRegion()
---@param layer MapGen.Layer
for _, layer in ipairs(self.layersList) do
self:initTriangultaionBoundaryRegion(layer, 'landscape')
self:initTriangultaionBoundaryRegion(layer, 'temp')
self:initTriangultaionBoundaryRegion(layer, 'humidity')
self:initTriangultaionBoundaryRegion(layer)
end
end
@@ -608,17 +608,17 @@ local function generateNode(mapGenerator, layer, factors, data, index, x, y, z)
local scattHeight = y
if scatteringGorizontal ~= 0 then
scattTemp = scattTemp + math.random(scatteringGorizontal * -1, scatteringGorizontal)
scattHumidity = scattHumidity + math.random(scatteringGorizontal * -1, scatteringGorizontal)
scattTemp = scattTemp + mathRandom(scatteringGorizontal * -1, scatteringGorizontal)
scattHumidity = scattHumidity + mathRandom(scatteringGorizontal * -1, scatteringGorizontal)
end
if scatteringVertical ~= 0 then
scattHeight = scattHeight + math.random(scatteringVertical * -1, scatteringVertical)
scattHeight = scattHeight + mathRandom(scatteringVertical * -1, scatteringVertical)
end
scattTemp = math.clamp(scattTemp, layer.minTemp, layer.maxTemp)
scattHumidity = math.clamp(scattHumidity, layer.minHumidity, layer.maxHumidity)
scattHeight = math.clamp(scattHeight, layer.minY, layer.maxY)
scattTemp = mathClamp(scattTemp, layer.minTemp, layer.maxTemp)
scattHumidity = mathClamp(scattHumidity, layer.minHumidity, layer.maxHumidity)
scattHeight = mathClamp(scattHeight, layer.minY, layer.maxY)
scattHeight, scattTemp, scattHumidity = mathRound(scattHeight), mathRound(scattTemp), mathRound(scattHumidity)
height, temp, humidity = mathRound(height), mathRound(scattTemp), mathRound(scattHumidity)
@@ -688,13 +688,13 @@ end
---Calculates a weight for a coordinate using the projection onto
---the triangle's height and specifying the distance to the peak
---for which the weight is calculated.
---@param height MapGen.Triangulation.Edge
---@param height MapGen.Edge
---@param x integer
---@param y integer
---@param z integer
---@return number
local function calcWeight(height, x, y, z)
local pos1 = vector.new(x, y, z)
local pos1 = v(x, y, z)
local pos2 = height.p1.pos
local pos3 = height.p2.pos
@@ -708,7 +708,7 @@ local function calcWeight(height, x, y, z)
local posP = pos2 + v * t
return 1 - vector.distance(pos2, posP) / height:length()
return 1 - pos2:distance(posP) / height:length()
end
---Returns the weighted values of 2d noise.
@@ -761,29 +761,30 @@ end
---Calculates a smoothed 2D noise value based on a preliminary space partitioning.
---
---Returns `nil` if the point is not included in any triangle.
---@param category MapGen.Layer.Category
---@param layer MapGen.Layer
---@param x integer
---@param y integer
---@param z integer
---@return number?, number?, number?
function MapGen:getNoises2dValue(category, layer, x, y, z)
---@param layer MapGen.Layer
---@param x integer
---@param y integer
---@param z integer
---@return number?, number?, number?
function MapGen:getFactors(layer, x, y, z)
local posString = posToString({x=x,y=0,z=z})
if (pastNoisesCalc.x ~= nil and pastNoisesCalc.z ~= nil) and (x == pastNoisesCalc.x and z == pastNoisesCalc.z) then
return pastNoisesCalc.height, pastNoisesCalc.temp, pastNoisesCalc.humidity
local factors = pastNoiseValues[layer.name][posString]
if factors ~= nil then
return factors.height, factors.temp, factors.humidity
end
-- TODO: это сильно тормозит обычные чанки, но ускоряет те, что находятся за границей
if not self:pointInRegion2D(layer, category..'_boundary', {x=x, y=y, z=z}) then
if not self:pointInRegion2D(layer, 'triangles_boundary', {x=x, y=y, z=z}) then
return
end
if pastNoisesCalc.triangle ~= nil then
if pastTriangle ~= nil then
local triangles = {
pastNoisesCalc.triangle,
pastNoisesCalc.triangle.neighbours[1],
pastNoisesCalc.triangle.neighbours[2],
pastNoisesCalc.triangle.neighbours[3],
pastTriangle,
pastTriangle.neighbours[1],
pastTriangle.neighbours[2],
pastTriangle.neighbours[3],
}
---@param triangle MapGen.Triangle
@@ -793,18 +794,18 @@ function MapGen:getNoises2dValue(category, layer, x, y, z)
local temp = calcNoise2dValue('temp', layer, triangle, x, y, z)
local humidity = calcNoise2dValue('humidity', layer, triangle, x, y, z)
pastNoisesCalc.x = x
pastNoisesCalc.z = z
pastNoisesCalc.height = height
pastNoisesCalc.temp = temp
pastNoisesCalc.humidity = humidity
pastNoiseValues[layer.name][posString] = {
height = height,
temp = temp,
humidity = humidity
}
return height, temp, humidity
end
end
end
local triangle = self:findTriangle(layer, x, z, pastNoisesCalc.triangle)
local triangle = self:findTriangle(layer, x, z, pastTriangle)
if triangle == nil then
return
end
@@ -813,12 +814,12 @@ function MapGen:getNoises2dValue(category, layer, x, y, z)
local temp = calcNoise2dValue('temp', layer, triangle, x, y, z)
local humidity = calcNoise2dValue('humidity', layer, triangle, x, y, z)
pastNoisesCalc.triangle = triangle
pastNoisesCalc.x = x
pastNoisesCalc.z = z
pastNoisesCalc.height = height
pastNoisesCalc.temp = temp
pastNoisesCalc.humidity = humidity
pastTriangle = triangle
pastNoiseValues[layer.name][posString] = {
height = height,
temp = temp,
humidity = humidity
}
return height, temp, humidity
end
@@ -831,33 +832,31 @@ end
---@param x integer
---@param y integer
---@param z integer
---@return number, number, number
local function generatorHandler(mapGenerator, layer, data, index, x, y, z)
local startGetLayerTime = core.get_us_time()
-- If the node belongs to a static layer, then a static node is generated.
local static = mapGenerator:getStaticByHeight(y)
if static ~= nil then
static:generateStaticNode(mapGenerator, data, index, x, y, z)
return core.get_us_time() - startGetLayerTime, 0, 0
return
end
-- If generation occurs outside the layers, then a void is generated.
if layer == nil then
data[index] = mapGenerator.nodeIDs.air
return core.get_us_time() - startGetLayerTime, 0, 0
return
end
local endGetLayerTime = core.get_us_time()
local endGetLayerTime = getUsTime()
local startNoiseCalcTime = endGetLayerTime
-- If the value of the noise is `nil`,
-- then the point does not fall within any of the triangles.
local height, temp, humidity = mapGenerator:getNoises2dValue('landscape', layer, x, y, z)
local height, temp, humidity = mapGenerator:getFactors(layer, x, y, z)
if height == nil or temp == nil or humidity == nil then
data[index] = core.CONTENT_IGNORE
return endGetLayerTime - startGetLayerTime, core.get_us_time() - startNoiseCalcTime, 0
return
end
-- We recalculate the climate based on altitude.
@@ -871,14 +870,7 @@ local function generatorHandler(mapGenerator, layer, data, index, x, y, z)
humidity = humidity,
}
local endNoiseCalcTime = core.get_us_time()
local startGenNodeTime = endNoiseCalcTime
generateNode(mapGenerator, layer, factors, data, index, x, y, z)
local endGenNodeTime = core.get_us_time()
return endGetLayerTime - startGetLayerTime, endNoiseCalcTime - startNoiseCalcTime, endGenNodeTime - startGenNodeTime
end
---Chunk generation handler.
@@ -888,15 +880,15 @@ end
---@param blockseed number
function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
local minPosStr, maxPosStr = posToString(minPos), posToString(maxPos)
local getLayerTime, NoiseCalcTime, GenNodeTime = {}, {}, {}
local startTime, endTime = 0.0, 0.0
if LOG_PROFILE then
mglog('Chunk run:\n'..
'min_pos: %s\n'..
'max_pos: %s\n',
minPosStr, maxPosStr)
startTime = getUsTime()
end
local startTime = core.get_us_time()
local eMin, eMax = voxelManip:get_emerged_area()
@@ -924,12 +916,8 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
for y = minPos.y, maxPos.y do
index = area:index(x, y, z)
if data[index] == core.CONTENT_AIR then
local t1, t2, t3 = generatorHandler(self, layer, data, index, x, y, z)
table.insert(getLayerTime, t1)
table.insert(NoiseCalcTime, t2)
table.insert(GenNodeTime, t3)
if data[index] == AIR_ID then
generatorHandler(self, layer, data, index, x, y, z)
end
end
end
@@ -962,19 +950,17 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
voxelManip:calc_lighting()
voxelManip:update_liquids()
local endTime = core.get_us_time()
if LOG_PROFILE then
pastTriangle = nil
if PROFILE_CHUNK then
endTime = getUsTime()
mglog('Chunk end:\n'..
'min_pos: %s\n'..
'max_pos: %s\n'..
'time (sec): %.3f\n'..
'GenerateHandler time (us): %.3f %.3f %.3f\n'..
'---------------',
minPosStr, maxPosStr,
(endTime - startTime)/1000000,
calculateAverage(getLayerTime),
calculateAverage(NoiseCalcTime),
calculateAverage(GenNodeTime))
(endTime - startTime)/1000000)
end
end
@@ -998,7 +984,7 @@ function MapGen:run()
end)
self:initBiomesDiagram()
self:initLayersBoundaryRegions()
self:initLayersBoundaryRegion()
MapGen.isRunning = true
core.log('MapGen run')

View File

@@ -1,6 +1,6 @@
local getInstance = Class.getInstance
---@class MapGen.Triangulation.Edge
---@class MapGen.Edge
---@field p1 MapGen.Peak
---@field p2 MapGen.Peak
---@field vec vector
@@ -8,9 +8,9 @@ local Edge = {}
---@param p1 MapGen.Peak
---@param p2 MapGen.Peak
---@return MapGen.Triangulation.Edge
---@return MapGen.Edge
function Edge:new( p1, p2 )
---@type MapGen.Triangulation.Edge
---@type MapGen.Edge
local instance = getInstance(self, {
p1 = p1,
p2 = p2,
@@ -31,14 +31,14 @@ function Edge:toString()
end
---Returns true if the edges are equivalent.
---@param other MapGen.Triangulation.Edge
---@param other MapGen.Edge
---@return boolean
function Edge:eq(other)
return self.p1 == other.p1 and self.p2 == other.p2
end
---Returns true if the edges are similar.
---@param other MapGen.Triangulation.Edge
---@param other MapGen.Edge
---@return boolean
function Edge:same(other)
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.
---
---**WARNING: MUST NOT BE PARTICIPATED IN GENERATION**
---@class MapGen.Triangulation.FakePeak : MapGen.Peak
---@class MapGen.FakePeak : MapGen.Peak
---@field id number
---@field getPeakPos fun():vector
local FakePeak = Class.extend(Peak, {})

View File

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