diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index 3de30c2..fc499b6 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -1,18 +1,18 @@ -local mathAbs, mathRound, mathMin, mathMax, id, posToString - = math.abs, math.round, math.min, math.max, core.get_content_id, 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 = false - -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 LOG_PROFILE = true +local PROFILE_CHUNK = true local function mglog(text, ...) core.log((text):format(...)) @@ -21,34 +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?, noiseValue:number?} +---Table of all past generation factor calculations for nodes. +--- +---Contains generation factors by layer name and coordinate. +---@type table> +local pastNoiseValues = {} ----@type table -local pastNoise2DCalc = { - landscape = {}, - temp = {}, - humidity = {} -} +---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 ---@field layersList MapGen.Layer[] @@ -57,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 ---@field nodeIDs table local MapGen = { layersByName = {}, @@ -75,7 +72,7 @@ local MapGen = { ---@field nodes table ---@param def MapGenDef ----@return MapGen +---@return MapGen function MapGen:new(def) local nodesIDs = {} -- Converting node names to IDs @@ -83,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 @@ -104,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 @@ -123,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 --- и может быть даже не один раз @@ -134,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 @@ -142,73 +135,90 @@ 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 category MapGen.Layer.Category The category in which the peak is located. ----@param pos MapPosition Coordinate of the desired peak. ----@return MapGen.Peak? -function MapGen:getPeakByPos(layer, category, pos) +---@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 layer = self:getLayerByName(layerName) end - return layer:getPeakByPos(category, pos) + return layer:getPeakByPos(pos) end ----Returns `true` if the point is within the triangle's region. ----The barycentric coordinate method is used. ----@param px integer ----@param pz integer ----@param triangle MapGen.Triangle -local function pointInTriangle2D(px, pz, triangle) - local posP = vector.new(px, 0, pz) - local pos1 = triangle.p1.getPeakPos() - local pos2 = triangle.p2.getPeakPos() - local pos3 = triangle.p3.getPeakPos() - - local v0 = pos3 - pos1 - local v1 = pos2 - pos1 - local v2 = posP - pos1 - - local dot00 = vector.dot(v0, v0) - local dot01 = vector.dot(v0, v1) - local dot02 = vector.dot(v0, v2) - local dot11 = vector.dot(v1, v1) - local dot12 = vector.dot(v1, v2) - - local invDenom = 1 / (dot00 * dot11 - dot01 * dot01) - local u = (dot11 * dot02 - dot01 * dot12) * invDenom - local v = (dot00 * dot12 - dot01 * dot02) * invDenom - - return (u >= 0) and (v >= 0) and (u + v <= 1) -end - ----Returns the `MapGen.Triangle` at the coordinates. If there is no triangle at these coordinates, it returns `nil`. +---Checks if a point is inside a triangle using the vector product method. --- ----**Important:** works only in the XZ plane. ----@param layer string|MapGen.Layer The layer or name of the layer the triangle is in. ----@param category MapGen.Layer.Category The category in which the triangle is in. ----@param pos MapPosition Coordinate of the desired peak. ----@return MapGen.Triangle? -function MapGen:getTriangleByPos2D(layer, category, pos) - if type(layer) == 'string' then - local layerName = layer - layer = self:getLayerByName(layerName) +---If the point is inside the triangle, it will return the triangle itself; +---if it is outside, its neighbor in the direction of the point will be returned. +--- +---**Note**: works only with coordinates X-Z. +---@param triangle MapGen.Triangle +---@param pointPos IntegerVector +---@return boolean, MapGen.Triangle? +function MapGen:isPointInTriangle(triangle, pointPos) + local e1, e2, e3 = triangle.e1, triangle.e2, triangle.e3 + + local y1 = e1.vec:cross(pointPos - e1.p1.pos).y + if y1 > 0 then + return false, triangle.neighbours[3] end - for _, triangle in ipairs(layer.trianglesList[category]) do - if pointInTriangle2D(pos.x, pos.z, triangle) then - return triangle - end + local y2 = e2.vec:cross(pointPos - e2.p1.pos).y + if y2 > 0 then + return false, triangle.neighbours[1] end + + local y3 = e3.vec:cross(pointPos - e3.p1.pos).y + if y3 > 0 then + return false, triangle.neighbours[2] + end + + return true, triangle +end + +---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? 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 + error('The number of triangle search iterations'.. + 'has significantly exceeded the number of triangles'.. + 'in the list. Most likely, the loop has become infinite') + end + iterationCount = iterationCount - 1 + + if triangle == nil then + return nil + end + + isFound, triangle = self:isPointInTriangle(triangle, v(x, 0, z)) + end + + return 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] @@ -247,13 +257,13 @@ end ---@param peak MapGen.Peak ---@return string local function vertexKey(peak) - local pos = peak:getPeakPos() + local pos = peak.pos return string.format("%.6f,%.6f", pos.x, pos.z) 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) @@ -273,7 +283,7 @@ end function MapGen:getTriangulateBoundaryVertices(triangles) -- Count how many triangles share each edge local edgeCount = {} - ---@type table + ---@type table local edgeData = {} for _, triangle in ipairs(triangles) do @@ -292,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 @@ -321,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 @@ -340,9 +350,9 @@ function MapGen:getTriangulateBoundaryVertices(triangles) while currentKey and not visited[currentKey] do visited[currentKey] = true - local pos = vertexData[currentKey]:getPeakPos() + local pos = vertexData[currentKey].pos - table.insert(boundary, { + tableInsert(boundary, { x = pos.x, y = 0, z = pos.z @@ -384,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) @@ -419,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) @@ -483,13 +495,12 @@ end -- --- INITIALIZATION METHODS --- ---Initialize the boundary region for a layer and category. ----@param layer MapGen.Layer ----@param category MapGen.Layer.Category -function MapGen:initTriangultaionBoundaryRegion(layer, category) - local triangles = layer.trianglesList[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}) @@ -497,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 @@ -599,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) @@ -679,15 +688,15 @@ 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 pos2 = height.p1:getPeakPos() - local pos3 = height.p2:getPeakPos() + local pos1 = v(x, y, z) + local pos2 = height.p1.pos + local pos3 = height.p2.pos local v = pos3 - pos2 ---@type vector @@ -699,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. @@ -723,9 +732,9 @@ local function calcNoise2dValue(category, layer, triangle, x, y, z) local peak2 = triangle.p2 local peak3 = triangle.p3 - local noise1 = layer:getNoiseByColor(category, peak1:getColor()) - local noise2 = layer:getNoiseByColor(category, peak2:getColor()) - local noise3 = layer:getNoiseByColor(category, peak3:getColor()) + local noise1 = layer:getNoiseByColor(category, peak1.color) + local noise2 = layer:getNoiseByColor(category, peak2.color) + local noise3 = layer:getNoiseByColor(category, peak3.color) local noiseValue = 0.0 @@ -752,138 +761,116 @@ 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? -function MapGen:getNoises2dValue(category, layer, x, y, z) - ---@type MapGen.PastCalcNoiseValue - local pastCalc = pastNoise2DCalc[category] +---@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 (pastCalc.x ~= nil and pastCalc.z ~= nil) and (x == pastCalc.x and z == pastCalc.z) then - return pastCalc.noiseValue + local factors = pastNoiseValues[layer.name][posString] + if factors ~= nil then + return factors.height, factors.temp, factors.humidity end - if pastCalc.triangle ~= nil then - ---@type number? - local noiseValue + -- TODO: это сильно тормозит обычные чанки, но ускоряет те, что находятся за границей + if not self:pointInRegion2D(layer, 'triangles_boundary', {x=x, y=y, z=z}) then + return + end + if pastTriangle ~= nil then local triangles = { - pastCalc.triangle, - pastCalc.triangle.neighbours[1], - pastCalc.triangle.neighbours[2], - pastCalc.triangle.neighbours[3], + pastTriangle, + pastTriangle.neighbours[1], + pastTriangle.neighbours[2], + pastTriangle.neighbours[3], } - ---@param t MapGen.Triangle - for _, t in ipairs(triangles) do - if pointInTriangle2D(x, z, t) then - noiseValue = calcNoise2dValue(category, layer, t, x, y, z) + ---@param triangle MapGen.Triangle + for _, triangle in ipairs(triangles) do + if self:isPointInTriangle(triangle, v(x, 0, z)) then + local height = calcNoise2dValue('landscape', layer, triangle, x, y, z) + local temp = calcNoise2dValue('temp', layer, triangle, x, y, z) + local humidity = calcNoise2dValue('humidity', layer, triangle, x, y, z) - pastCalc.x = x - pastCalc.z = z - pastCalc.noiseValue = noiseValue + pastNoiseValues[layer.name][posString] = { + height = height, + temp = temp, + humidity = humidity + } - return noiseValue + return height, temp, humidity end end end - if not self:pointInRegion2D(layer, category..'_boundary', {x=x, y=y, z=z}) then - return nil + local triangle = self:findTriangle(layer, x, z, pastTriangle) + if triangle == nil then + return end - ---@param triangle MapGen.Triangle - for _, triangle in ipairs(layer.trianglesList[category]) do - if pointInTriangle2D(x, z, triangle) then - local noiseValue = calcNoise2dValue(category, layer, triangle, x, y, z) + local height = calcNoise2dValue('landscape', layer, triangle, x, y, z) + local temp = calcNoise2dValue('temp', layer, triangle, x, y, z) + local humidity = calcNoise2dValue('humidity', layer, triangle, x, y, z) - pastCalc.triangle = triangle - pastCalc.x = x - pastCalc.z = z - pastCalc.noiseValue = noiseValue + pastTriangle = triangle + pastNoiseValues[layer.name][posString] = { + height = height, + temp = temp, + humidity = humidity + } - return noiseValue - end - end - - -- If the point does not fall within the triangle, it is impossible to calculate the height. - -- For debugging purposes only, may slow down generation: - --core.log('warning', string.format('The point %s %s %s does not fall within any triangle, calculating the noise value is impossible.', tostring(x), tostring(y), tostring(z))) + return height, temp, humidity end ---Generator handler for specific coordinates. ---@param mapGenerator MapGen +---@param layer MapGen.Layer? ---@param data number[] ---@param index number ---@param x integer ---@param y integer ---@param z integer ----@return number, number, number -local function generatorHandler(mapGenerator, data, index, x, y, z) - local startGetLayerTime = core.get_us_time() +local function generatorHandler(mapGenerator, layer, data, index, x, y, z) -- 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. - local layer = mapGenerator:getLayerByHeight(y) 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 noiseHeightValue = mapGenerator:getNoises2dValue('landscape', layer, x, y, z) - if noiseHeightValue == nil then + 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 - end - - local noiseTempValue = mapGenerator:getNoises2dValue('temp', layer, x, y, z) - if noiseTempValue == nil then - data[index] = core.CONTENT_IGNORE - - return endGetLayerTime - startGetLayerTime, core.get_us_time() - startNoiseCalcTime, 0 - end - - local noiseHumidityValue = mapGenerator:getNoises2dValue('humidity', layer, x, y, z) - if noiseHumidityValue == 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. - noiseTempValue = layer:calcTemp(noiseTempValue, y) - noiseHumidityValue = layer:calcHumidity(noiseHumidityValue, y) + temp = layer:calcTemp(temp, y) + humidity = layer:calcHumidity(humidity, y) ---@type MapGen.factors local factors = { - height = noiseHeightValue, - temp = noiseTempValue, - humidity = noiseHumidityValue, + height = height, + temp = temp, + 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. @@ -893,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() @@ -917,6 +904,11 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed) -- local param2_data = voxelManip:get_param2_data() local area = VoxelArea:new({MinEdge = eMin, MaxEdge = eMax}) + -- We obtain a layer for the entire chunk at once for optimization purposes. + -- Therefore, if the layer boundaries do not coincide with the chunk boundaries, + -- the chunk will be entirely contained within the layer containing its center. + local layer = self:getLayerByHeight((minPos.y+maxPos.y)/2) + local index -- Initial generation: landscape for z = minPos.z, maxPos.z do @@ -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, 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') diff --git a/mods/CORE/MapGen/src/MapGen/Triangulation/Edge.lua b/mods/CORE/MapGen/src/MapGen/Edge.lua similarity index 75% rename from mods/CORE/MapGen/src/MapGen/Triangulation/Edge.lua rename to mods/CORE/MapGen/src/MapGen/Edge.lua index a8d5101..c5254bb 100644 --- a/mods/CORE/MapGen/src/MapGen/Triangulation/Edge.lua +++ b/mods/CORE/MapGen/src/MapGen/Edge.lua @@ -1,18 +1,20 @@ local getInstance = Class.getInstance ----@class MapGen.Triangulation.Edge +---@class MapGen.Edge ---@field p1 MapGen.Peak ---@field p2 MapGen.Peak +---@field vec vector 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 + p1 = p1, + p2 = p2, + vec = p2.pos - p1.pos }, { __tostring = self.toString, @@ -29,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) @@ -46,14 +48,14 @@ end ---Returns the length of an edge. ---@return number function Edge:length() - return (self.p1.getPeakPos() - self.p2.getPeakPos()):length() + return (self.p1.pos - self.p2.pos):length() end ---Returns the vector of the point located in the middle of the edge. ---@return vector function Edge:getMidPoint() - local pos1 = self.p1:getPeakPos() - local pos2 = self.p2:getPeakPos() + local pos1 = self.p1.pos + local pos2 = self.p2.pos return (pos1 + pos2 )/2 end diff --git a/mods/CORE/MapGen/src/MapGen/Triangulation/FakePeak.lua b/mods/CORE/MapGen/src/MapGen/FakePeak.lua similarity index 92% rename from mods/CORE/MapGen/src/MapGen/Triangulation/FakePeak.lua rename to mods/CORE/MapGen/src/MapGen/FakePeak.lua index bbbc7ca..59e9821 100644 --- a/mods/CORE/MapGen/src/MapGen/Triangulation/FakePeak.lua +++ b/mods/CORE/MapGen/src/MapGen/FakePeak.lua @@ -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, {}) diff --git a/mods/CORE/MapGen/src/MapGen/Layer.lua b/mods/CORE/MapGen/src/MapGen/Layer.lua index bc4e2bf..135d585 100644 --- a/mods/CORE/MapGen/src/MapGen/Layer.lua +++ b/mods/CORE/MapGen/src/MapGen/Layer.lua @@ -19,8 +19,8 @@ local Triangle = require('MapGen.Triangle') ---@field waterLevel integer ---@field calcTemp fun(self:MapGen.Layer, value:number, height:number):number ---@field calcHumidity fun(self:MapGen.Layer, value:number, height:number):number ----@field peaksList table ----@field peaksByPos table> +---@field peaksList MapGen.Peak[] +---@field peaksByPos table ---@field noisesByColor table> ---@field noisesParamsByColor table> ---@field biomesByName table @@ -31,18 +31,10 @@ local Triangle = require('MapGen.Triangle') ---@field cavernsByName table ---@field cavernsList MapGen.Cavern[] ---@field regionsByName table ----@field trianglesList table +---@field trianglesList MapGen.Triangle[] local Layer = { - peaksList = { - landscape = {}, - temp = {}, - humidity = {}, - }, - peaksByPos = { - landscape = {}, - temp = {}, - humidity = {}, - }, + peaksList = {}, + peaksByPos = {}, noisesByColor = { landscape = {}, temp = {}, @@ -59,11 +51,7 @@ local Layer = { cavernsByName = {}, cavernsList = {}, regionsByName = {}, - trianglesList = { - landscape = {}, - temp = {}, - humidity = {}, - }, + trianglesList = {}, tetrahedronsList = {}, } @@ -103,10 +91,9 @@ end ---**Note:** If the colors of the new peak and the existing one at the same coordinates ---are different, an error will be called. ---@param def MapGen.PeakDef ----@param category MapGen.Layer.Category ---@param scale number ---@return MapGen.Peak -function Layer:registerPeak(def, category, scale) +function Layer:registerPeak(def, scale) assert(def.pos ~= nil) assert(def.pos.x ~= nil) assert(def.pos.z ~= nil) @@ -119,12 +106,12 @@ function Layer:registerPeak(def, category, scale) local positionStr = core.pos_to_string(def.pos) - local peak = self.peaksByPos[category][positionStr] + local peak = self.peaksByPos[positionStr] if peak == nil then peak = Peak:new(def) - self.peaksByPos[category][positionStr] = peak - elseif peak.getColor() ~= def.color then + self.peaksByPos[positionStr] = peak + elseif peak.color ~= def.color then error('There cannot be two peaks with the same coordinates but different colors.') end @@ -132,11 +119,11 @@ function Layer:registerPeak(def, category, scale) end function Layer:initTrianglesNeighbours() - for _, triangles in pairs(self.trianglesList) do - for _, triangle in ipairs(triangles) do - for _, id in ipairs(triangle.neighboursIDs) do - table.insert(triangle.neighbours, triangles[id]) - end + local triangles = self.trianglesList + + for _, triangle in pairs(triangles) do + for _, id in ipairs(triangle.neighboursIDs) do + table.insert(triangle.neighbours, triangles[id]) end end end @@ -155,9 +142,9 @@ function Layer:getTriaglesFromFile(fileName, category, scale) assert(triangles ~= nil) for _, tr in ipairs(triangles) do - local p1 = self:registerPeak( tr.vertices[1], category, scale) - local p2 = self:registerPeak( tr.vertices[2], category, scale) - local p3 = self:registerPeak( tr.vertices[3], category, scale) + local p1 = self:registerPeak( tr.vertices[1], scale) + local p2 = self:registerPeak( tr.vertices[2], scale) + local p3 = self:registerPeak( tr.vertices[3], scale) local triangle = Triangle:new(tr.id,p1, p2, p3, tr.adjacent_triangle_ids) @@ -219,7 +206,7 @@ end ---@param category MapGen.Layer.Category ---@param triangle MapGen.Triangle function Layer:addTriangle(category, triangle) - local triangles = self.trianglesList[category] + local triangles = self.trianglesList if triangles ~= nil then triangles[triangle.id] = triangle else @@ -231,25 +218,16 @@ end ---@param category MapGen.Layer.Category ---@param peak MapGen.Peak function Layer:addPeak(category, peak) - if category == 'landscape' then - table.insert(self.peaksList.landscape, peak) - elseif category == 'temp' then - table.insert(self.peaksList.temp, peak) - elseif category == 'humidity' then - table.insert(self.peaksList.humidity, peak) - else - error(('There is no peak category named %s.'):format(category)) - end + table.insert(self.peaksList, peak) end ---Returns the `MapGen.Peak` at the coordinates. If there is no peak at these coordinates, it returns `nil`. ----@param category MapGen.Layer.Category The category in which the peak is located. ---@param pos Position Coordinate of the desired peak. ---@return MapGen.Peak? -function Layer:getPeakByPos(category, pos) +function Layer:getPeakByPos(pos) local positionStr = core.pos_to_string(pos) - local peak = self.peaksByPos[category][positionStr] + local peak = self.peaksByPos[positionStr] return peak end diff --git a/mods/CORE/MapGen/src/MapGen/Peak.lua b/mods/CORE/MapGen/src/MapGen/Peak.lua index d798a48..0f632b0 100644 --- a/mods/CORE/MapGen/src/MapGen/Peak.lua +++ b/mods/CORE/MapGen/src/MapGen/Peak.lua @@ -2,8 +2,8 @@ local getInstance = Class.getInstance ---@class MapGen.Peak ---@field id number ----@field getPeakPos fun(self):vector ----@field getColor fun(self):ColorString +---@field pos vector +---@field color ColorString ---@field getGroups fun(self):table ---@field addGroups fun(self, groups:table) local Peak = { @@ -23,7 +23,6 @@ local Peak = { ---@param def MapGen.PeakDef ---@return MapGen.Peak function Peak:new(def) - local _pos = vector.new(def.pos) local _color = def.color local _groups @@ -39,14 +38,8 @@ function Peak:new(def) __tostring = self.toString, __eq = self.eq }) - - function instance:getPeakPos() - return _pos:copy() - end - - function instance:getColor() - return _color - end + instance.pos = vector.new(def.pos) + instance.color = def.color function instance:getGroups() return table.copy_with_metatables(_groups) @@ -66,7 +59,7 @@ end ---Returns a string describing the object in a readable form. ---@return string function Peak:toString() - local pos = self:getPeakPos() + local pos = self.pos return ('Peak (%s) x: %.2f y: %.2f z: %.2f'):format( self.id, pos.x, pos.y, pos.z) end @@ -74,8 +67,8 @@ end ---@param other MapGen.Peak ---@return boolean function Peak:eq(other) - local pos1 = self:getPeakPos() - local pos2 = other:getPeakPos() + local pos1 = self.pos + local pos2 = other.pos return pos1.x == pos2.x and pos1.z == pos2.z end diff --git a/mods/CORE/MapGen/src/MapGen/Triangle.lua b/mods/CORE/MapGen/src/MapGen/Triangle.lua index d96aded..d55ca32 100644 --- a/mods/CORE/MapGen/src/MapGen/Triangle.lua +++ b/mods/CORE/MapGen/src/MapGen/Triangle.lua @@ -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 --- @@ -29,9 +29,9 @@ end ---@param p3 MapGen.Peak ---@return boolean local function isFlatAngle(p1, p2, p3) - local pos1 = p1:getPeakPos() - local pos2 = p2:getPeakPos() - local pos3 = p3:getPeakPos() + local pos1 = p1.pos + local pos2 = p2.pos + local pos3 = p3.pos local vec1 = pos1 - pos2 -- Vector from p2 to p1 local vec2 = pos3 - pos2 -- Vector from p2 to p3 @@ -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? @@ -91,7 +91,7 @@ function Triangle:new(id, p1, p2, p3, neighboursIDs) ---@type ColorString? local color = nil - local c1, c2, c3 = p1.getColor(), p2.getColor(), p3.getColor() + local c1, c2, c3 = p1.color, p2.color, p3.color if c1 == c2 and c2 == c3 and c3 == c1 then color = c1 @@ -123,9 +123,9 @@ end ---@return string function Triangle:toString() return ('Triangle: \n %s\n %s\n %s'):format( - tostring(self.p1.getPeakPos()), - tostring(self.p2.getPeakPos()), - tostring(self.p3.getPeakPos()) + tostring(self.p1.pos), + tostring(self.p2.pos), + tostring(self.p3.pos) ) end @@ -148,9 +148,9 @@ end ---Returns the coordinates of the triangle's center. ---@return vector function Triangle:getCenter() - local pos1 = self.p1:getPeakPos() - local pos2 = self.p2:getPeakPos() - local pos3 = self.p3:getPeakPos() + local pos1 = self.p1.pos + local pos2 = self.p2.pos + local pos3 = self.p3.pos return (pos1 + pos2 + pos3) / 3 end @@ -167,11 +167,11 @@ 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:getPeakPos() - local pos2 = p2:getPeakPos() - local pos3 = p3:getPeakPos() + local pos1 = p1.pos + local pos2 = p2.pos + local pos3 = p3.pos local v = pos3 - pos2 ---@type vector @@ -193,11 +193,11 @@ 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:getPeakPos() - local pos2 = p2:getPeakPos() - local pos3 = p3:getPeakPos() + local pos1 = p1.pos + local pos2 = p2.pos + local pos3 = p3.pos pos1.y = 0 pos2.y = 0 @@ -228,9 +228,9 @@ end ---that is, the calculation is performed on the projection of the triangle XZ. ---@return number, number, number function Triangle:getSidesLength2D() - local pos1 = self.p1:getPeakPos() - local pos2 = self.p2:getPeakPos() - local pos3 = self.p3:getPeakPos() + local pos1 = self.p1.pos + local pos2 = self.p2.pos + local pos3 = self.p3.pos pos1.y = 0 pos2.y = 0 @@ -245,9 +245,9 @@ end ---that is, the calculation is performed on the projection of the triangle XZ. ---@return vector function Triangle:getCircumCenter2D() - local pos1 = self.p1:getPeakPos() - local pos2 = self.p2:getPeakPos() - local pos3 = self.p3:getPeakPos() + local pos1 = self.p1.pos + local pos2 = self.p2.pos + local pos3 = self.p3.pos local D = ( pos1.x * (pos2.z - pos3.z) + pos2.x * (pos3.z - pos1.z) + @@ -294,7 +294,7 @@ end ---@param p MapGen.Peak ---@return boolean function Triangle:inCircumCircle2D(p) - local pos = p:getPeakPos() + local pos = p.pos local c, r = self:getCircumCircle2D() diff --git a/mods/ENVIRONMENT/mapGenerator/init.lua b/mods/ENVIRONMENT/mapGenerator/init.lua index 673fbb2..9de91d4 100644 --- a/mods/ENVIRONMENT/mapGenerator/init.lua +++ b/mods/ENVIRONMENT/mapGenerator/init.lua @@ -1,7 +1,7 @@ -- World generation occurs in a separate thread (MapGen Environment). -- But for the main thread, the mapgenerator object is also initialized. -core.set_mapgen_setting('chunksize', '{x=1,y=5,z=1}', true) +--core.set_mapgen_setting('chunksize', '{x=2,y=10,z=2}', true) local mapGeneneratorRequire = Mod.getInfo('smc__core__map_generator').require diff --git a/mods/SYSTEM/Profiler/init.lua b/mods/SYSTEM/Profiler/init.lua index fcb6801..4fb1517 100644 --- a/mods/SYSTEM/Profiler/init.lua +++ b/mods/SYSTEM/Profiler/init.lua @@ -29,8 +29,8 @@ function Profiler:startTimer() end ---Marks the end time of the timer. -function Profiler:endTimer() - self.endTime = getUsTime() +function Profiler:stopTimer() + self.endTime = getUsTime() self.deltaTime = self.endTime - self.startTime end @@ -50,6 +50,11 @@ function Profiler:getDeltaTime(units) end ---Displays the time difference in the chat using `core.log`. -function Profiler:logDeltaTime() - core.log(('DeltaTime[%s]: %.3f'):format(self:getDeltaTime())) +---@param min number? +function Profiler:logDeltaTime(min) + local delta = self:getDeltaTime() + + if delta >= (min or 0) then + core.log(('DeltaTime[%s]: %.3f'):format(self.name, delta)) + end end