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

@@ -1,8 +1,6 @@
---@class Item.Settings ---@class Item.Settings
local Settings = {} local Settings = {}
-- TODO: Разобраться с дубликатами аннотаций полей. Приоритетно брать аннотации из util/ide-helper
---Technical name of the item. Must be unique and have the format `mod_name:item_name` ---Technical name of the item. Must be unique and have the format `mod_name:item_name`
---@type string ---@type string
Settings.name = "" Settings.name = ""

View File

@@ -326,32 +326,6 @@ local function generateRock(ids, data, index, x, y, z)
end end
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 layer MapGen.Layer
---@param x number ---@param x number
---@param y number ---@param y number
@@ -523,15 +497,6 @@ function MapGen:getNoises2dValues(layer, x, y, z)
---@param triangle MapGen.Triangle ---@param triangle MapGen.Triangle
for _, triangle in ipairs(layer.trianglesList) do 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 if pointInTriangle(x, z,triangle) then
local noiseHeightValue, noiseTempValue, noiseHumidityValue = calcNoises2dValues(triangle, x, y, z) local noiseHeightValue, noiseTempValue, noiseHumidityValue = calcNoises2dValues(triangle, x, y, z)

View File

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

View File

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

View File

@@ -91,7 +91,7 @@ Callbacks.after_dig_node = nil
--- ---
---default: nil ---default: nil
---* `pos`: node position ---* `pos`: node position
---* player: ObjectRef of digger TODO: в API было написано [player], это типо необязательный параметр? Я не понял ---* player: ObjectRef of digger
---@type fun(pos:Position, player:Player|ObjectRef|nil)? ---@type fun(pos:Position, player:Player|ObjectRef|nil)?
Callbacks.can_dig = nil Callbacks.can_dig = nil

View File

@@ -1,8 +1,6 @@
---@type Item.Settings ---@type Item.Settings
local ItemSettings = Core.Item.require('Item.Settings') local ItemSettings = Core.Item.require('Item.Settings')
-- TODO: Разобраться с дубликатами аннотаций полей. Приоритетно брать аннотации из util/ide-helper
---@class Node.Settings : Item.Settings ---@class Node.Settings : Item.Settings
local Settings = Mod:getClassExtended(ItemSettings, {}) local Settings = Mod:getClassExtended(ItemSettings, {})