MapGen: minor refactoring
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
local mathAbs, mathRound, mathMin, mathMax, mathRandom, mathClamp, tableInsert
|
||||
= math.abs, math.round, math.min, math.max, math.random, math.clamp, table.insert
|
||||
local mathRound, mathRandom, mathClamp, tableInsert
|
||||
= math.round, math.random, math.clamp, table.insert
|
||||
|
||||
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 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(...))
|
||||
@@ -28,26 +21,27 @@ 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}
|
||||
|
||||
---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 = {}
|
||||
|
||||
---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')
|
||||
|
||||
@@ -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 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 = {},
|
||||
@@ -77,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
|
||||
@@ -85,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
|
||||
@@ -106,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
|
||||
|
||||
@@ -125,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
|
||||
--- и может быть даже не один раз
|
||||
@@ -136,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
|
||||
|
||||
@@ -144,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
|
||||
@@ -163,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
|
||||
@@ -186,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
|
||||
@@ -217,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]
|
||||
|
||||
@@ -266,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)
|
||||
@@ -286,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
|
||||
@@ -305,7 +302,7 @@ 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
|
||||
@@ -498,7 +495,7 @@ end
|
||||
-- --- INITIALIZATION METHODS ---
|
||||
|
||||
---Initialize the boundary region for a layer and category.
|
||||
---@param layer MapGen.Layer
|
||||
---@param layer MapGen.Layer
|
||||
function MapGen:initTriangultaionBoundaryRegion(layer)
|
||||
local triangles = layer.trianglesList
|
||||
local regionVertices = self:getTriangulateBoundaryVertices(triangles)
|
||||
@@ -691,7 +688,7 @@ 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
|
||||
@@ -764,11 +761,11 @@ 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 layer MapGen.Layer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
---@return number?, number?, number?
|
||||
---@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})
|
||||
|
||||
@@ -835,22 +832,20 @@ 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 = getUsTime()
|
||||
-- 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 getUsTime() - 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 getUsTime() - startGetLayerTime, 0, 0
|
||||
return
|
||||
end
|
||||
|
||||
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
|
||||
data[index] = core.CONTENT_IGNORE
|
||||
|
||||
return endGetLayerTime - startGetLayerTime, getUsTime() - startNoiseCalcTime, 0
|
||||
return
|
||||
end
|
||||
|
||||
-- We recalculate the climate based on altitude.
|
||||
@@ -875,14 +870,7 @@ local function generatorHandler(mapGenerator, layer, data, index, x, y, z)
|
||||
humidity = humidity,
|
||||
}
|
||||
|
||||
local endNoiseCalcTime = getUsTime()
|
||||
local startGenNodeTime = endNoiseCalcTime
|
||||
|
||||
generateNode(mapGenerator, layer, factors, data, index, x, y, z)
|
||||
|
||||
local endGenNodeTime = getUsTime()
|
||||
|
||||
return endGetLayerTime - startGetLayerTime, endNoiseCalcTime - startNoiseCalcTime, endGenNodeTime - startGenNodeTime
|
||||
end
|
||||
|
||||
---Chunk generation handler.
|
||||
@@ -892,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 = getUsTime()
|
||||
|
||||
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
|
||||
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)
|
||||
|
||||
tableInsert(getLayerTime, t1)
|
||||
tableInsert(NoiseCalcTime, t2)
|
||||
tableInsert(GenNodeTime, t3)
|
||||
if data[index] == AIR_ID then
|
||||
generatorHandler(self, layer, data, index, x, y, z)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -968,19 +952,15 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
|
||||
|
||||
pastTriangle = nil
|
||||
|
||||
local endTime = getUsTime()
|
||||
if LOG_PROFILE then
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user