MapGen: add ore generation and minor refactoring
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||
local require = modInfo.require
|
||||
|
||||
return require('MapGen')
|
||||
return require('MapGen')
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
local mathRound, mathRandom, mathClamp, tableInsert
|
||||
= math.round, math.random, math.clamp, table.insert
|
||||
local assert = assert
|
||||
local pairs, ipairs = pairs, ipairs
|
||||
|
||||
local corePosToString, coreGetUsTime = core.pos_to_string, core.get_us_time
|
||||
|
||||
local pairs, ipairs, assert = pairs, ipairs, assert
|
||||
local mathRound, mathRandom, mathClamp = math.round, math.random, math.clamp
|
||||
local tableInsert, tableSort = table.insert, table.sort
|
||||
|
||||
local v = vector.new
|
||||
local id = core.get_content_id
|
||||
local AIR_ID = core.CONTENT_AIR
|
||||
local corePosToString, coreGetUsTime = core.pos_to_string, core.get_us_time
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
@@ -18,16 +18,15 @@ local function mglog(text, ...)
|
||||
core.log((text):format(...))
|
||||
end
|
||||
|
||||
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||
local require = modInfo.require
|
||||
local require = Mod.getInfo('smc__core__map_gen').require
|
||||
|
||||
---Numeric values defining the surface height and climate for the node.
|
||||
---@alias MapGen.factors {height:number, temp:number, humidity:number}
|
||||
---@alias MapGen.Factors {height:number, temp:number, humidity:number}
|
||||
|
||||
---Table of all past generation factor calculations for nodes.
|
||||
---
|
||||
---Contains generation factors by layer name and coordinate.
|
||||
---@type table<string, table<string, MapGen.factors>>
|
||||
---@type table<string, table<string, MapGen.Factors>>
|
||||
local pastNoiseValues = {}
|
||||
|
||||
---The triangle in which generation occurred for the previous node.
|
||||
@@ -46,6 +45,8 @@ local Cavern = require('MapGen.Cavern')
|
||||
local Region = require('MapGen.Region')
|
||||
---@type MapGen.Tree
|
||||
local Tree = require('MapGen.Tree')
|
||||
---@type MapGen.Ore
|
||||
local Ore = require('MapGen.Ore')
|
||||
|
||||
---@class MapGen
|
||||
---@field layersByName table<string, MapGen.Layer>
|
||||
@@ -58,10 +59,11 @@ local Tree = require('MapGen.Tree')
|
||||
---
|
||||
---@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 isOresNoiseInitialized boolean Is the fractal noise of the ores 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<string, string>
|
||||
---@field nodeIDs table<string, number>
|
||||
---@field nodeIDs table<string, integer>
|
||||
local MapGen = {
|
||||
layersByName = {},
|
||||
layersList = {},
|
||||
@@ -70,6 +72,7 @@ local MapGen = {
|
||||
treesByName = {},
|
||||
isLayersNoisesInitialized = false,
|
||||
isCavernsNoiseInitialized = false,
|
||||
isOresNoiseInitialized = false,
|
||||
isRunning = false,
|
||||
}
|
||||
|
||||
@@ -109,7 +112,7 @@ function MapGen:getLayerByName(layerName)
|
||||
end
|
||||
|
||||
---Determines which layer a node belongs to based on its height coordinate.
|
||||
---@param y number
|
||||
---@param y integer
|
||||
---@return MapGen.Layer?
|
||||
function MapGen:getLayerByHeight(y)
|
||||
--- TODO: возможно здесь получится сделать более оптимизированный алгоритм
|
||||
@@ -126,7 +129,7 @@ function MapGen:getLayerByHeight(y)
|
||||
end
|
||||
|
||||
---Determines which statics layer a node belongs to based on its height coordinate.
|
||||
---@param y number
|
||||
---@param y integer
|
||||
---@return MapGen.StaticLayer?
|
||||
function MapGen:getStaticByHeight(y)
|
||||
--- TODO: возможно здесь получится сделать более оптимизированный алгоритм
|
||||
@@ -231,7 +234,7 @@ function MapGen:registerLayer(name, def)
|
||||
pastNoiseValues[name] = {}
|
||||
|
||||
-- Sort layers by maxY descending for processing priority.
|
||||
table.sort(self.layersList, function(a, b)
|
||||
tableSort(self.layersList, function(a, b)
|
||||
return a.maxY > b.maxY
|
||||
end)
|
||||
end
|
||||
@@ -266,7 +269,7 @@ function MapGen:registerStaticLayer(name, def)
|
||||
tableInsert(self.staticsList, static)
|
||||
|
||||
-- Sort srtatics by maxY descending for processing priority.
|
||||
table.sort(self.staticsList, function(a, b)
|
||||
tableSort(self.staticsList, function(a, b)
|
||||
return a.maxY > b.maxY
|
||||
end)
|
||||
end
|
||||
@@ -331,6 +334,17 @@ function MapGen:registerTree(name, def)
|
||||
self.treesByName[name] = tree
|
||||
end
|
||||
|
||||
---@param layerName string
|
||||
---@param name string
|
||||
---@param def MapGen.OreDef
|
||||
function MapGen:registerOre(layerName, name, def)
|
||||
local layer = self:getLayerByName(layerName)
|
||||
|
||||
local ore = Ore:new(name, def)
|
||||
|
||||
layer:addOre(name, ore)
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- --- HELPER METHODS ---
|
||||
@@ -406,7 +420,7 @@ end
|
||||
local function vertexKey(peak)
|
||||
local pos = peak.pos
|
||||
|
||||
return string.format("%.6f,%.6f", pos.x, pos.z)
|
||||
return ('%.6f,%.6f'):format(pos.x, pos.z)
|
||||
end
|
||||
|
||||
---Creates a canonical (sorted) key for an edge.
|
||||
@@ -576,13 +590,25 @@ function MapGen:initCavernsNoise()
|
||||
self.isCavernsNoiseInitialized = true
|
||||
end
|
||||
|
||||
---Initialize ores's noises. This should be called after the map object is loaded.
|
||||
function MapGen:initOresNoise()
|
||||
---@param layer MapGen.Layer
|
||||
for _, layer in ipairs(self.layersList) do
|
||||
for _, ore in pairs(layer.oresByName) do
|
||||
ore:initNoise()
|
||||
end
|
||||
end
|
||||
|
||||
self.isOresNoiseInitialized = true
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- --- GENERATION METHODS ---
|
||||
|
||||
---@alias MapGen.nodeType 'AIR'|'WATER'|'CAVERN_AIR'|'TURF'|'SOIL'|'ROCK'|'BOTTOM'
|
||||
---@alias MapGen.dataPostProcessingData {biome:MapGen.Biome, mapGenerator:MapGen, factors:MapGen.factors, index:number, x:number, y:number, z:number, nodeType:MapGen.nodeType}
|
||||
---@alias MapGen.vmPostProcessingData {biome:MapGen.Biome, mapGenerator:MapGen, factors:MapGen.factors, x:number, y:number, z:number, nodeType:MapGen.nodeType}
|
||||
---@alias MapGen.dataPostProcessingData {biome:MapGen.Biome, mapGenerator:MapGen, factors:MapGen.Factors, index:integer, x:integer, y:integer, z:integer, nodeType:MapGen.nodeType}
|
||||
---@alias MapGen.vmPostProcessingData {biome:MapGen.Biome, mapGenerator:MapGen, factors:MapGen.Factors, x:integer, y:integer, z:integer, nodeType:MapGen.nodeType}
|
||||
|
||||
|
||||
---@type table<number, MapGen.dataPostProcessingData>
|
||||
@@ -592,8 +618,8 @@ local vmPostProcessing = {}
|
||||
|
||||
---@param biome MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param index number
|
||||
---@param factors MapGen.Factors
|
||||
---@param index integer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
@@ -629,15 +655,14 @@ end
|
||||
---and which biome will be generated at the specified coordinates.
|
||||
---@param mapGenerator MapGen
|
||||
---@param layer MapGen.Layer
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param factors MapGen.Factors
|
||||
---@param data integer[]
|
||||
---@param data2 integer[]
|
||||
---@param index integer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
local function generateNode(mapGenerator, layer, factors, data, data2, index, x, y, z)
|
||||
|
||||
local ids = mapGenerator.nodeIDs
|
||||
local waterLevel = layer.waterLevel
|
||||
local height, temp, humidity = factors.height, factors.temp, factors.humidity
|
||||
@@ -645,9 +670,8 @@ local function generateNode(mapGenerator, layer, factors, data, data2, index, x,
|
||||
-- Creating a rougher biome boundary.
|
||||
local scatteringGorizontal = layer.biomesGorizontalScattering or 0
|
||||
local scatteringVertical = layer.biomesVerticalScattering or 0
|
||||
local scattTemp = factors.temp
|
||||
local scattTemp = temp
|
||||
local scattHumidity = humidity
|
||||
---@type number
|
||||
local scattHeight = y
|
||||
|
||||
if scatteringGorizontal ~= 0 then
|
||||
@@ -726,6 +750,14 @@ local function generateNode(mapGenerator, layer, factors, data, data2, index, x,
|
||||
Logger.warningLog('If you see this error, it means that the map generator does'..
|
||||
'not handle all cases of generation on coordinates: %s, %s, %s.', x, y, z)
|
||||
end
|
||||
|
||||
-- Ore generation
|
||||
-- Biome ores are generated first.
|
||||
-- If no ores are generated, the ores registered in the layer are generated.
|
||||
-- This means that biome ores have priority over layer ores.
|
||||
if not biome:generateOre(factors, data, data2, index, x, y, z) then
|
||||
layer:generateOre(factors, data, data2, index, x, y, z)
|
||||
end
|
||||
end
|
||||
|
||||
---Calculates a weight for a coordinate using the projection onto
|
||||
@@ -870,9 +902,9 @@ end
|
||||
---Generator handler for specific coordinates.
|
||||
---@param mapGenerator MapGen
|
||||
---@param layer MapGen.Layer?
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param data integer[]
|
||||
---@param data2 integer[]
|
||||
---@param index integer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
@@ -907,7 +939,7 @@ local function generatorHandler(mapGenerator, layer, data, data2, index, x, y, z
|
||||
temp = layer:calcTemp(temp, y)
|
||||
humidity = layer:calcHumidity(humidity, y)
|
||||
|
||||
---@type MapGen.factors
|
||||
---@type MapGen.Factors
|
||||
local factors = {
|
||||
height = height,
|
||||
temp = temp,
|
||||
@@ -944,6 +976,10 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
|
||||
self:initCavernsNoise()
|
||||
end
|
||||
|
||||
if not self.isOresNoiseInitialized then
|
||||
self:initOresNoise()
|
||||
end
|
||||
|
||||
local data, data2 = voxelManip:get_data(), voxelManip:get_param2_data()
|
||||
-- local param2_data = voxelManip:get_param2_data()
|
||||
local area = VoxelArea:new({MinEdge = eMin, MaxEdge = eMax})
|
||||
|
||||
@@ -1,147 +1,105 @@
|
||||
local assert = assert
|
||||
local pairs, ipairs = pairs, ipairs
|
||||
|
||||
local tableInsert = table.insert
|
||||
|
||||
local id = core.get_content_id
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@alias MapGen.Biome.generateFunc fun(self, mapGenerator:MapGen, factors:MapGen.Factors, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer)
|
||||
---@alias MapGen.Biome.dataPostProcessingFunc fun(self, mapGenerator:MapGen, factors:MapGen.Factors, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer, nodeType:MapGen.nodeType, area:VoxelArea)
|
||||
---@alias MapGen.Biome.vmPostProcessingFunc fun(self, mapGenerator:MapGen, factors:MapGen.Factors, voxelManip:VoxelManip, x:integer, y:integer, z:integer, nodeType:MapGen.nodeType, area:VoxelArea)
|
||||
|
||||
---@class MapGen.Biome
|
||||
---@field name string
|
||||
---@field tempPoint number
|
||||
---@field humidityPoint number
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field tempPoint integer
|
||||
---@field humidityPoint integer
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---@field groundNodes MapGen.Biome.GroundNodes
|
||||
---@field groundNodesIDs MapGen.Biome.GroundNodesIDs
|
||||
---@field soilHeight number
|
||||
---@field soilHeight integer
|
||||
---
|
||||
---@field generateAir generateFunc
|
||||
---@field generateCavernAir generateFunc
|
||||
---@field generateWater generateFunc
|
||||
---@field generateRock generateFunc
|
||||
---@field generateTurf generateFunc
|
||||
---@field generateSoil generateFunc
|
||||
---@field generateBottom generateFunc
|
||||
---@field generateAir MapGen.Biome.generateFunc
|
||||
---@field generateCavernAir MapGen.Biome.generateFunc
|
||||
---@field generateWater MapGen.Biome.generateFunc
|
||||
---@field generateRock MapGen.Biome.generateFunc
|
||||
---@field generateTurf MapGen.Biome.generateFunc
|
||||
---@field generateSoil MapGen.Biome.generateFunc
|
||||
---@field generateBottom MapGen.Biome.generateFunc
|
||||
---
|
||||
---@field dataPostProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, data:number[], data2:number[], index:number, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)?
|
||||
---@field vmPostProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, voxelManip:VoxelManip, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)?
|
||||
local Biome = {}
|
||||
|
||||
---@alias generateFunc fun(self, mapGenerator:MapGen, factors:MapGen.factors, data:number[], data2:number[], index:number, x:number, y:number, z:number)
|
||||
---@field dataPostProcessing MapGen.Biome.dataPostProcessingFunc?
|
||||
---@field vmPostProcessing MapGen.Biome.vmPostProcessingFunc?
|
||||
---
|
||||
---@field oresByName table<string, MapGen.Ore>
|
||||
---@field oresByWhereinName table<string, MapGen.Ore[]>
|
||||
---@field oresByWhereinID table<integer, MapGen.Ore[]>
|
||||
local Biome = {
|
||||
oresByName = {},
|
||||
oresByWhereinName = {},
|
||||
oresByWhereinID = {},
|
||||
}
|
||||
|
||||
---Definition table for the `MapGen.Biome`.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.BiomeDef
|
||||
---@field tempPoint number
|
||||
---@field humidityPoint number
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field tempPoint integer
|
||||
---@field humidityPoint integer
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---@field groundNodes MapGen.Biome.GroundNodes
|
||||
---@field soilHeight number
|
||||
---@field soilHeight integer
|
||||
---
|
||||
---@field generateAir generateFunc?
|
||||
---@field generateCavernAir generateFunc?
|
||||
---@field generateWater generateFunc?
|
||||
---@field generateRock generateFunc?
|
||||
---@field generateTurf generateFunc?
|
||||
---@field generateSoil generateFunc?
|
||||
---@field generateBottom generateFunc?
|
||||
---@field generateAir MapGen.Biome.generateFunc?
|
||||
---@field generateCavernAir MapGen.Biome.generateFunc?
|
||||
---@field generateWater MapGen.Biome.generateFunc?
|
||||
---@field generateRock MapGen.Biome.generateFunc?
|
||||
---@field generateTurf MapGen.Biome.generateFunc?
|
||||
---@field generateSoil MapGen.Biome.generateFunc?
|
||||
---@field generateBottom MapGen.Biome.generateFunc?
|
||||
---
|
||||
---@field dataPostProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, data:number[], data2:number[], index:number, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)?
|
||||
---@field vmPostProcessing fun(self, mapGenerator:MapGen, factors:MapGen.factors, voxelManip:VoxelManip, x:number, y:number, z:number, nodeType:MapGen.nodeType, area:VoxelArea)?
|
||||
---@field dataPostProcessing MapGen.Biome.dataPostProcessingFunc?
|
||||
---@field vmPostProcessing MapGen.Biome.vmPostProcessingFunc?
|
||||
|
||||
-- Default generate functions
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@type MapGen.Biome.generateFunc
|
||||
local defaultGenerateAir = function(self, mapGenerator, factors, data, data2, index, x, y, z)
|
||||
data[index] = mapGenerator.nodeIDs.air
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@type MapGen.Biome.generateFunc
|
||||
local defaultGenerateCavernAir = function(self, mapGenerator, factors, data, data2, index, x, y, z)
|
||||
self:generateAir(mapGenerator, factors, data, data2, index, x, y, z)
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@type MapGen.Biome.generateFunc
|
||||
local defaultGenerateWater = function(self, mapGenerator, factors, data, data2, index, x, y, z)
|
||||
data[index] = mapGenerator.nodeIDs.water
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@type MapGen.Biome.generateFunc
|
||||
local defaultGenerateRock = function(self, mapGenerator, factors, data, data2, index, x, y, z)
|
||||
data[index] = self.groundNodesIDs.rock
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@type MapGen.Biome.generateFunc
|
||||
local defaultGenerateTurf = function(self, mapGenerator, factors, data, data2, index, x, y, z)
|
||||
data[index] = self.groundNodesIDs.turf
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@type MapGen.Biome.generateFunc
|
||||
local defaultGenerateSoil = function(self, mapGenerator, factors, data, data2, index, x, y, z)
|
||||
data[index] = self.groundNodesIDs.soil
|
||||
end
|
||||
|
||||
---@param self MapGen.Biome
|
||||
---@param mapGenerator MapGen
|
||||
---@param factors MapGen.factors
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@type MapGen.Biome.generateFunc
|
||||
local defaultGenerateBottom = function(self, mapGenerator, factors, data, data2, index, x, y, z)
|
||||
data[index] = self.groundNodesIDs.bottom
|
||||
end
|
||||
|
||||
|
||||
---@param name string
|
||||
---@param def MapGen.BiomeDef
|
||||
---@return MapGen.Biome
|
||||
@@ -189,27 +147,79 @@ function Biome:new(name, def)
|
||||
|
||||
---@type MapGen.Biome
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = name
|
||||
instance.tempPoint = def.tempPoint
|
||||
instance.humidityPoint = def.humidityPoint
|
||||
instance.minY = def.minY
|
||||
instance.maxY = def.maxY
|
||||
instance.groundNodes = def.groundNodes
|
||||
instance.groundNodesIDs = groundNodesIDs
|
||||
instance.soilHeight = def.soilHeight
|
||||
instance.name = name
|
||||
instance.tempPoint = def.tempPoint
|
||||
instance.humidityPoint = def.humidityPoint
|
||||
instance.minY = def.minY
|
||||
instance.maxY = def.maxY
|
||||
instance.groundNodes = def.groundNodes
|
||||
instance.groundNodesIDs = groundNodesIDs
|
||||
instance.soilHeight = def.soilHeight
|
||||
|
||||
instance.generateAir = def.generateAir
|
||||
instance.generateCavernAir = def.generateCavernAir
|
||||
instance.generateWater = def.generateWater
|
||||
instance.generateRock = def.generateRock
|
||||
instance.generateSoil = def.generateSoil
|
||||
instance.generateTurf = def.generateTurf
|
||||
instance.generateBottom = def.generateBottom
|
||||
instance.generateAir = def.generateAir
|
||||
instance.generateCavernAir = def.generateCavernAir
|
||||
instance.generateWater = def.generateWater
|
||||
instance.generateRock = def.generateRock
|
||||
instance.generateSoil = def.generateSoil
|
||||
instance.generateTurf = def.generateTurf
|
||||
instance.generateBottom = def.generateBottom
|
||||
|
||||
instance.dataPostProcessing = def.dataPostProcessing
|
||||
instance.vmPostProcessing = def.vmPostProcessing
|
||||
instance.dataPostProcessing = def.dataPostProcessing
|
||||
instance.vmPostProcessing = def.vmPostProcessing
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
---@param oreName string
|
||||
---@param ore MapGen.Ore
|
||||
function Biome:addOre(oreName, ore)
|
||||
assert(self.oresByName[oreName] == nil, ('A ore named `%s` is already registered.'):format(oreName))
|
||||
|
||||
self.oresByName[oreName] = ore
|
||||
|
||||
for _, nodeName in ipairs(ore.wherein) do
|
||||
tableInsert(self.oresByWhereinName[nodeName], ore)
|
||||
tableInsert(self.oresByWhereinID[id(nodeName)], ore)
|
||||
end
|
||||
end
|
||||
|
||||
---@param nodeName string
|
||||
---@return MapGen.Ore[]?
|
||||
function Biome:getOresByWhereinName(nodeName)
|
||||
local ores = self.oresByWhereinName[nodeName]
|
||||
|
||||
return ores
|
||||
end
|
||||
|
||||
---@param nodeID integer
|
||||
---@return MapGen.Ore[]?
|
||||
function Biome:getOresByWhereinID(nodeID)
|
||||
local ores = self.oresByWhereinID[nodeID]
|
||||
|
||||
return ores
|
||||
end
|
||||
|
||||
---@param factors MapGen.Factors
|
||||
---@param data integer[]
|
||||
---@param data2 integer[]
|
||||
---@param index integer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
---@return boolean
|
||||
function Biome:generateOre(factors, data, data2, index, x, y, z)
|
||||
local ores = self:getOresByWhereinID(data[index])
|
||||
if ores == nil then
|
||||
return false
|
||||
end
|
||||
|
||||
for _, ore in ipairs(ores) do
|
||||
if ore:generate(factors, data, data2, index, x, y, z) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
return Biome
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
--- Only for EmmyLua
|
||||
---@meta
|
||||
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.Biome.GroundNodes
|
||||
@@ -6,6 +6,3 @@
|
||||
---@field soil string The soil beneath the turf. The height of this layer depends on `Biome.soilHeight`
|
||||
---@field rock string The rock found beneath the soil of a biome.
|
||||
---@field bottom string Covering the bottom of reservoirs.
|
||||
local GroundNodes = {}
|
||||
|
||||
return GroundNodes
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
--- Only for EmmyLua
|
||||
---@meta
|
||||
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.Biome.GroundNodesIDs
|
||||
---@field turf number The soil covering the surface of the biome
|
||||
---@field soil number The soil beneath the turf. The height of this layer depends on `Biome.soilHeight`
|
||||
---@field rock number The rock found beneath the soil of a biome.
|
||||
---@field bottom number Covering the bottom of reservoirs.
|
||||
local GroundNodes = {}
|
||||
|
||||
return GroundNodes
|
||||
---@field turf integer The soil covering the surface of the biome
|
||||
---@field soil integer The soil beneath the turf. The height of this layer depends on `Biome.soilHeight`
|
||||
---@field rock integer The rock found beneath the soil of a biome.
|
||||
---@field bottom integer Covering the bottom of reservoirs.
|
||||
|
||||
@@ -1,44 +1,44 @@
|
||||
local assert = assert
|
||||
local pairs = pairs
|
||||
|
||||
local mathMin, mathAbs, mathClamp
|
||||
= math.min, math.abs, math.clamp
|
||||
local mathMin, mathAbs, mathClamp = math.min, math.abs, math.clamp
|
||||
|
||||
local coreGetValueNoise = core.get_value_noise
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@alias MapGen.Cavern.Type 'cheesed'|'warped'
|
||||
---@alias MapGen.Cavern.Type 'cheesed'|'warped'
|
||||
|
||||
---@alias MapGen.Cavern.NoiseParams {baseNoise:NoiseParams, xNoise?:NoiseParams, yNoise?:NoiseParams, zNoise?:NoiseParams}
|
||||
---@alias MapGen.Cavern.ValueNoise {baseNoise:ValueNoise, xNoise?:ValueNoise, yNoise?:ValueNoise, zNoise?:ValueNoise}
|
||||
|
||||
---@class MapGen.Cavern
|
||||
---@field name string
|
||||
---@field isRegional boolean?
|
||||
---@field type MapGen.Cavern.Type
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---@field smoothDistance number
|
||||
---@field threshold number
|
||||
---
|
||||
---@field step integer?
|
||||
---@field warpStrength number
|
||||
---
|
||||
---@field getNoise fun(self:MapGen.Cavern):MapGen.Cavern.ValueNoise
|
||||
---@field initNoise fun(self:MapGen.Cavern)
|
||||
local Cavern = {}
|
||||
|
||||
---@alias MapGen.Cavern.NoiseParams {baseNoise:NoiseParams, xNoise?:NoiseParams, yNoise?:NoiseParams, zNoise?:NoiseParams}
|
||||
---@alias MapGen.Cavern.ValueNoise {baseNoise:ValueNoise, xNoise?:ValueNoise, yNoise?:ValueNoise, zNoise?:ValueNoise}
|
||||
|
||||
---Definition table for the `MapGen.Cavern`.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.CavernDef
|
||||
---@field isRegional boolean?
|
||||
---@field type MapGen.Cavern.Type
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---@field noiseParams MapGen.Cavern.NoiseParams
|
||||
---@field smoothDistance number
|
||||
---@field threshold number?
|
||||
---
|
||||
---@field step integer?
|
||||
---@field warpStrength number
|
||||
|
||||
---@param name string
|
||||
@@ -50,18 +50,14 @@ function Cavern:new(name, def)
|
||||
|
||||
if def.type == 'warped' then
|
||||
local noises = def.noiseParams
|
||||
assert(def.step ~= nil, 'The cavern cannot be `warped` but has no `step`')
|
||||
assert(def.warpStrength ~= nil, 'The cavern cannot be `warped` but has no `warpStrength`')
|
||||
assert(noises.xNoise ~= nil, 'The cavern cannot be `warped` but has no `xNoise`')
|
||||
assert(noises.yNoise ~= nil, 'The cavern cannot be `warped` but has no `yNoise`')
|
||||
assert(noises.zNoise ~= nil, 'The cavern cannot be `warped` but has no `zNoise`')
|
||||
end
|
||||
|
||||
---@type MapGen.Cavern.NoiseParams
|
||||
local _noiseParams = def.noiseParams
|
||||
|
||||
---@type MapGen.Cavern.ValueNoise
|
||||
local _noise = {} -- note: must be nil until luanti mapgen objects are loaded.
|
||||
local _noise = {}
|
||||
|
||||
---@type MapGen.Cavern
|
||||
local instance = getInstance(self, {})
|
||||
@@ -72,7 +68,6 @@ function Cavern:new(name, def)
|
||||
instance.maxY = def.maxY
|
||||
instance.smoothDistance = def.smoothDistance
|
||||
instance.threshold = def.threshold or 0.1
|
||||
instance.step = def.step
|
||||
instance.warpStrength = def.warpStrength
|
||||
|
||||
function instance:getNoise()
|
||||
@@ -81,7 +76,7 @@ function Cavern:new(name, def)
|
||||
|
||||
function instance:initNoise()
|
||||
for noiseName, noiseParams in pairs(_noiseParams) do
|
||||
_noise[noiseName] = core.get_value_noise(_noiseParams[noiseName])
|
||||
_noise[noiseName] = coreGetValueNoise(noiseParams)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -102,7 +97,7 @@ end
|
||||
function Cavern:isCheesedCavern(x, y, z, weight)
|
||||
local noises = self:getNoise()
|
||||
|
||||
return noises.baseNoise:get_3d({x = x, y = y, z = z}) * weight > self.threshold
|
||||
return noises.baseNoise:get_3d({x = x, y = y, z = z}) * weight >= self.threshold
|
||||
end
|
||||
|
||||
---@param x integer
|
||||
@@ -125,7 +120,7 @@ function Cavern:isWarpedCavern(x, y, z, weight)
|
||||
|
||||
local value = noises.baseNoise:get_3d({x = warpedX, y = warpedY, z = warpedZ})
|
||||
|
||||
return value * weight > self.threshold
|
||||
return value * weight >= self.threshold
|
||||
end
|
||||
|
||||
---Returns `true` if there is a cavern at the specified coordinates.
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
local tostring = tostring
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@class MapGen.Edge
|
||||
---@field p1 MapGen.Peak
|
||||
---@field p2 MapGen.Peak
|
||||
---@field vec vector
|
||||
---@field p1 MapGen.Peak
|
||||
---@field p2 MapGen.Peak
|
||||
---@field vec vector
|
||||
local Edge = {}
|
||||
|
||||
---@param p1 MapGen.Peak
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||
local require = modInfo.require
|
||||
local extend = Class.extend
|
||||
|
||||
local require = Mod.getInfo('smc__core__map_gen').require
|
||||
|
||||
---@type MapGen.Peak
|
||||
local Peak = require('MapGen.Peak')
|
||||
@@ -10,7 +11,7 @@ local Peak = require('MapGen.Peak')
|
||||
---@class MapGen.FakePeak : MapGen.Peak
|
||||
---@field id number
|
||||
---@field getPeakPos fun():vector
|
||||
local FakePeak = Class.extend(Peak, {})
|
||||
local FakePeak = extend(Peak, {})
|
||||
|
||||
---Returns a fake `MapGen.Peak` that has no noise parameters.
|
||||
---Note that the initialized peak should not be used in generation.
|
||||
|
||||
@@ -1,7 +1,15 @@
|
||||
local assert, dump, type = assert, dump, type
|
||||
local pairs, ipairs = pairs, ipairs
|
||||
|
||||
local mathHuge = math.huge
|
||||
local tableInsert, tableSort = table.insert, table.sort
|
||||
|
||||
local id = core.get_content_id
|
||||
local corePosToString, coreGetValueNoise = core.pos_to_string, core.get_value_noise
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||
local require = modInfo.require
|
||||
local require = Mod.getInfo('smc__core__map_gen').require
|
||||
|
||||
---@type MapGen.Peak
|
||||
local Peak = require('MapGen.Peak')
|
||||
@@ -9,32 +17,44 @@ local Peak = require('MapGen.Peak')
|
||||
local Triangle = require('MapGen.Triangle')
|
||||
|
||||
---@class MapGen.Layer
|
||||
---@field name string
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---@field minTemp integer
|
||||
---@field maxTemp integer
|
||||
---@field minHumidity integer
|
||||
---@field maxHumidity integer
|
||||
---@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 MapGen.Peak[]
|
||||
---@field peaksByPos table<string, MapGen.Peak>
|
||||
---@field noisesByColor table<MapGen.Layer.Category, table<ColorString, ValueNoise>>
|
||||
---@field noisesParamsByColor table<MapGen.Layer.Category, table<ColorString, NoiseParams>>
|
||||
---@field name string
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---@field minTemp integer
|
||||
---@field maxTemp integer
|
||||
---@field minHumidity integer
|
||||
---@field maxHumidity integer
|
||||
---@field waterLevel integer
|
||||
---
|
||||
---@field calcTemp fun(self:MapGen.Layer, value:number, height:integer):number
|
||||
---@field calcHumidity fun(self:MapGen.Layer, value:number, height:integer):number
|
||||
---
|
||||
---@field peaksList MapGen.Peak[]
|
||||
---@field peaksByPos table<string, MapGen.Peak>
|
||||
---
|
||||
---@field noisesParamsByColor table<MapGen.Layer.Category, table<ColorString, NoiseParams>>
|
||||
---@field noisesByColor table<MapGen.Layer.Category, table<ColorString, ValueNoise>>
|
||||
---
|
||||
---@field biomesGorizontalScattering integer
|
||||
---@field biomesVerticalScattering integer
|
||||
---@field biomesByName table<string, MapGen.Biome>
|
||||
---@field biomesList MapGen.Biome[]
|
||||
---@field biomesDiagram table
|
||||
---@field biomesGorizontalScattering integer
|
||||
---@field biomesVerticalScattering integer
|
||||
---@field cavernsByName table<string, MapGen.Cavern>
|
||||
---@field cavernsList MapGen.Cavern[]
|
||||
---@field regionsByName table<string, MapGen.Region>
|
||||
---@field trianglesList MapGen.Triangle[]
|
||||
---
|
||||
---@field cavernsByName table<string, MapGen.Cavern>
|
||||
---@field cavernsList MapGen.Cavern[]
|
||||
---
|
||||
---@field regionsByName table<string, MapGen.Region>
|
||||
---
|
||||
---@field oresByName table<string, MapGen.Ore>
|
||||
---@field oresByWhereinName table<string, MapGen.Ore[]>
|
||||
---@field oresByWhereinID table<integer, MapGen.Ore[]>
|
||||
---
|
||||
---@field trianglesList MapGen.Triangle[]
|
||||
local Layer = {
|
||||
peaksList = {},
|
||||
peaksByPos = {},
|
||||
peaksList = {},
|
||||
peaksByPos = {},
|
||||
|
||||
noisesByColor = {
|
||||
landscape = {},
|
||||
temp = {},
|
||||
@@ -45,14 +65,21 @@ local Layer = {
|
||||
temp = {},
|
||||
humidity = {},
|
||||
},
|
||||
biomesByName = {},
|
||||
biomesList = {},
|
||||
biomesDiagram = {},
|
||||
cavernsByName = {},
|
||||
cavernsList = {},
|
||||
regionsByName = {},
|
||||
trianglesList = {},
|
||||
tetrahedronsList = {},
|
||||
|
||||
biomesByName = {},
|
||||
biomesList = {},
|
||||
biomesDiagram = {},
|
||||
|
||||
cavernsByName = {},
|
||||
cavernsList = {},
|
||||
|
||||
regionsByName = {},
|
||||
|
||||
oresByName = {},
|
||||
oresByWhereinName = {},
|
||||
oresByWhereinID = {},
|
||||
|
||||
trianglesList = {},
|
||||
}
|
||||
|
||||
---Definition table for the `MapGen.Layer`.
|
||||
@@ -66,8 +93,8 @@ local Layer = {
|
||||
---@field minHumidity integer
|
||||
---@field maxHumidity integer
|
||||
---@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 calcTemp (fun(self:MapGen.Layer, value:number, height:integer):number)?
|
||||
---@field calcHumidity (fun(self:MapGen.Layer, value:number, height:integer):number)?
|
||||
---@field biomesGorizontalScattering integer?
|
||||
---@field biomesVerticalScattering integer?
|
||||
---@field triangulationLandscapeFile string
|
||||
@@ -79,79 +106,12 @@ local Layer = {
|
||||
|
||||
---@param self MapGen.Layer
|
||||
---@param value number
|
||||
---@param height number
|
||||
---@param height integer
|
||||
---@return number
|
||||
local function defaultCalcFunc(self, value, height)
|
||||
return value
|
||||
end
|
||||
|
||||
---Checks `def` for compliance with `MapGen.PeakDef` and creates a new peak
|
||||
---if a peak with such coordinates has not yet been registered or returns an existing one.
|
||||
---
|
||||
---**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 scale integer
|
||||
---@return MapGen.Peak
|
||||
function Layer:registerPeak(def, scale)
|
||||
assert(def.pos ~= nil)
|
||||
assert(def.pos.x ~= nil)
|
||||
assert(def.pos.z ~= nil)
|
||||
assert(def.color ~= nil)
|
||||
assert(type(def.color) == 'string')
|
||||
|
||||
def.pos.x = def.pos.x * scale
|
||||
def.pos.z = def.pos.z * scale
|
||||
def.pos.y = 0
|
||||
|
||||
local positionStr = core.pos_to_string(def.pos)
|
||||
|
||||
local peak = self.peaksByPos[positionStr]
|
||||
|
||||
if peak == nil then
|
||||
peak = Peak:new(def)
|
||||
self.peaksByPos[positionStr] = peak
|
||||
elseif peak.color ~= def.color then
|
||||
error('There cannot be two peaks with the same coordinates but different colors.')
|
||||
end
|
||||
|
||||
return peak
|
||||
end
|
||||
|
||||
function Layer:initTrianglesNeighbours()
|
||||
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
|
||||
|
||||
---@param fileName string
|
||||
---@param category MapGen.Layer.Category
|
||||
---@param scale integer
|
||||
function Layer:getTriaglesFromFile(fileName, category, scale)
|
||||
local file = io.open(core.get_modpath(core.get_current_modname())..'/maps/'..fileName, 'r')
|
||||
assert(file ~= nil)
|
||||
|
||||
local json = core.parse_json(file:read('*a')) or {}
|
||||
file:close()
|
||||
|
||||
local triangles = json.triangles
|
||||
assert(triangles ~= nil)
|
||||
|
||||
for _, tr in ipairs(triangles) do
|
||||
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)
|
||||
|
||||
self:addTriangle(category, triangle)
|
||||
end
|
||||
end
|
||||
|
||||
---@param name string
|
||||
---@param def MapGen.LayerDef
|
||||
---@return MapGen.Layer
|
||||
@@ -185,10 +145,12 @@ function Layer:new(name, def)
|
||||
def.triangulationLandscapeFile,
|
||||
'landscape',
|
||||
def.landscapeMapScale)
|
||||
|
||||
instance:getTriaglesFromFile(
|
||||
def.triangulationTempFile,
|
||||
'temp',
|
||||
def.tempMapScale)
|
||||
|
||||
instance:getTriaglesFromFile(
|
||||
def.triangulationHumidityFile,
|
||||
'humidity',
|
||||
@@ -199,8 +161,76 @@ function Layer:new(name, def)
|
||||
return instance
|
||||
end
|
||||
|
||||
|
||||
---Checks `def` for compliance with `MapGen.PeakDef` and creates a new peak
|
||||
---if a peak with such coordinates has not yet been registered or returns an existing one.
|
||||
---
|
||||
---**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 scale integer
|
||||
---@return MapGen.Peak
|
||||
function Layer:registerPeak(def, scale)
|
||||
assert(def.pos ~= nil)
|
||||
assert(def.pos.x ~= nil)
|
||||
assert(def.pos.z ~= nil)
|
||||
assert(def.color ~= nil)
|
||||
assert(type(def.color) == 'string')
|
||||
|
||||
def.pos.x = def.pos.x * scale
|
||||
def.pos.z = def.pos.z * scale
|
||||
def.pos.y = 0
|
||||
|
||||
local positionStr = corePosToString(def.pos)
|
||||
|
||||
local peak = self.peaksByPos[positionStr]
|
||||
|
||||
if peak == nil then
|
||||
peak = Peak:new(def)
|
||||
self.peaksByPos[positionStr] = peak
|
||||
elseif peak.color ~= def.color then
|
||||
error('There cannot be two peaks with the same coordinates but different colors.')
|
||||
end
|
||||
|
||||
return peak
|
||||
end
|
||||
|
||||
function Layer:initTrianglesNeighbours()
|
||||
local triangles = self.trianglesList
|
||||
|
||||
for _, triangle in pairs(triangles) do
|
||||
for _, id in ipairs(triangle.neighboursIDs) do
|
||||
tableInsert(triangle.neighbours, triangles[id])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
---@param fileName string
|
||||
---@param category MapGen.Layer.Category
|
||||
---@param scale integer
|
||||
function Layer:getTriaglesFromFile(fileName, category, scale)
|
||||
local file = io.open(core.get_modpath(core.get_current_modname())..'/maps/'..fileName, 'r')
|
||||
assert(file ~= nil)
|
||||
|
||||
local json = core.parse_json(file:read('*a')) or {}
|
||||
file:close()
|
||||
|
||||
local triangles = json.triangles
|
||||
assert(triangles ~= nil)
|
||||
|
||||
for _, tr in ipairs(triangles) do
|
||||
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)
|
||||
|
||||
self:addTriangle(category, triangle)
|
||||
end
|
||||
end
|
||||
|
||||
---A category of noise that affects specific map generation objects.
|
||||
---@alias MapGen.Layer.Category 'landscape'|'temp'|'humidity'
|
||||
---@alias MapGen.Layer.Category 'landscape'|'temp'|'humidity'
|
||||
|
||||
---Adds a triangle to the `Layer.trianglesList`
|
||||
---@param category MapGen.Layer.Category
|
||||
@@ -218,14 +248,14 @@ end
|
||||
---@param category MapGen.Layer.Category
|
||||
---@param peak MapGen.Peak
|
||||
function Layer:addPeak(category, peak)
|
||||
table.insert(self.peaksList, peak)
|
||||
tableInsert(self.peaksList, peak)
|
||||
end
|
||||
|
||||
---Returns the `MapGen.Peak` at the coordinates. If there is no peak at these coordinates, it returns `nil`.
|
||||
---@param pos Position Coordinate of the desired peak.
|
||||
---@return MapGen.Peak?
|
||||
---@param pos Position Coordinate of the desired peak.
|
||||
---@return MapGen.Peak?
|
||||
function Layer:getPeakByPos(pos)
|
||||
local positionStr = core.pos_to_string(pos)
|
||||
local positionStr = corePosToString(pos)
|
||||
|
||||
local peak = self.peaksByPos[positionStr]
|
||||
|
||||
@@ -287,7 +317,7 @@ function Layer:addBiome(biomeName, biome)
|
||||
biomeName, self.name))
|
||||
|
||||
self.biomesByName[biomeName] = biome
|
||||
table.insert(self.biomesList, biome)
|
||||
tableInsert(self.biomesList, biome)
|
||||
end
|
||||
|
||||
---Returns a biome by name, if there is no such biome, it will raise an error.
|
||||
@@ -310,7 +340,7 @@ function Layer:addCavern(cavernName, cavern)
|
||||
cavernName, self.name))
|
||||
|
||||
self.cavernsByName[cavernName] = cavern
|
||||
table.insert(self.cavernsList, cavern)
|
||||
tableInsert(self.cavernsList, cavern)
|
||||
end
|
||||
|
||||
---Returns a cavern by name, if there is no such cavern, it will raise an error.
|
||||
@@ -344,6 +374,85 @@ function Layer:getRegionByName(regionName)
|
||||
return region
|
||||
end
|
||||
|
||||
---@param oreName string
|
||||
---@param ore MapGen.Ore
|
||||
function Layer:addOre(oreName, ore)
|
||||
assert(self.oresByName[oreName] == nil, ('A ore named `%s` is already registered.'):format(oreName))
|
||||
|
||||
self.oresByName[oreName] = ore
|
||||
|
||||
for _, nodeName in ipairs(ore.wherein) do
|
||||
if self.oresByWhereinName[nodeName] == nil then
|
||||
self.oresByWhereinName[nodeName] = { ore }
|
||||
else
|
||||
tableInsert(self.oresByWhereinName[nodeName], ore)
|
||||
end
|
||||
|
||||
local nodeID = id(nodeName)
|
||||
if self.oresByWhereinID[nodeID] == nil then
|
||||
self.oresByWhereinID[nodeID] = { ore }
|
||||
else
|
||||
tableInsert(self.oresByWhereinID[nodeID], ore)
|
||||
end
|
||||
end
|
||||
|
||||
if ore.biomes ~= nil then
|
||||
for _, biomeName in ipairs(ore.biomes) do
|
||||
local biome = self:getBiomeByName(biomeName)
|
||||
|
||||
biome:addOre(oreName, ore)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
---@param oreName string
|
||||
---@return MapGen.Ore
|
||||
function Layer:getOreByName(oreName)
|
||||
local ore = self.oresByName[oreName]
|
||||
assert(ore ~= nil, ('Ore named `%s` does not exist in the `%s` layer.'):format(
|
||||
oreName, self.name))
|
||||
|
||||
return ore
|
||||
end
|
||||
|
||||
---@param nodeName string
|
||||
---@return MapGen.Ore[]?
|
||||
function Layer:getOresByWhereinName(nodeName)
|
||||
local ores = self.oresByWhereinName[nodeName]
|
||||
|
||||
return ores
|
||||
end
|
||||
|
||||
---@param nodeID integer
|
||||
---@return MapGen.Ore[]?
|
||||
function Layer:getOresByWhereinID(nodeID)
|
||||
local ores = self.oresByWhereinID[nodeID]
|
||||
|
||||
return ores
|
||||
end
|
||||
|
||||
---@param factors MapGen.Factors
|
||||
---@param data integer[]
|
||||
---@param data2 integer[]
|
||||
---@param index integer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
---@return boolean
|
||||
function Layer:generateOre(factors, data, data2, index, x, y, z)
|
||||
local ores = self:getOresByWhereinID(data[index])
|
||||
if ores == nil then
|
||||
return false
|
||||
end
|
||||
|
||||
for _, ore in ipairs(ores) do
|
||||
if ore:generate(factors, data, data2, index, x, y, z) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
---@param height number
|
||||
---@param biomesList MapGen.Biome[]
|
||||
@@ -354,12 +463,12 @@ local function getBiomesNamesByHeight(height, biomesList)
|
||||
|
||||
for _, biome in ipairs(biomesList) do
|
||||
if height >= biome.minY and height <= biome.maxY then
|
||||
table.insert(biomesNames, biome.name)
|
||||
table.insert(biomes, biome)
|
||||
tableInsert(biomesNames, biome.name)
|
||||
tableInsert(biomes, biome)
|
||||
end
|
||||
end
|
||||
|
||||
table.sort(biomesNames)
|
||||
tableSort(biomesNames)
|
||||
|
||||
return biomesNames, biomes
|
||||
end
|
||||
@@ -372,7 +481,7 @@ function Layer:initNoises()
|
||||
|
||||
for category, noisesParams in pairs(self.noisesParamsByColor) do
|
||||
for color, noiseParams in pairs(noisesParams) do
|
||||
noises[category][color] = core.get_value_noise(noiseParams)
|
||||
noises[category][color] = coreGetValueNoise(noiseParams)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -402,7 +511,7 @@ function Layer:initBiomesDiagram()
|
||||
diagram[height][temp] = {}
|
||||
|
||||
for humidity = self.minHumidity, self.maxHumidity do
|
||||
local minDistance = math.huge
|
||||
local minDistance = mathHuge
|
||||
local closestBiome = nil
|
||||
|
||||
---@param biome MapGen.Biome
|
||||
|
||||
154
mods/CORE/MapGen/src/MapGen/Ore.lua
Normal file
154
mods/CORE/MapGen/src/MapGen/Ore.lua
Normal file
@@ -0,0 +1,154 @@
|
||||
local assert = assert
|
||||
local pairs = pairs
|
||||
|
||||
local id = core.get_content_id
|
||||
local coreGetValueNoise = core.get_value_noise
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@alias MapGen.Ore.Type 'cheesed'
|
||||
---@alias MapGen.Ore.NoiseParams {baseNoise:NoiseParams, xNoise?:NoiseParams, yNoise?:NoiseParams, zNoise?:NoiseParams}
|
||||
---@alias MapGen.Ore.ValueNoise {baseNoise:ValueNoise, xNoise?:ValueNoise, yNoise?:ValueNoise, zNoise?:ValueNoise}
|
||||
|
||||
---@class MapGen.Ore
|
||||
---@field name string
|
||||
---@field type MapGen.Ore.Type
|
||||
---@field biomes string[]?
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---
|
||||
---@field wherein string[]
|
||||
---@field nodeName string?
|
||||
---@field nodeParam2 integer
|
||||
---@field nodeID integer?
|
||||
---@field oreFunc (fun(self:MapGen.Ore, factors:MapGen.Factors, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer):boolean)?
|
||||
---
|
||||
---@field threshold number
|
||||
---
|
||||
---@field getNoise fun(self:MapGen.Ore):MapGen.Ore.ValueNoise
|
||||
---@field initNoise fun(self:MapGen.Ore)
|
||||
local Ore = {}
|
||||
|
||||
---Definition table for the `MapGen.Ore`.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.OreDef
|
||||
---@field type MapGen.Ore.Type
|
||||
---A list of biome names where ore will generate.
|
||||
---
|
||||
---If `nil`, ore will generate on the entire layer.
|
||||
---@field biomes string[]?
|
||||
---
|
||||
---List of node names where ore will spawn.
|
||||
---@field wherein string[]
|
||||
---
|
||||
---The name of the ore that will be generated.
|
||||
---@field nodeName string?
|
||||
---@field nodeParam2 integer?
|
||||
---
|
||||
---The function that will be called to generate ore.
|
||||
---
|
||||
---Can be used to customize generation.
|
||||
---@field oreFunc (fun(self:MapGen.Ore, factors:MapGen.Factors, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer):boolean)?
|
||||
---
|
||||
---@field threshold number
|
||||
---
|
||||
---@field noiseParams MapGen.Ore.NoiseParams
|
||||
|
||||
---@param name string
|
||||
---@param def MapGen.OreDef
|
||||
function Ore:new(name, def)
|
||||
assert(def.nodeName ~= nil or def.oreFunc ~= nil, '`nodeName` and `oreFunc` cannot be nil for ore definition')
|
||||
|
||||
local _noiseParams = def.noiseParams
|
||||
local _noise = {}
|
||||
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = name
|
||||
instance.type = def.type
|
||||
instance.wherein = def.wherein
|
||||
instance.nodeName = def.nodeName
|
||||
instance.nodeParam2 = def.nodeParam2 or 0
|
||||
instance.nodeID = id(instance.nodeName)
|
||||
instance.oreFunc = def.oreFunc
|
||||
instance.threshold = def.threshold
|
||||
|
||||
function instance:getNoise()
|
||||
return _noise
|
||||
end
|
||||
|
||||
function instance:initNoise()
|
||||
for noiseName, noiseParams in pairs(_noiseParams) do
|
||||
_noise[noiseName] = coreGetValueNoise(noiseParams)
|
||||
end
|
||||
end
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
---Places ore at the given coordinates.
|
||||
---
|
||||
---If a generation function is specified, it is called.
|
||||
---
|
||||
---**Note**: This method is guaranteed to place ore. To generate ore procedurally, use `:generate()`
|
||||
---@param factors MapGen.Factors
|
||||
---@param data integer[]
|
||||
---@param data2 integer[]
|
||||
---@param index integer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
---@return boolean
|
||||
function Ore:set(factors, data, data2, index, x, y, z)
|
||||
if self.nodeID ~= nil then
|
||||
data[index] = self.nodeID
|
||||
data2[index] = self.nodeParam2
|
||||
end
|
||||
|
||||
if self.oreFunc ~= nil then
|
||||
return self:oreFunc(factors, data, data2, index, x, y, z)
|
||||
end
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
---@param factors MapGen.Factors
|
||||
---@param data integer[]
|
||||
---@param data2 integer[]
|
||||
---@param index integer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
---@return boolean
|
||||
function Ore:generateCheesed(factors, data, data2, index, x, y, z)
|
||||
local noises = self:getNoise()
|
||||
|
||||
if noises.baseNoise:get_3d({x = x, y = y, z = z}) >= self.threshold then
|
||||
self:set(factors, data, data2, index, x, y, z)
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
---@param factors MapGen.Factors
|
||||
---@param data integer[]
|
||||
---@param data2 integer[]
|
||||
---@param index integer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
---@return boolean
|
||||
function Ore:generate(factors, data, data2, index, x, y, z)
|
||||
if y > self.maxY or y < self.minY then
|
||||
return false
|
||||
end
|
||||
|
||||
if self.type == 'cheesed' then
|
||||
return self:generateCheesed(factors, data, data2, index, x, y, z)
|
||||
else
|
||||
error()
|
||||
end
|
||||
end
|
||||
|
||||
return Ore
|
||||
@@ -1,29 +1,30 @@
|
||||
local tabeCopyWithMetatable, tableMerge = table.copy_with_metatables, table.merge
|
||||
|
||||
local v = vector.new
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@class MapGen.Peak
|
||||
---@field id number
|
||||
---@field pos vector
|
||||
---@field color ColorString
|
||||
---@field getGroups fun(self):table<string, number>
|
||||
---@field addGroups fun(self, groups:table<string, number>)
|
||||
---@field id number
|
||||
---@field pos vector
|
||||
---@field color ColorString
|
||||
---@field getGroups fun(self):table<string, number>
|
||||
---@field addGroups fun(self, groups:table<string, number>)
|
||||
local Peak = {
|
||||
id = 0,
|
||||
}
|
||||
|
||||
-- --- Class registration ---
|
||||
|
||||
---Definition table for the `MapGen.Peak`.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.PeakDef
|
||||
---@field pos MapVector
|
||||
---@field color ColorString
|
||||
---@field groups? table<string, number>
|
||||
---@field pos MapVector
|
||||
---@field color ColorString
|
||||
---@field groups table<string, number>?
|
||||
|
||||
---@param def MapGen.PeakDef
|
||||
---@return MapGen.Peak
|
||||
function Peak:new(def)
|
||||
local _color = def.color
|
||||
local _groups
|
||||
|
||||
if def.groups == nil then
|
||||
@@ -34,16 +35,15 @@ function Peak:new(def)
|
||||
end
|
||||
|
||||
---@type MapGen.Peak
|
||||
local instance = getInstance(self,{},
|
||||
{
|
||||
local instance = getInstance(self, {}, {
|
||||
__tostring = self.toString,
|
||||
__eq = self.eq
|
||||
})
|
||||
instance.pos = vector.new(def.pos)
|
||||
instance.pos = v(def.pos)
|
||||
instance.color = def.color
|
||||
|
||||
function instance:getGroups()
|
||||
return table.copy_with_metatables(_groups)
|
||||
return tabeCopyWithMetatable(_groups)
|
||||
end
|
||||
|
||||
function instance:addGroups(groups)
|
||||
@@ -51,7 +51,7 @@ function Peak:new(def)
|
||||
groups.is2d = nil
|
||||
groups.is3d = nil
|
||||
|
||||
_groups = table.merge(_groups, groups, true)
|
||||
_groups = tableMerge(_groups, groups, true)
|
||||
end
|
||||
|
||||
return instance
|
||||
@@ -61,7 +61,8 @@ end
|
||||
---@return string
|
||||
function Peak:toString()
|
||||
local pos = self.pos
|
||||
return ('Peak (%s) x: %.2f y: %.2f z: %.2f'):format( self.id, pos.x, pos.y, pos.z)
|
||||
|
||||
return ('Peak (%s) x: %.2f y: %.2f z: %.2f'):format(self.id, pos.x, pos.y, pos.z)
|
||||
end
|
||||
|
||||
---Returns true if the peaks are equivalent.
|
||||
|
||||
@@ -7,16 +7,18 @@ local getInstance = Class.getInstance
|
||||
---@field vertices MapVector[]
|
||||
local Region = {}
|
||||
|
||||
---Definition table for the `MapGen.Region`.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.RegionDef
|
||||
---@field vertices MapVector[]
|
||||
|
||||
---@param def MapGen.RegionDef
|
||||
---@return MapGen.Region
|
||||
---@param def MapGen.RegionDef
|
||||
---@return MapGen.Region
|
||||
function Region:new(name, def)
|
||||
local instance = getInstance(self, {
|
||||
name = name,
|
||||
vertices = def.vertices
|
||||
})
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = name
|
||||
instance.vertices = def.vertices
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
@@ -1,33 +1,35 @@
|
||||
local assert = assert
|
||||
|
||||
local id = core.get_content_id
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@class MapGen.StaticLayer
|
||||
---@field name string
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---@field staticNode string
|
||||
---@field staticNodeID number
|
||||
---@field generateStaticNode fun(self, mapGenerator:MapGen, data:number[], data2:number[], index:number, x:number, y:number, z:number)
|
||||
---@field staticNodeID integer
|
||||
---@field generateStaticNode fun(self, mapGenerator:MapGen, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer)
|
||||
local StaticLayer = {}
|
||||
|
||||
---Definition table for the `MapGen.StaticLayer`.
|
||||
---
|
||||
---**Only for EmmyLua.**
|
||||
---@class MapGen.StaticLayerDef
|
||||
---@field minY number
|
||||
---@field maxY number
|
||||
---@field minY integer
|
||||
---@field maxY integer
|
||||
---@field staticNode string
|
||||
---@field generateStaticNode fun(self, mapGenerator:MapGen, data:number[], data2:number[], index:number, x:number, y:number, z:number)
|
||||
---@field generateStaticNode fun(self, mapGenerator:MapGen, data:integer[], data2:integer[], index:integer, x:integer, y:integer, z:integer)
|
||||
|
||||
---@param self MapGen.StaticLayer
|
||||
---@param mapGenerator MapGen
|
||||
---@param data number[]
|
||||
---@param data2 number[]
|
||||
---@param index number
|
||||
---@param x number
|
||||
---@param y number
|
||||
---@param z number
|
||||
---@param data integer[]
|
||||
---@param data2 integer[]
|
||||
---@param index integer
|
||||
---@param x integer
|
||||
---@param y integer
|
||||
---@param z integer
|
||||
local defaultGenerateStaticNode = function(self, mapGenerator, data, data2, index, x, y, z)
|
||||
data[index] = self.staticNodeID
|
||||
end
|
||||
@@ -46,14 +48,13 @@ function StaticLayer:new(name, def)
|
||||
local staticNodeID = id(def.staticNode)
|
||||
|
||||
---@type MapGen.StaticLayer
|
||||
local instance = getInstance(self, {
|
||||
name = name,
|
||||
minY = def.minY,
|
||||
maxY = def.maxY,
|
||||
staticNode = def.staticNode,
|
||||
staticNodeID = staticNodeID,
|
||||
generateStaticNode = def.generateStaticNode
|
||||
})
|
||||
local instance = getInstance(self, {})
|
||||
instance.name = name
|
||||
instance.minY = def.minY
|
||||
instance.maxY = def.maxY
|
||||
instance.staticNode = def.staticNode
|
||||
instance.staticNodeID = staticNodeID
|
||||
instance.generateStaticNode = def.generateStaticNode
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
local v = vector.new
|
||||
local mathFloor = math.floor
|
||||
|
||||
local v = vector.new
|
||||
local VoxelManip, VoxelArea = VoxelManip, VoxelArea
|
||||
local corePlaceSchematic, corePlaceSchematicOnVM, coreEmergeArea = core.place_schematic, core.place_schematic_on_vmanip, core.emerge_area
|
||||
local CONTENT_IGNORE = core.CONTENT_IGNORE
|
||||
local VoxelManip, VoxelArea = VoxelManip, VoxelArea
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
local Node
|
||||
|
||||
@@ -10,8 +13,6 @@ if not Smc.isAsync then
|
||||
Node = Smc.requireNode()
|
||||
end
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
---@class MapGen.Tree
|
||||
---@field name string
|
||||
---@field path string
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
local mathSqrt, mathAbs
|
||||
= math.sqrt, math.abs
|
||||
local assert, tostring = assert, tostring
|
||||
|
||||
local mathSqrt, mathAbs = math.sqrt, math.abs
|
||||
|
||||
local v = vector.new
|
||||
|
||||
local getInstance = Class.getInstance
|
||||
|
||||
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||
local require = modInfo.require
|
||||
local require = Mod.getInfo('smc__core__map_gen').require
|
||||
|
||||
---@type MapGen.Edge
|
||||
local Edge = require('MapGen.Edge')
|
||||
@@ -259,7 +261,7 @@ function Triangle:getCircumCenter2D()
|
||||
( 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 vector.new(x / D, 0, z / D)
|
||||
return v(x / D, 0, z / D)
|
||||
end
|
||||
|
||||
---Returns the radius of the circumcircle.
|
||||
|
||||
Reference in New Issue
Block a user