Mapgen: write SuperUltraSigmaMapgen part 2,9 (no shit)

This commit is contained in:
Van
2025-11-09 21:13:38 +03:00
parent b3b74d6160
commit 599ae6f1b1
8 changed files with 741 additions and 525 deletions

View File

@@ -1,7 +1,8 @@
local mathCeil, mathAbs, mathRound, mathMin
= math.ceil, math.abs, math.round, math.min
local BUFFER_ZONE_WIDTH = 30
local BUFFER_ZONE_WIDTH = 3000
local MAX_DISTANCE = 3000
-- --- MapGen default moises ---
---@type ValueNoise
@@ -40,25 +41,28 @@ local require = modInfo.require
---@type MapGen.Layer
local Layer = require("MapGen.Layer")
---@type MapGen.Cell
local Cell = require("MapGen.Cell")
---@type MapGen.Peak
local Peak = require("MapGen.Peak")
---@type MapGen.Biome
local Biome = require("MapGen.Biome")
---@type MapGen.Triangulation
local Triangulation = require("MapGen.Triangulation")
---@class MapGen
---@field layersByName table
---@field layersList table
---@field biomesList table
---@field biomesDiagram table
---@field multinoiseInitialized boolean Is the fractal noise of the cells initialized? This is necessary for a one-time noise initialization.
---@field biomesDiagram table
---@field multinoiseInitialized boolean Is the fractal noise of the peaks 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 nodeIDs table<string, number>
local MapGen = {
layersByName = {},
layersList = {},
biomesList = {},
biomesDiagram = {},
biomesDiagram = {},
multinoiseInitialized = false,
isRunning = false,
}
@@ -117,16 +121,25 @@ function MapGen:RegisterLayer(name, minY, maxY)
end)
end
function MapGen:initLayersTrianglesList()
---@param layer MapGen.Layer
for _, layer in ipairs(self.layersList) do
print('A: ', #layer.peaksList)
layer.trianglesList = Triangulation.triangulate(layer.peaksList)
print('ABOBA:', dump(layer.trianglesList))
end
end
-- TODO: переписать описание функции
---Mark a cell of the world as a cubic cell by two opposite vertices.
---Mark a peak of the world as a cubic peak by two opposite vertices.
---
---Cells must be included in layers and may overlap each other.
---@param layerName string The name of the layer in which the new cell will be included.
---@param cellPos vector
---@param multinoise MapGen.Cell.MultinoiseParams Noise that will be assigned to the cell and that will influence map generation
---@param cellIs2D boolean? If true, the transmitted Y coordinate will be overwritten by the layer boundaries.
---@param weightFactor number? The coefficient by which the reduction in the impact of cellal noise on generation will be calculated. If 0, there will be no reduction.
function MapGen:RegisterCell(layerName, cellPos, multinoise, cellIs2D, weightFactor)
---Peaks must be included in layers and may overlap each other.
---@param layerName string The name of the layer in which the new peak will be included.
---@param peakPos vector
---@param multinoise MapGen.Peak.MultinoiseParams Noise that will be assigned to the peak and that will influence map generation
---@param peakIs2D boolean? If true, the transmitted Y coordinate will be overwritten by the layer boundaries.
---@param weightFactor number? The coefficient by which the reduction in the impact of peakal noise on generation will be calculated. If 0, there will be no reduction.
function MapGen:RegisterPeak(layerName, peakPos, multinoise, peakIs2D, weightFactor)
---@type MapGen.Layer
local layer = self.layersByName[layerName]
@@ -135,8 +148,8 @@ function MapGen:RegisterCell(layerName, cellPos, multinoise, cellIs2D, weightFac
end
-- TODO: вероятно стоит убрать 2D ячейки
if cellIs2D then
cellPos.y = 0
if peakIs2D then
peakPos.y = 0
end
--TODO: добавить проверку, что координата ячейки не совпадают
@@ -147,20 +160,22 @@ function MapGen:RegisterCell(layerName, cellPos, multinoise, cellIs2D, weightFac
weightFactor = 1
end
---@type MapGen.Cell
local cell = Cell:new(cellPos, multinoise, weightFactor)
---@type MapGen.Peak
local peak = Peak:new(peakPos, multinoise, weightFactor)
layer:addCell(cell)
layer:addPeak(peak)
return peak --TODO: временно?
end
---Initialize cell noise. This should be called after the map object is loaded.
function MapGen:initCellsMultinoise()
---Initialize peak noise. This should be called after the map object is loaded.
function MapGen:initPeaksMultinoise()
---@param layer MapGen.Layer
for _, layer in ipairs(self.layersList) do
---@param cell MapGen.Cell
for _, cell in ipairs(layer.cellsList) do
cell:initMultinoise()
---@param peak MapGen.Peak
for _, peak in ipairs(layer.peaksList) do
peak:initMultinoise()
end
end
@@ -205,9 +220,9 @@ function MapGen:initBiomesDiagram()
end
---Calculate the weight for noise based on
---the distance of the point from the center of the cell.
---the distance of the point from the center of the peak.
---
---If the `weightFactor` is `0`, then the cell's
---If the `weightFactor` is `0`, then the peak's
---weight is not calculated and is always equal to `1`.
---@param minPos vector
---@param maxPos vector
@@ -280,7 +295,7 @@ end
local function generateNode(mapGenerator, hight, temp, humidity, data, index, x, y, z)
local ids = mapGenerator.nodeIDs
local biome = mapGenerator.biomesDiagram[temp][humidity]
local biome = mapGenerator.biomesDiagram[mathRound(temp)][mathRound(humidity)]
if y > hight and y > 0 then
data[index] = ids.air
@@ -293,205 +308,75 @@ local function generateNode(mapGenerator, hight, temp, humidity, data, index, x,
end
end
---@param mapGenerator MapGen
---@param cell MapGen.Cell
---@param data number[]
---@param index number
---@param x number
---@param y number
---@param z number
local function oneCellGeneratorHandler(mapGenerator, cell, data, index, x, y, z)
---@type ValueNoise?
local heightNoise = cell:getMultinoise().landscapeNoise
---@type ValueNoise?
local tempNoise = cell:getMultinoise().tempNoise
---@type ValueNoise?
local humidityNoise = cell:getMultinoise().humidityNoise
-- Default noise's values.
local noiseHeightValue = oceanNoise:get_2d({x = x, y = z})
local noiseTempValue = 0.0
local noiseHumidityValue = 0.0
if heightNoise ~= nil then
noiseHeightValue = mathRound(heightNoise:get_2d({x = x, y = z}))
local function pointInTriangle(px, py, x1, y1, x2, y2, x3, y3)
-- Функция для вычисления векторного произведения
local function crossProduct(ax, ay, bx, by)
return ax * by - ay * bx
end
if tempNoise ~= nil then
noiseTempValue = mathRound(tempNoise:get_2d({x = x, y = z}))
end
-- Векторы от вершин к точке и между вершинами
local d1 = crossProduct(x2 - x1, y2 - y1, px - x1, py - y1)
local d2 = crossProduct(x3 - x2, y3 - y2, px - x2, py - y2)
local d3 = crossProduct(x1 - x3, y1 - y3, px - x3, py - y3)
if humidityNoise ~= nil then
noiseHumidityValue = mathRound(humidityNoise:get_2d({x = x, y = z}))
end
-- Проверка знаков векторных произведений
local has_positive = (d1 > 0) or (d2 > 0) or (d3 > 0)
local has_negative = (d1 < 0) or (d2 < 0) or (d3 < 0)
generateNode(mapGenerator, noiseHeightValue, noiseTempValue, noiseHumidityValue, data, index, x, y, z)
-- Точка внутри, если все произведения одного знака
return not (has_positive and has_negative)
end
---@return number
local function smootherstep2(valueA, valueB, x)
x = x + (BUFFER_ZONE_WIDTH / 2)
-- Clamp x to the range [edge0, edge1] and normalize to [0, 1]
---@type number
local t = math.max(0, math.min(1, x / BUFFER_ZONE_WIDTH ))
-- Quintic polynomial: 6t^5 - 15t^4 + 10t^3
local new_t = t * t * t * (t * (t * 6 - 15) + 10)
---@param height MapGen.Triangulation.Edge
---@param x number
---@param y number
---@param z number
---@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()
return valueB + (valueA - valueB) * t--new_t
local v = pos3 - pos2
---@type vector
local w = pos1 - pos2
-- Formula: (w * v) / (v * v)
-- When * the dot product.
local t = w:dot(v) / v:dot(v)
local posP = pos2 + v * t
return 1 - vector.distance(pos2, posP) / height:length()
end
---@param mapGenerator MapGen
---@param cellA MapGen.Cell
---@param cellB MapGen.Cell
---@param distance number
---@param data number[]
---@param index number
---@param x number
---@param y number
---@param z number
local function twoCellsGeneratorHanler(mapGenerator, cellA, cellB, distance, data, index, x, y, z)
---@type ValueNoise?
local heightNoiseA = cellA:getMultinoise().landscapeNoise
---@type ValueNoise?
local tempNoiseA = cellA:getMultinoise().tempNoise
---@type ValueNoise?
local humidityNoiseA = cellA:getMultinoise().humidityNoise
---@param triangle MapGen.Triangle
---@param x number
---@param y number
---@param z number
---@return number
local function calcNoiseHeightValue(triangle, x, y, z)
local peak1 = triangle.p1
local peak2 = triangle.p2
local peak3 = triangle.p3
---@type ValueNoise?
local heightNoiseB = cellB:getMultinoise().landscapeNoise
---@type ValueNoise?
local tempNoiseB = cellB:getMultinoise().tempNoise
---@type ValueNoise?
local humidityNoiseB = cellB:getMultinoise().humidityNoise
local noiseHeightValue = 0
-- Default noise's values.
local noiseHeightValue = oceanNoise:get_2d({x = x, y = z})
local noiseTempValue = 0.0
local noiseHumidityValue = 0.0
local totalWeight = 0.0
if heightNoiseA ~= nil and heightNoiseB ~= nil then
noiseHeightValue = mathRound(smootherstep2(
heightNoiseA:get_2d({x = x, y = z}),
heightNoiseB:get_2d({x = x, y = z}),
distance))
end
local weight = calcWeight(triangle.h1, x, y, z)
noiseHeightValue = noiseHeightValue + peak1:getMultinoise().landscapeNoise:get_2d({x = x, y = z}) * weight
totalWeight = totalWeight + weight
if tempNoiseA ~= nil and tempNoiseB ~= nil then
noiseTempValue = mathRound(tempNoiseA:get_2d({x = x, y = z})) --TODO интерполяция
end
weight = calcWeight(triangle.h2, x, y, z)
noiseHeightValue = noiseHeightValue + peak2:getMultinoise().landscapeNoise:get_2d({x = x, y = z}) * weight
totalWeight = totalWeight + weight
if humidityNoiseA ~= nil and humidityNoiseB ~= nil then
noiseHumidityValue = mathRound(humidityNoiseA:get_2d({x = x, y = z})) --TODO интерполяция
end
weight = calcWeight(triangle.h3, x, y, z)
noiseHeightValue = noiseHeightValue + peak3:getMultinoise().landscapeNoise:get_2d({x = x, y = z}) * weight
totalWeight = totalWeight + weight
generateNode(mapGenerator, noiseHeightValue, noiseTempValue, noiseHumidityValue, data, index, x, y, z)
end
---@return number
local function smootherstep3(valueA, valueB, valueC, x, y)
x = x + (BUFFER_ZONE_WIDTH / 2)
y = y + (BUFFER_ZONE_WIDTH / 2)
-- Clamp x to the range [edge0, edge1] and normalize to [0, 1]
---@type number
local tx = math.max(0, math.min(1, x / BUFFER_ZONE_WIDTH ))
-- Quintic polynomial: 6t^5 - 15t^4 + 10t^3
--local new_t = t * t * t * (t * (t * 6 - 15) + 10)
local valueAB = valueB + (valueA - valueB) * tx--new_t
local ty = math.max(0, math.min(1, y / BUFFER_ZONE_WIDTH ))
--new_t = t * t * t * (t * (t * 6 - 15) + 10)
local T = 1 + tx + ty
local valueAC = valueC + (valueA - valueC) * ty--new_t
return (valueA * math.min(tx, ty) + valueB * (1-tx) + valueC * (1-ty))/(math.min(tx, ty) + (1-tx) + (1-tx))-- + valueC * (ty/T)) --(valueAC + valueAB)/2--valueA + (valueB - valueA) * tx + (valueC - valueA) * ty
end
---@param mapGenerator MapGen
---@param cellA MapGen.Cell
---@param cellB MapGen.Cell
---@param cellC MapGen.Cell
---@param distanceAB number
---@param distanceAC number
---@param data number[]
---@param index number
---@param x number
---@param y number
---@param z number
local function threeCellsGeneratorHanler(mapGenerator, cellA, cellB, cellC, distanceAB, distanceAC, data, index, x, y, z)
---@type ValueNoise?
local heightNoiseA = cellA:getMultinoise().landscapeNoise
---@type ValueNoise?
local tempNoiseA = cellA:getMultinoise().tempNoise
---@type ValueNoise?
local humidityNoiseA = cellA:getMultinoise().humidityNoise
---@type ValueNoise?
local heightNoiseB = cellB:getMultinoise().landscapeNoise
---@type ValueNoise?
local tempNoiseB = cellB:getMultinoise().tempNoise
---@type ValueNoise?
local humidityNoiseB = cellB:getMultinoise().humidityNoise
---@type ValueNoise?
local heightNoiseC = cellC:getMultinoise().landscapeNoise
---@type ValueNoise?
local tempNoiseC = cellC:getMultinoise().tempNoise
---@type ValueNoise?
local humidityNoiseC = cellC:getMultinoise().humidityNoise
-- Default noise's values.
local noiseHeightValue = oceanNoise:get_2d({x = x, y = z})
local noiseTempValue = 0.0
local noiseHumidityValue = 0.0
local cellPos = (cellC.getCellPos() + cellB.getCellPos())/2
local distanceBC = (x - cellPos.x)^2 + (y - cellPos.y)^2 + (z - cellPos.z)^2
if heightNoiseA ~= nil and heightNoiseB ~= nil and heightNoiseC ~=nil then
noiseHeightValue = mathRound(smootherstep3(
heightNoiseA:get_2d({x = x, y = z}),
heightNoiseB:get_2d({x = x, y = z}),
heightNoiseC:get_2d({x = x, y = z}),
distanceAB,
distanceAC))
end
if tempNoiseA ~= nil and tempNoiseB ~= nil then
noiseTempValue = mathRound(tempNoiseA:get_2d({x = x, y = z})) --TODO интерполяция
end
if humidityNoiseA ~= nil and humidityNoiseB ~= nil then
noiseHumidityValue = mathRound(humidityNoiseA:get_2d({x = x, y = z})) --TODO интерполяция
end
generateNode(mapGenerator, noiseHeightValue, noiseTempValue, noiseHumidityValue, data, index, x, y, z)
end
---@param pos0 vector
---@param pos1 vector
---@return number
local function calcDistance(pos0, pos1, posN)
-- We find the direction vector of line.
local v = pos1 - pos0
-- We find the coefficients for the parametric notation of the line equation.
local a = pos1.x - pos0.x
local b = pos1.y - pos0.y
local c = pos1.z - pos0.z
-- We find the parameter `t` based on the perpendicular
-- from the point of the generated node to the line.
local t = (a * (posN.x - pos0.x) + b * (posN.y - pos0.y) + c * (posN.z - pos0.z)) / (a^2 + b^2 + c^2)
-- We find the projection point of the generated
-- node point through the parametric equation.
local projection = pos0 + t*v
-- We find the distance between the generated node's point and its projection
-- (we obtain the length of the perpendicular to line).
return math.sqrt((pos0.x - projection.x)^2 + (pos0.y - projection.y)^2 + (pos0.z - projection.z)^2)
return mathRound(noiseHeightValue / totalWeight)
end
---@param mapGenerator MapGen
@@ -514,96 +399,64 @@ local function generatorHandler(mapGenerator, data, index, x, y, z)
oceanNoise = core.get_value_noise(oceanNoiseParams)
end
--- We get the two nearest cells.
---@type MapGen.Cell, MapGen.Cell?, MapGen.Cell?
local cellA, cellB, cellC = layer:getCellsByPos(x, y, z)
-- Default noise's values.
local noiseHeightValue = 0
local noiseTempValue = 0
local noiseHumidityValue = 0
--- The second cell may not exist, so we will generate only the first one.
if cellB == nil then
oneCellGeneratorHandler(mapGenerator, cellA, data, index, x, y, z)
return
end
---@param triangle MapGen.Triangle
for _, triangle in ipairs(layer.trianglesList) do
local peak1 = triangle.p1
local peak2 = triangle.p2
local peak3 = triangle.p3
--[[- We calculate the distance to the cell centers
local cellPos = cellA.getCellPos()
local distanceA = (x - cellPos.x)^2 + (y - cellPos.y)^2 + (z - cellPos.z)^2
cellPos = cellB.getCellPos()
local distanceB = (x - cellPos.x)^2 + (y - cellPos.y)^2 + (z - cellPos.z)^2
local pos1 = peak1:getPeakPos()
local pos2 = peak2:getPeakPos()
local pos3 = peak3:getPeakPos()
if cellC ~= nil then
cellPos = cellC.getCellPos()
local distanceC = (x - cellPos.x)^2 + (y - cellPos.y)^2 + (z - cellPos.z)^2
if mathAbs(distanceB - distanceA) <= BUFFER_ZONE_WIDTH^2 and
mathAbs(distanceC - distanceB) <= BUFFER_ZONE_WIDTH^2 and
mathAbs(distanceC - distanceA) <= BUFFER_ZONE_WIDTH^2
if pointInTriangle(
x, z,
pos1.x, pos1.z,
pos2.x, pos2.z,
pos3.x, pos3.z
)
then
threeCellsGeneratorHanler(mapGenerator, cellA, cellB, cellC, distanceA, distanceB, distanceC, data, index, x, y, z)
return
noiseHeightValue = calcNoiseHeightValue(triangle, x, y, z)
break
end
end
if x == -45 then
print(x, math.sqrt(distanceB), math.sqrt(distanceA))
end
--- If the point is in the buffer zone...
if mathAbs(math.sqrt(distanceB) - math.sqrt(distanceA)) <= BUFFER_ZONE_WIDTH^2 then
--- ... we will smooth out the noise.
twoCellsGeneratorHanler(mapGenerator, cellA, cellB, distanceA, distanceB, data, index, x, y, z)
return
else
--- ... otherwise we will use the nearest cell.
oneCellGeneratorHandler(mapGenerator, cellA, data, index, x, y, z)
return
end--]]
generateNode(mapGenerator, noiseHeightValue, noiseTempValue, noiseHumidityValue, data, index, x, y, z)
--[[local pos0 = ( cellB.getCellPos() + cellA.getCellPos() ) / 2
local posB = cellB.getCellPos()
local a = posB.x - pos0.x
local b = posB.y - pos0.y
local c = posB.z - pos0.z
--[[ We get the two nearest peaks.
---@type {peak: MapGen.Peak, weight: number}[]|table, number
local peaks, totalWeight = layer:getPeaksByPos(x, y, z, MAX_DISTANCE)
local t = (a * (x - pos0.x) + b * (y - pos0.y) + c * (z - pos0.z)) / (a^2 + b^2 + c^2)
local projection = vector.new(
pos0.x + a * t,
pos0.y + a * t,
pos0.z + a * t
)--]]
local posA = cellA.getCellPos()
local posB = cellB.getCellPos()
local distanceAB = calcDistance( (posB + posA) / 2, posB, vector.new(x,y,z))
if cellC ~= nil then
local posC = cellC.getCellPos()
local distanceAC = calcDistance( (posC + posA) / 2, posC, vector.new(x,y,z))
local distanceBC = calcDistance( (posC + posB) / 2, posC, vector.new(x,y,z))
if distanceAC <= BUFFER_ZONE_WIDTH / 2 and distanceAB <= BUFFER_ZONE_WIDTH / 2 and distanceBC <= BUFFER_ZONE_WIDTH / 2 then
threeCellsGeneratorHanler(mapGenerator, cellA, cellB, cellC, distanceAB, distanceAC, data, index, x, y, z)
return
end
---@diagnostic disable-next-line: param-type-not-match
if table.is_empty(peaks) then
--[[minetest.log('warning',
'No `MapGen.Peak` were found for the following coordinates: '..
tostring(x)..' '..tostring(y)..' '..tostring(z)
) --] ]
generateNode(mapGenerator, oceanNoise:get_2d({x = x, y = z}), noiseTempValue, noiseHumidityValue, data, index, x, y, z)
end
--- If the point is in the buffer zone...
if distanceAB <= BUFFER_ZONE_WIDTH / 2 then
--- ... we will smooth out the noise.
twoCellsGeneratorHanler(mapGenerator, cellA, cellB, distanceAB, data, index, x, y, z)
return
else
--- ... otherwise we will use the nearest cell.
oneCellGeneratorHandler(mapGenerator, cellA, data, index, x, y, z)
return
if #peaks == 1 then
-- TODO: добавить температуру и влажностьf
generateNode(mapGenerator, peaks[1].peak:getMultinoise().landscapeNoise:get_2d({x = x, y = z}), noiseTempValue, noiseHumidityValue, data, index, x, y, z)
end
--- The function must terminate earlier.
--- The algorithm is based on eliminating options.
--- If the function execution has reached this point,
--- it means the algorithm is not taking some situation into account.
error('If you see this error, something went wrong in the map generation.')
---@param v {peak: MapGen.Peak, weight: number}
for _, v in ipairs(peaks) do
--TODO: дописать группу ландашфта и проверку на неё
noiseHeightValue = noiseHeightValue + v.peak:getMultinoise().landscapeNoise:get_2d({x = x, y = z}) * v.weight
--noiseTempValue = noiseTempValue + v.peak:getMultinoise().tempNoise:get_2d({x = x, y = z}) * v.weight
--noiseHumidityValue = noiseHumidityValue + v.peak:getMultinoise().humidityNoise:get_2d({x = x, y = z}) * v.weight
end
noiseHeightValue = mathRound(noiseHeightValue / totalWeight)
--noiseTempValue = mathRound(noiseTempValue / totalWeight)
--noiseHumidityValue = mathRound(noiseHumidityValue / totalWeight) --]]
end
---@param minPos table
@@ -614,7 +467,7 @@ function MapGen:onMapGenerated(minPos, maxPos, blockseed)
local voxelManip, eMin, eMax = core.get_mapgen_object("voxelmanip")
if not self.multinoiseInitialized then
self:initCellsMultinoise()
self:initPeaksMultinoise()
end
local data = voxelManip:get_data()
@@ -656,6 +509,7 @@ function MapGen:run()
end)
self:initBiomesDiagram()
self:initLayersTrianglesList()
MapGen.isRunning = true
end

View File

@@ -1,70 +0,0 @@
---@class MapGen.Cell
---@field getCellPos fun():vector
---@field getMultinoiseParams fun():MapGen.Cell.MultinoiseParams
---@field getMultinoise fun():MapGen.Cell.Multinoise
---@field initMultinoise fun()
---@field getWeightFactor fun():number
local Cell = {}
---@param multinoiseParams MapGen.Cell.MultinoiseParams
---@return MapGen.Cell.Multinoise
local function multinoiseParamsToMultinoise(multinoiseParams)
---@type MapGen.Cell.Multinoise
local multinoise = {}
for noiseName, noiseParams in pairs(multinoiseParams) do
multinoise[noiseName] = core.get_value_noise(noiseParams)
end
return multinoise
end
---@param cellPos vector
---@param multinoiseParams MapGen.Cell.MultinoiseParams
---@param weightFactor number TODO: возможно этот параметр не пригодится
---@return MapGen.Cell
function Cell:new(cellPos, multinoiseParams, weightFactor)
---@type vector
local _cellPos = cellPos
---@type MapGen.Cell.MultinoiseParams
local _multinoiseParams = multinoiseParams
if weightFactor < 0 then
weightFactor = 1
end
---@type MapGen.Cell.Multinoise
local _multinoise = {} -- note: must be empty until luanti mapgen objects are loaded.
---@type MapGen.Cell
local instance = setmetatable({}, {__index = self})
function instance:getCellPos()
return _cellPos
end
function instance:getMultinoiseParams()
return _multinoiseParams
end
function instance:getMultinoise()
return _multinoise
end
function instance:initMultinoise()
if not table.is_empty(_multinoise) then
minetest.log('warning', 'Multinoise has already been initialized. Re-initialization is not recommended.')
end
_multinoise = multinoiseParamsToMultinoise(_multinoiseParams)
print(dump(_multinoise))
end
function instance.getWeightFactor()
return weightFactor
end
return instance
end
return Cell

View File

@@ -1,10 +1,14 @@
local mathSqrt = math.sqrt
---@class MapGen.Layer
---@field name string
---@field minY number
---@field maxY number
---@field cellsList table
---@field name string
---@field minY number
---@field maxY number
---@field peaksList MapGen.Peak[]
---@field trianglesList MapGen.Triangle[]
local Layer = {
cellsList = {}
peaksList = {},
trianglesList = {},
}
---@param name string
@@ -22,84 +26,48 @@ function Layer:new(name, minY, maxY)
return instance
end
---@param cell MapGen.Cell
function Layer:addCell(cell)
table.insert(self.cellsList, cell)
print(dump(self.cellsList))
---@param peak MapGen.Peak
function Layer:addPeak(peak)
table.insert(self.peaksList, peak)
print(dump(self.peaksList))
-- TODO: добавить сортировку массива для оптимизации.
-- Вероятно будет лучше в отдельной фунции и засунуть её в MapGen.run
end
---Returns the two closest cells.
---Returns a list of tables of the form `{peak, weight}`.
---
---Maybe return an empty table.
---@param xPos number
---@param yPos number
---@param zPos number
---@return MapGen.Cell, MapGen.Cell?, MapGen.Cell?
function Layer:getCellsByPos(xPos, yPos, zPos)
-- TODO: дописать алгоритмы оптимизации:
-- * по сортированному массиву
-- * с помощью минимальных расстояний-гарантов
---@type MapGen.Cell, MapGen.Cell, MapGen.Cell
local cellA, cellB, cellC
-- Note: to optimize the distance, the dots are always in a square.
local pastDistanceA = math.huge
local pastDistanceB = math.huge
local pastDistanceC = math.huge
local newDistance
---@return {peak : MapGen.Peak, weight : number}[] | table, number
function Layer:getPeaksByPos(xPos, yPos, zPos, radius)
---@type MapGen.Peak[]
local peaks = {}
--- @type vector
local cellPos
local peakPos
---@type number
local distance
---@type number
local weight
---@type number
local totalWeight = 0
---@param cell MapGen.Cell
for _, cell in ipairs(self.cellsList) do
---@param peak MapGen.Peak
for _, peak in ipairs(self.peaksList) do
peakPos = peak.getPeakPos()
distance = mathSqrt((xPos - peakPos.x)^2 + (yPos - peakPos.y)^2 + (zPos - peakPos.z)^2)
if cellA == nil then
cellA = cell
cellPos = cell.getCellPos()
pastDistanceA = (xPos - cellPos.x)^2 + (yPos - cellPos.y)^2 + (zPos - cellPos.z)^2
if distance <= radius then
weight = 1 / distance --/ radius
goto continue
table.insert(peaks, {peak = peak, weight = weight})
totalWeight = totalWeight + weight
end
cellPos = cell.getCellPos()
newDistance = (xPos - cellPos.x)^2 + (yPos - cellPos.y)^2 + (zPos - cellPos.z)^2
if newDistance < pastDistanceA then
cellC = cellB
cellB = cellA
cellA = cell
pastDistanceC = pastDistanceB
pastDistanceB = pastDistanceA
pastDistanceA = newDistance
goto continue
end
if newDistance < pastDistanceB then
cellC = cellB
cellB = cell
pastDistanceC = pastDistanceB
pastDistanceB = newDistance
goto continue
end
if newDistance < pastDistanceC then
cellC = cell
pastDistanceC = newDistance
goto continue
end
::continue::
end
return cellA, cellB, cellC
return peaks, totalWeight
end
return Layer

View File

@@ -0,0 +1,107 @@
---@class MapGen.Peak
---@field id number
---@field getPeakPos fun():vector
---@field getMultinoiseParams fun():MapGen.Peak.MultinoiseParams
---@field getMultinoise fun():MapGen.Peak.Multinoise
---@field initMultinoise fun()
---@field getWeightFactor fun():number
local Peak = {
id = 0,
}
---@param multinoiseParams MapGen.Peak.MultinoiseParams
---@return MapGen.Peak.Multinoise
local function multinoiseParamsToMultinoise(multinoiseParams)
---@type MapGen.Peak.Multinoise
local multinoise = {}
for noiseName, noiseParams in pairs(multinoiseParams) do
multinoise[noiseName] = core.get_value_noise(noiseParams)
end
return multinoise
end
---@param peakPos vector
---@param multinoiseParams MapGen.Peak.MultinoiseParams
---@param weightFactor number TODO: возможно этот параметр не пригодится
---@return MapGen.Peak
function Peak:new(peakPos, multinoiseParams, weightFactor)
---@type vector
local _peakPos = peakPos
---@type MapGen.Peak.MultinoiseParams
local _multinoiseParams = multinoiseParams
if weightFactor < 0 then
weightFactor = 1
end
---@type MapGen.Peak.Multinoise
local _multinoise = {} -- note: must be empty until luanti mapgen objects are loaded.
---@type MapGen.Peak
local instance = setmetatable({}, {__index = self})
function instance:getPeakPos()
return _peakPos
end
function instance:getMultinoiseParams()
return _multinoiseParams
end
function instance:getMultinoise()
return _multinoise
end
function instance:initMultinoise()
if not table.is_empty(_multinoise) then
minetest.log('warning', 'Multinoise has already been initialized. Re-initialization is not recommended.')
end
_multinoise = multinoiseParamsToMultinoise(_multinoiseParams)
end
function instance.getWeightFactor()
return weightFactor
end
return instance
end
---@param other MapGen.Peak
function Peak:__eq( other )
local pos1 = self:getPeakPos()
local pos2 = other:getPeakPos()
return pos1.x == pos2.x and pos1.z == pos2.z
end
function Peak:__tostring()
return ('Peak (%s) x: %.2f y: %.2f'):format( self.id, self:getPeakPos().x, self:getPeakPos().y )
end
---@param p MapGen.Peak
function Peak:dist2(p)
local pos1 = self:getPeakPos()
local pos2 = p:getPeakPos()
local dx, dy = (pos1.x - pos2.x), (pos1.z - pos2.z)
return dx * dx + dy * dy
end
---@param p MapGen.Peak
function Peak:dist(p)
return math.sqrt(self:dist2(p))
end
function Peak:isInCircle(cx, cy, r)
local pos = self:getPeakPos()
local dx = (cx - pos.x)
local dy = (cy - pos.z)
return ((dx * dx + dy * dy) <= (r * r))
end
return Peak

View File

@@ -1,6 +1,6 @@
---For EmmyLua only
---@class MapGen.Cell.Multinoise
---@class MapGen.Peak.Multinoise
---@field landscapeNoise ValueNoise?
---@field tempNoise ValueNoise?
---@field humidityNoise ValueNoise?

View File

@@ -1,6 +1,6 @@
---For EmmyLua only
---@class MapGen.Cell.MultinoiseParams
---@class MapGen.Peak.MultinoiseParams
---@field landscapeNoise NoiseParams?
---@field tempNoise NoiseParams?
---@field humidityNoise NoiseParams?

View File

@@ -0,0 +1,372 @@
-- SMC tringulation lib
-- Original code: https://github.com/iskolbin/Triangulation/blob/master/Triangulation.lua
-- Date of copying: 07.11.2025
-- Commit: e8d26241767cd6af377b5eda0c1e27122b6afe8a
local setmetatable, tostring, assert = setmetatable, tostring, assert
local max, sqrt = math.max, math.sqrt
local remove = table.remove
local modInfo = Mod.getInfo()
local require = modInfo.require
---@type MapGen.Peak
local Peak = require("MapGen.Peak")
--local isffi = false, ffi = pcall( require, 'ffi' )
--local ffiPoint, ffiEdge, ffiTriangle
---Triangle semi-perimeter by Heron's formula
---@param a number
---@param b number
---@param c number
---@return number
local function quatCross(a, b, c)
local p = (a + b + c) * (a + b - c) * (a - b + c) * (-a + b + c)
return sqrt( p )
end
---Cross product (p1-p2, p2-p3)
---@param p1 MapGen.Peak
---@param p2 MapGen.Peak
---@param p3 MapGen.Peak
local function crossProduct(p1, p2, p3)
local pos1 = p1:getPeakPos()
local pos2 = p2:getPeakPos()
local pos3 = p3:getPeakPos()
local x1, x2 = pos2.x - pos1.x, pos3.x - pos2.x
local y1, y2 = pos2.z - pos1.z, pos3.z - pos2.z
return x1 * y2 - y1 * x2
end
---Checks if angle (p1-p2-p3) is flat
---@param p1 MapGen.Peak
---@param p2 MapGen.Peak
---@param p3 MapGen.Peak
local function isFlatAngle(p1, p2, p3)
return (crossProduct(p1, p2, p3) == 0)
end
---@class MapGen.Triangulation.FakePeak : MapGen.Peak
---@field id number
---@field getPeakPos fun():vector
local FakePeak = Mod:getClassExtended(Peak, {})
---@param peakPos vector
---@return MapGen.Peak
function FakePeak:new(peakPos)
local instance = Peak:new(peakPos, {}, 1)
return instance
end
---@class MapGen.Triangulation.Edge
---@field p1 MapGen.Peak
---@field p2 MapGen.Peak
local Edge = {}
---@param p1 MapGen.Peak
---@param p2 MapGen.Peak
---@return MapGen.Triangulation.Edge
function Edge:new( p1, p2 )
local instance = setmetatable({
p1 = p1,
p2 = p2
}, {__index = self})
return instance
end
---@param other MapGen.Triangulation.Edge
function Edge:__eq( other )
return self.p1 == other.p1 and self.p2 == other.p2
end
function Edge:__tostring()
return (('Edge :\n %s\n %s'):format(tostring(self.p1), tostring(self.p2)))
end
function Edge:same(otherEdge)
return ((self.p1 == otherEdge.p1) and (self.p2 == otherEdge.p2))
or ((self.p1 == otherEdge.p2) and (self.p2 == otherEdge.p1))
end
function Edge:length()
return self.p1:dist(self.p2)
end
---@return vector
function Edge:getMidPoint()
local pos1 = self.p1:getPeakPos()
local pos2 = self.p2:getPeakPos()
return (pos1 + pos2 )/2
end
---@class MapGen.Triangle
---@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
local Triangle = {}
---@param p1 MapGen.Peak
---@param p2 MapGen.Peak
---@param p3 MapGen.Peak
---@return MapGen.Triangle
function Triangle:new( p1, p2, p3 )
assert(not isFlatAngle(p1, p2, p3), ("angle (p1, p2, p3) is flat:\n %s\n %s\n %s")
:format(tostring(p1), tostring(p2), tostring(p3)))
local instance = setmetatable({
p1 = p1,
p2 = p2,
p3 = p3,
h1 = Triangle:getHeight(p1, p2, p3),
h2 = Triangle:getHeight(p2, p3, p1),
h3 = Triangle:getHeight(p3, p1, p2),
e1 = Edge:new(p1, p2),
e2 = Edge:new(p2, p3),
e3 = Edge:new(p3, p1)
}, {__index = self})
return instance
end
---Returns the length of the perpendicular
---from Peak1 to the line Peak2-Peak3
---@param p1 MapGen.Peak
---@param p2 MapGen.Peak
---@param p3 MapGen.Peak
---@return MapGen.Triangulation.Edge
function Triangle:getHeight(p1, p2, p3)
local pos1 = p1:getPeakPos()
local pos2 = p2:getPeakPos()
local pos3 = p3:getPeakPos()
local v = pos3 - pos2
---@type vector
local w = pos1 - pos2
-- Formula: (w * v) / (v * v)
-- When * the dot product.
local t = w:dot(v) / v:dot(v)
local posP = pos2 + v * t
return Edge:new(p1, FakePeak:new(posP))
end
function Triangle:__tostring()
return (('Triangle: \n %s\n %s\n %s')
:format(tostring(self.p1.getPeakPos()), tostring(self.p2.getPeakPos()), tostring(self.p3.getPeakPos())))
end
---Checks if the triangle is defined clockwise (sequence p1-p2-p3)
function Triangle:isCW()
return (crossProduct(self.p1, self.p2, self.p3) < 0)
end
---Checks if the triangle is defined counter-clockwise (sequence p1-p2-p3)
function Triangle:isCCW()
return (crossProduct(self.p1, self.p2, self.p3) > 0)
end
---Returns the length of the edges
function Triangle:getSidesLength()
return self.e1:length(), self.e2:length(), self.e3:length()
end
---Returns the coordinates of the center
function Triangle:getCenter()
local pos1 = self.p1:getPeakPos()
local pos2 = self.p2:getPeakPos()
local pos3 = self.p3:getPeakPos()
return (pos1 + pos2 + pos3) / 3
end
---Returns the coordinates of the circumcircle center
function Triangle:getCircumCenter()
local pos1 = self.p1:getPeakPos()
local pos2 = self.p2:getPeakPos()
local pos3 = self.p3:getPeakPos()
local D = ( pos1.x * (pos2.z - pos3.z) +
pos2.x * (pos3.z - pos1.z) +
pos3.x * (pos1.z - pos2.z)) * 2
local x = (( pos1.x * pos1.x + pos1.z * pos1.z) * (pos2.z - pos3.z) +
( pos2.x * pos2.x + pos2.z * pos2.z) * (pos3.z - pos1.z) +
( pos3.x * pos3.x + pos3.z * pos3.z) * (pos1.z - pos2.z))
local z = (( pos1.x * pos1.x + pos1.z * pos1.z) * (pos3.x - pos2.x) +
( pos2.x * pos2.x + pos2.z * pos2.z) * (pos1.x - pos3.x) +
( pos3.x * pos3.x + pos3.z * pos3.z) * (pos2.x - pos1.x))
return (x / D), (z / D)
end
--- Returns the radius of the circumcircle
function Triangle:getCircumRadius()
local a, b, c = self:getSidesLength()
return ((a * b * c) / quatCross(a, b, c))
end
---Returns the coordinates of the circumcircle center and its radius
function Triangle:getCircumCircle()
local x, z = self:getCircumCenter()
local r = self:getCircumRadius()
return x, z, r
end
---Returns the area
function Triangle:getArea()
local a, b, c = self:getSidesLength()
return (quatCross(a, b, c) / 4)
end
---Checks if a given point lies into the triangle circumcircle
---@param p MapGen.Peak
function Triangle:inCircumCircle(p)
return p:isInCircle(self:getCircumCircle())
end
---@class MapGen.Triangulation
local Triangulation = {
convexMultiplier = 1e3,
}
---Triangulates a set of given vertices
---@param vertices table<integer, MapGen.Peak>
function Triangulation.triangulate( vertices )
local nvertices = #vertices
assert( nvertices > 2, "Cannot triangulate, needs more than 3 vertices" )
if nvertices == 3 then
return {Triangle:new(vertices[1], vertices[2], vertices[3])}
end
local trmax = nvertices * 4
local minX, minY = vertices[1].getPeakPos().x, vertices[1].getPeakPos().z
local maxX, maxY = minX, minY
for i = 1, #vertices do
local vertex = vertices[i]
local vertexPos = vertex.getPeakPos()
vertex.id = i
if vertexPos.x < minX then
minX = vertexPos.x
end
if vertexPos.z < minY then
minY = vertexPos.z
end
if vertexPos.x > maxX then
maxX = vertexPos.x
end
if vertexPos.z > maxY then
maxY = vertexPos.z
end
end
---Finding the vertices of a supertriangle
local convex_mult = Triangulation.convexMultiplier
local dx, dy = (maxX - minX) * convex_mult, (maxY - minY) * convex_mult
local deltaMax = max(dx, dy)
local midx, midy = (minX + maxX) * 0.5, (minY + maxY) * 0.5
local p1 = FakePeak:new(vector.new( midx - 2 * deltaMax,0, midy - deltaMax ))
local p2 = FakePeak:new(vector.new(midx,0, midy + 2 * deltaMax ))
local p3 = FakePeak:new( vector.new(midx + 2 * deltaMax,0, midy - deltaMax ))
p1.id, p2.id, p3.id = nvertices + 1, nvertices + 2, nvertices + 3
vertices[p1.id], vertices[p2.id], vertices[p3.id] = p1, p2, p3
---@type MapGen.Triangle[]
local triangles = {Triangle:new( vertices[nvertices + 1], vertices[nvertices + 2], vertices[nvertices + 3] )}
for i = 1, nvertices do
---@type MapGen.Triangulation.Edge[]
local edges = {}
local ntriangles = #triangles
for j = #triangles, 1, -1 do
local curTriangle = triangles[j]
if curTriangle:inCircumCircle(vertices[i]) then
edges[#edges + 1] = curTriangle.e1
edges[#edges + 1] = curTriangle.e2
edges[#edges + 1] = curTriangle.e3
remove( triangles, j )
end
end
for j = #edges - 1, 1, -1 do
for k = #edges, j + 1, -1 do
if edges[j] and edges[k] and edges[j]:same(edges[k]) then
remove( edges, j )
remove( edges, k-1 )
end
end
end
for j = 1, #edges do
local n = #triangles
assert(n <= trmax, "Generated more than needed triangles")
triangles[n + 1] = Triangle:new(edges[j].p1, edges[j].p2, vertices[i])
end
end
for _, tri in ipairs(triangles) do
print('tria:', tri:__tostring())
end
print('---')
for _, v in ipairs(vertices) do
print('v: ', tostring(v:getPeakPos()))
end
print('---')
for i = #triangles, 1, -1 do
local triangle = triangles[i]
if triangle.p1.id > nvertices or triangle.p2.id > nvertices or triangle.p3.id > nvertices then
remove( triangles, i )
end
end
for _ = 1,3 do
remove( vertices )
end
return triangles
end
--[[
function Triangulation.setffi( set )
if ffi then
isffi = set
end
end
if isffi then
ffi.cdef(([[
typedef struct { %s x, z; uint32_t id; } Point;
typedef struct { Point p1, p2; } Edge;
typedef struct { Point p1, p2, p3; Edge e1, e2, e3; } Triangle;
] ]):format( _G.DELAUNAY_FFI_TYPE or 'double' ))
ffiPoint = ffi.metatype( "Point", Point )
ffiEdge = ffi.metatype( "Edge", Edge )
ffiTriangle = ffi.metatype( "Triangle", Triangle )
end --]]
return Triangulation

View File

@@ -21,103 +21,12 @@ local mapGenerator = Core.MapGen.Class:new({
mapGenerator:RegisterLayer("world", -1000, 500)
mapGenerator:RegisterCell("world",
local a = mapGenerator:RegisterPeak("world",
vector.new(0,0,0),
{
landscapeNoise = {
offset = 10,
scale = 0,
spread = {x = 100, y = 100, z = 100},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
mapGenerator:RegisterCell("world",
vector.new(-100,0,0),
{
landscapeNoise = {
offset = 10,
scale = 0,
spread = {x = 100, y = 100, z = 100},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
mapGenerator:RegisterCell("world",
vector.new(0,0,-100),
{
landscapeNoise = {
offset = 10,
scale = 0,
spread = {x = 100, y = 100, z = 100},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
mapGenerator:RegisterCell("world",
vector.new(-100,0,-100),
{
landscapeNoise = {
offset = 10,
scale = 0,
spread = {x = 100, y = 100, z = 100},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
mapGenerator:RegisterCell("world",
vector.new(-50,0,50),
{
landscapeNoise = {
offset = 10,
scale = 0,
spread = {x = 100, y = 100, z = 100},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
mapGenerator:RegisterCell("world",
vector.new(50,0,-50),
{
landscapeNoise = {
offset = 10,
scale = 0,
spread = {x = 100, y = 100, z = 100},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
mapGenerator:RegisterCell("world",
vector.new(-50,0,-50),
{
landscapeNoise = {
offset = -20,
scale = 0,
offset = 30,
scale = 2,
spread = {x = 10, y = 10, z = 10},
seed = 47,
octaves = 8,
@@ -125,7 +34,83 @@ mapGenerator:RegisterCell("world",
lacunarity = 2,
},
},
true, 2.0)
true, 1.0)
local b = mapGenerator:RegisterPeak("world",
vector.new(-100,0,0),
{
landscapeNoise = {
offset = 30,
scale = 2,
spread = {x = 10, y = 10, z = 10},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
local c = mapGenerator:RegisterPeak("world",
vector.new(0,0,-100),
{
landscapeNoise = {
offset = 30,
scale = 2,
spread = {x = 10, y = 10, z = 10},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
local d = mapGenerator:RegisterPeak("world",
vector.new(-100,0,-100),
{
landscapeNoise = {
offset = 30,
scale = 2,
spread = {x = 10, y = 100, z = 10},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
local e = mapGenerator:RegisterPeak("world",
vector.new(-50,0,-50),
{
landscapeNoise = {
offset = -10,
scale = 2,
spread = {x = 10, y = 10, z = 10},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)
--[[
local e = mapGenerator:RegisterPeak("world",
vector.new(-50,0,50),
{
landscapeNoise = {
offset = 40,
scale = 0,
spread = {x = 100, y = 100, z = 100},
seed = 47,
octaves = 8,
persistence = 0.4,
lacunarity = 2,
},
},
true, 1.0)--]]
--[[
mapGenerator:RegisterRegion("world",
vector.new(-50, 0, -50),