Mapgen: write SuperUltraSigmaMapgen part 6.1

This commit is contained in:
Van
2025-11-19 09:58:43 +03:00
parent d168e1cc68
commit 665e36edc8
6 changed files with 8 additions and 47 deletions

View File

@@ -326,32 +326,6 @@ local function generateRock(ids, data, index, x, y, z)
end
end
---DEV noises
---@type NoiseParams
local caveNoiseParams1 = {
offset = 0,
scale = 1,
spread = {x = 25, y = 25, z = 25},
seed = 5934,
octaves = 3,
persistence = 0.5,
lacunarity = 2.0
}
---@type NoiseParams
local caveNoiseParams2 = {
offset = 0,
scale = 1,
spread = {x = 50, y = 10, z = 50}, -- Y меньше для горизонтального вытягивания
seed = -1034,
octaves = 2,
persistence = 0.6,
lacunarity = 2.0
}
---@type ValueNoise, ValueNoise
local caveNoise1, caveNoise2
---@param layer MapGen.Layer
---@param x number
---@param y number
@@ -523,15 +497,6 @@ function MapGen:getNoises2dValues(layer, x, y, z)
---@param triangle MapGen.Triangle
for _, triangle in ipairs(layer.trianglesList) do
local peak1 = triangle.p1
local peak2 = triangle.p2
local peak3 = triangle.p3
local pos1 = peak1:getPeakPos()
local pos2 = peak2:getPeakPos()
local pos3 = peak3:getPeakPos()
-- If the point is in the triangle defined by the `MapGen.Peak`...
if pointInTriangle(x, z,triangle) then
local noiseHeightValue, noiseTempValue, noiseHumidityValue = calcNoises2dValues(triangle, x, y, z)

View File

@@ -35,8 +35,6 @@ end
---@param peak MapGen.Peak
function Layer:addPeak(peak)
table.insert(self.peaksList, peak)
-- TODO: добавить сортировку массива для оптимизации.
-- Вероятно будет лучше в отдельной фунции и засунуть её в MapGen.run
end
---Returns a list of tables of the form `{peak, weight}`.

View File

@@ -70,10 +70,6 @@ end
---@param smoothDistance number
---@return number
local function calcCavernWeight(y, smoothDistance, minY, maxY)
if y > maxY or y < minY then
return 0
end
local maxDist = maxY - y
local minDist = y - minY
@@ -86,12 +82,18 @@ end
---@param threshold number?
---@return boolean
function Cavern:isCavern(x, y, z, threshold)
local minY, maxY = self.minY, self.maxY
if y > maxY or y < minY then
return false
end
if threshold == nil then
threshold = 0
end
local noise = self:getNoise()
local weight = calcCavernWeight(y, self.smoothDistance, self.minY, self.maxY)
local weight = calcCavernWeight(y, self.smoothDistance, minY, maxY)
if y == -15 then
print('is', weight)