Mapgen: write SuperUltraSigmaMapgen part 6
This commit is contained in:
@@ -41,31 +41,36 @@ local modInfo = Mod.getInfo()
|
||||
local require = modInfo.require
|
||||
|
||||
---@type MapGen.Layer
|
||||
local Layer = require("MapGen.Layer")
|
||||
local Layer = require('MapGen.Layer')
|
||||
|
||||
---@type MapGen.Peak
|
||||
local Peak = require("MapGen.Peak")
|
||||
local Peak = require('MapGen.Peak')
|
||||
|
||||
---@type MapGen.Biome
|
||||
local Biome = require("MapGen.Biome")
|
||||
local Biome = require('MapGen.Biome')
|
||||
|
||||
---@type MapGen.Triangulation
|
||||
local Triangulation = require("MapGen.Triangulation")
|
||||
local Triangulation = require('MapGen.Triangulation')
|
||||
|
||||
---@type MapGen.Layer.Cavern
|
||||
local Cavern = require('MapGen.Layer.Cavern')
|
||||
|
||||
---@class MapGen
|
||||
---@field layersByName table<string, MapGen.Layer>
|
||||
---@field layersList MapGen.Layer[]
|
||||
---@field biomesList MapGen.Biome[]
|
||||
---@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>
|
||||
---@field layersByName table<string, MapGen.Layer>
|
||||
---@field layersList MapGen.Layer[]
|
||||
---@field biomesList MapGen.Biome[]
|
||||
---@field biomesDiagram table
|
||||
---@field peaksMultinoiseInitialized boolean Is the fractal noise of the peaks initialized? This is necessary for a one-time noise initialization.
|
||||
---@field cavernsNoiseInitialized boolean TODO: описание
|
||||
---@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 = {},
|
||||
multinoiseInitialized = false,
|
||||
peaksMultinoiseInitialized = false,
|
||||
cavernsNoiseInitialized = false,
|
||||
isRunning = false,
|
||||
}
|
||||
|
||||
@@ -99,6 +104,10 @@ function MapGen:getLayerByHeight(yPos)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- --- REGISTRATION METHODS ---
|
||||
|
||||
---Mark the world area between two heights as a `MapGen.Layer`.
|
||||
---
|
||||
---Note: layers must not overlap.
|
||||
@@ -123,14 +132,6 @@ function MapGen:RegisterLayer(name, minY, maxY)
|
||||
end)
|
||||
end
|
||||
|
||||
function MapGen:initLayersTrianglesTetrahedronsLists()
|
||||
---@param layer MapGen.Layer
|
||||
for _, layer in ipairs(self.layersList) do
|
||||
layer.trianglesList = Triangulation.triangulate(layer.peaksList)
|
||||
layer.tetrahedronsList = Triangulation.tetrahedralize(layer.peaksList)
|
||||
end
|
||||
end
|
||||
|
||||
-- TODO: переписать описание функции
|
||||
---Mark a peak of the world as a cubic peak by two opposite vertices.
|
||||
---
|
||||
@@ -144,7 +145,7 @@ function MapGen:registerPeak(layerName, peakPos, multinoise, groups)
|
||||
local layer = self.layersByName[layerName]
|
||||
|
||||
if not layer then
|
||||
error("Invalid layer: " .. layerName)
|
||||
error('Invalid layer: ' .. layerName)
|
||||
end
|
||||
|
||||
--TODO: добавить проверку, что координата ячейки не совпадают
|
||||
@@ -187,7 +188,50 @@ function MapGen:register2DPeaks(layerName, multinoise, peakPoses, groups)
|
||||
end
|
||||
end
|
||||
|
||||
---Initialize peak noise. This should be called after the map object is loaded.
|
||||
---@param name string
|
||||
---@param tempPoint number
|
||||
---@param humidityPoint number
|
||||
---@param groundNodes MapGen.Biome.GroundNodes
|
||||
---@param soilHeight number
|
||||
function MapGen:registerBiome(name, tempPoint, humidityPoint, groundNodes, soilHeight)
|
||||
local biome = Biome:new(name, tempPoint, humidityPoint, groundNodes, soilHeight)
|
||||
|
||||
--TODO: добавить MapGen.biomesByName и проверку на существование биома с таким же именем, аналогично `MapGen:registerCavern`
|
||||
--TODO: перенести Biomes в слой
|
||||
table.insert(self.biomesList, biome)
|
||||
end
|
||||
|
||||
---@param layerName string
|
||||
---@param cavernName string
|
||||
---@param minY number
|
||||
---@param maxY number
|
||||
---@param smoothDistance number
|
||||
---@param noiseParams NoiseParams
|
||||
---@param groups? table<string, number>
|
||||
function MapGen:registerCavern(layerName, cavernName, minY, maxY, smoothDistance, noiseParams, groups)
|
||||
local layer = self.layersByName[layerName]
|
||||
assert(layer.cavernsByName[cavernName] == nil, ('A cavern named `%s` already exists in the `%s` layer.'):format(cavernName, layerName))
|
||||
|
||||
local cavern = Cavern:new(cavernName, minY, maxY, smoothDistance, noiseParams, groups)
|
||||
|
||||
layer.cavernsByName[cavernName] = cavern
|
||||
table.insert(layer.cavernsList, cavern)
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- --- INITIALIZATION METHODS ---
|
||||
|
||||
---Initializing layer triangulation.
|
||||
function MapGen:initLayersTriangultaion()
|
||||
---@param layer MapGen.Layer
|
||||
for _, layer in ipairs(self.layersList) do
|
||||
layer.trianglesList = Triangulation.triangulate(layer.peaksList)
|
||||
-- layer.tetrahedronsList = Triangulation.tetrahedralize(layer.peaksList)
|
||||
end
|
||||
end
|
||||
|
||||
---Initialize peak's noises. This should be called after the map object is loaded.
|
||||
function MapGen:initPeaksMultinoise()
|
||||
---@param layer MapGen.Layer
|
||||
for _, layer in ipairs(self.layersList) do
|
||||
@@ -199,20 +243,24 @@ function MapGen:initPeaksMultinoise()
|
||||
|
||||
end
|
||||
|
||||
self.multinoiseInitialized = true
|
||||
self.peaksMultinoiseInitialized = true
|
||||
end
|
||||
|
||||
---@param name string
|
||||
---@param tempPoint number
|
||||
---@param humidityPoint number
|
||||
---@param groundNodes MapGen.Biome.GroundNodes
|
||||
---@param soilHeight number
|
||||
function MapGen:RegisterBiome(name, tempPoint, humidityPoint, groundNodes, soilHeight)
|
||||
local biome = Biome:new(name, tempPoint, humidityPoint, groundNodes, soilHeight)
|
||||
function MapGen:initCavernsNoise()
|
||||
---@param layer MapGen.Layer
|
||||
for _, layer in ipairs(self.layersList) do
|
||||
|
||||
table.insert(self.biomesList, biome)
|
||||
---@param peak MapGen.Peak
|
||||
for _, cavern in ipairs(layer.cavernsList) do
|
||||
cavern:initNoise()
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
self.cavernsNoiseInitialized = true
|
||||
end
|
||||
|
||||
---Initialization of the biome diagram using the Voronoi method.
|
||||
function MapGen:initBiomesDiagram()
|
||||
local diagram = self.biomesDiagram
|
||||
|
||||
@@ -238,6 +286,10 @@ function MapGen:initBiomesDiagram()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- --- GENERATION METHODS ---
|
||||
|
||||
local function generateSoil(biome, data, index, x, y, z)
|
||||
data[index] = core.get_content_id(biome.groundNodes.turf) -- TODO: убрать тут get_content_id(), переместить его куда-то "выше"
|
||||
end
|
||||
@@ -299,13 +351,20 @@ local caveNoiseParams2 = {
|
||||
|
||||
---@type ValueNoise, ValueNoise
|
||||
local caveNoise1, caveNoise2
|
||||
local function isCave(layer, x, y, z)
|
||||
if caveNoise1 == nil or caveNoise2 == nil then
|
||||
caveNoise1 = core.get_value_noise(caveNoiseParams1)
|
||||
caveNoise2 = core.get_value_noise(caveNoiseParams2)
|
||||
|
||||
---@param layer MapGen.Layer
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@return boolean
|
||||
local function isCavern(layer, x, y, z)
|
||||
for _, cavern in ipairs(layer.cavernsList) do
|
||||
if cavern:isCavern(x, y, z, 0.2) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return caveNoise1:get_3d({x = x, y = y, z = z}) * caveNoise2:get_3d({x = x, y = y, z = z}) * 0.3 > 0.05
|
||||
return false
|
||||
end
|
||||
|
||||
---@param mapGenerator MapGen
|
||||
@@ -333,7 +392,7 @@ local function generateNode(mapGenerator, layer, hight, temp, humidity, data, in
|
||||
elseif y > hight and y <= 0 then
|
||||
data[index] = ids.water
|
||||
elseif y <= hight then
|
||||
if isCave(layer, x, y, z) then
|
||||
if isCavern(layer, x, y, z) then
|
||||
data[index] = ids.air
|
||||
elseif y == hight then
|
||||
generateSoil(biome, data, index, x, y, z)
|
||||
@@ -619,12 +678,16 @@ end
|
||||
---@param blockseed number
|
||||
function MapGen:onMapGenerated(minPos, maxPos, blockseed)
|
||||
-- We obtain a generation area for further manipulations
|
||||
local voxelManip, eMin, eMax = core.get_mapgen_object("voxelmanip")
|
||||
local voxelManip, eMin, eMax = core.get_mapgen_object('voxelmanip')
|
||||
|
||||
if not self.multinoiseInitialized then
|
||||
if not self.peaksMultinoiseInitialized then
|
||||
self:initPeaksMultinoise()
|
||||
end
|
||||
|
||||
if not self.cavernsNoiseInitialized then
|
||||
self:initCavernsNoise()
|
||||
end
|
||||
|
||||
local data = voxelManip:get_data()
|
||||
-- local param2_data = voxelManip:get_param2_data()
|
||||
local area = VoxelArea:new({MinEdge = eMin, MaxEdge = eMax})
|
||||
@@ -644,13 +707,17 @@ function MapGen:onMapGenerated(minPos, maxPos, blockseed)
|
||||
-- We make changes back to LVM and recalculate light & liquids
|
||||
voxelManip:set_data(data)
|
||||
--voxelManip:set_param2_data()
|
||||
voxelManip:set_lighting({ day = 0, night = 0})
|
||||
voxelManip:set_lighting({ day = 14, night = 0})
|
||||
voxelManip:calc_lighting()
|
||||
voxelManip:update_liquids()
|
||||
|
||||
voxelManip:write_to_map()
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- --- OTHER ---
|
||||
|
||||
---Run world generation through this mapgen object
|
||||
---
|
||||
---Note: only one instance of a `MapGen` class can be running.
|
||||
@@ -664,7 +731,7 @@ function MapGen:run()
|
||||
end)
|
||||
|
||||
self:initBiomesDiagram()
|
||||
self:initLayersTrianglesTetrahedronsLists()
|
||||
self:initLayersTriangultaion()
|
||||
|
||||
MapGen.isRunning = true
|
||||
end
|
||||
|
||||
@@ -11,7 +11,7 @@ local Biome = {}
|
||||
---@param humidityPoint number
|
||||
---@param groundNodes MapGen.Biome.GroundNodes
|
||||
---@param soilHeight number
|
||||
---@return MapGen.Biome
|
||||
---@return MapGen.Biome
|
||||
function Biome:new(name, tempPoint, humidityPoint, groundNodes, soilHeight)
|
||||
---@type MapGen.Biome
|
||||
local instance = setmetatable({
|
||||
|
||||
@@ -5,10 +5,14 @@ local mathSqrt = math.sqrt
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field peaksList MapGen.Peak[]
|
||||
---@field cavernsByName table<string, MapGen.Layer.Cavern>
|
||||
---@field cavernsList MapGen.Layer.Cavern[]
|
||||
---@field trianglesList MapGen.Triangle[]
|
||||
---@field tetrahedronsList MapGen.Tetrahedron[]
|
||||
local Layer = {
|
||||
peaksList = {},
|
||||
cavernsByName = {},
|
||||
cavernsList = {},
|
||||
trianglesList = {},
|
||||
tetrahedronsList = {},
|
||||
}
|
||||
|
||||
103
mods/CORE/MapGen/src/MapGen/Layer/Cavern.lua
Normal file
103
mods/CORE/MapGen/src/MapGen/Layer/Cavern.lua
Normal file
@@ -0,0 +1,103 @@
|
||||
local mathMin, mathMax, mathAbs
|
||||
= math.min, math.max, math.abs
|
||||
|
||||
---@class MapGen.Layer.Cavern
|
||||
---@field name string
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field smoothDistance number
|
||||
---@field getNoise fun():ValueNoise
|
||||
---@field initNoise fun()
|
||||
---@field getGroups fun():table<string, number>
|
||||
local Cavern = {}
|
||||
|
||||
---@param name string
|
||||
---@param minY number
|
||||
---@param maxY number
|
||||
---@param smoothDistance number
|
||||
---@param noiseParams NoiseParams
|
||||
---@param groups? table<string, number>
|
||||
---@return MapGen.Layer.Cavern
|
||||
function Cavern:new(name, minY, maxY, smoothDistance, noiseParams, groups)
|
||||
assert(maxY > minY, 'maxY there should be more minY')
|
||||
assert(smoothDistance < mathAbs(maxY - minY)/2, 'The smoothing distance cannot be greater than half the distance between minY and maxY')
|
||||
|
||||
---@type NoiseParams
|
||||
local _noiseParams = noiseParams
|
||||
|
||||
---@diagnostic disable-next-line: missing-fields
|
||||
---@type ValueNoise
|
||||
local _noise = {}-- note: must be nil until luanti mapgen objects are loaded.
|
||||
|
||||
local _groups
|
||||
|
||||
if groups == nil then
|
||||
_groups = {}
|
||||
else
|
||||
_groups = groups
|
||||
end
|
||||
|
||||
---@type MapGen.Layer.Cavern
|
||||
local instance = setmetatable({
|
||||
name = name,
|
||||
minY = minY,
|
||||
maxY = maxY,
|
||||
smoothDistance = smoothDistance,
|
||||
}, {__index = self})
|
||||
|
||||
function instance:getNoise()
|
||||
return _noise
|
||||
end
|
||||
|
||||
function instance:initNoise()
|
||||
if not table.is_empty(_noise) then
|
||||
minetest.log('warning', 'Cavern noise has already been initialized. Re-initialization is not recommended.')
|
||||
end
|
||||
|
||||
_noise = core.get_value_noise(noiseParams)
|
||||
end
|
||||
|
||||
function instance:getGroups()
|
||||
return table.copy_with_metatables(_groups)
|
||||
end
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
---@param y number
|
||||
---@param minY number
|
||||
---@param maxY number
|
||||
---@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
|
||||
|
||||
return mathMax(0, mathMin(maxDist / smoothDistance, minDist / smoothDistance, 1))
|
||||
end
|
||||
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@param threshold number?
|
||||
---@return boolean
|
||||
function Cavern:isCavern(x, y, z, threshold)
|
||||
if threshold == nil then
|
||||
threshold = 0
|
||||
end
|
||||
|
||||
local noise = self:getNoise()
|
||||
local weight = calcCavernWeight(y, self.smoothDistance, self.minY, self.maxY)
|
||||
|
||||
if y == -15 then
|
||||
print('is', weight)
|
||||
end
|
||||
|
||||
return noise:get_3d({x = x, y = y, z = z}) * weight > threshold
|
||||
end
|
||||
|
||||
return Cavern
|
||||
@@ -9,7 +9,7 @@ local Peak = {
|
||||
id = 0,
|
||||
}
|
||||
|
||||
---@param multinoiseParams MapGen.Peak.MultinoiseParams
|
||||
---@param multinoiseParams MapGen.Peak.MultinoiseParams
|
||||
---@return MapGen.Peak.Multinoise
|
||||
local function multinoiseParamsToMultinoise(multinoiseParams)
|
||||
---@diagnostic disable-next-line: missing-fields
|
||||
@@ -23,10 +23,10 @@ local function multinoiseParamsToMultinoise(multinoiseParams)
|
||||
return multinoise
|
||||
end
|
||||
|
||||
---@param peakPos vector
|
||||
---@param multinoiseParams MapGen.Peak.MultinoiseParams
|
||||
---@param groups? table<string, number>
|
||||
---@return MapGen.Peak
|
||||
---@param peakPos vector
|
||||
---@param multinoiseParams MapGen.Peak.MultinoiseParams
|
||||
---@param groups? table<string, number>
|
||||
---@return MapGen.Peak
|
||||
function Peak:new(peakPos, multinoiseParams, groups)
|
||||
---@type vector
|
||||
local _peakPos = peakPos
|
||||
@@ -73,7 +73,7 @@ function Peak:new(peakPos, multinoiseParams, groups)
|
||||
_multinoise = multinoiseParamsToMultinoise(_multinoiseParams)
|
||||
end
|
||||
|
||||
function instance.getGroups()
|
||||
function instance:getGroups()
|
||||
return _groups
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user