MapGen: add getLayerByName(). close #19
This commit is contained in:
@@ -81,6 +81,17 @@ function MapGen:new(def)
|
|||||||
return instance
|
return instance
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---Returns a layer by name. If such a layer does not exist, an error will be raised.
|
||||||
|
---@param layerName string The name of the layer to be retrieved.
|
||||||
|
---@return MapGen.Layer
|
||||||
|
function MapGen:getLayerByName(layerName)
|
||||||
|
local layer = self.layersByName[layerName]
|
||||||
|
|
||||||
|
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
|
||||||
|
|
||||||
|
return layer
|
||||||
|
end
|
||||||
|
|
||||||
---Determines which layer a node belongs to based on its height coordinate.
|
---Determines which layer a node belongs to based on its height coordinate.
|
||||||
---@param yPos number
|
---@param yPos number
|
||||||
---@return MapGen.Layer?
|
---@return MapGen.Layer?
|
||||||
@@ -127,9 +138,7 @@ end
|
|||||||
function MapGen:getPeakByPos(layer, category, pos)
|
function MapGen:getPeakByPos(layer, category, pos)
|
||||||
if type(layer) == 'string' then
|
if type(layer) == 'string' then
|
||||||
local layerName = layer
|
local layerName = layer
|
||||||
layer = self.layersByName[layerName]
|
layer = self:getLayerByName(layerName)
|
||||||
|
|
||||||
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
pos = vector.new(pos)
|
pos = vector.new(pos)
|
||||||
@@ -180,9 +189,7 @@ end
|
|||||||
function MapGen:getTriangleByPos2D(layer, category, pos)
|
function MapGen:getTriangleByPos2D(layer, category, pos)
|
||||||
if type(layer) == 'string' then
|
if type(layer) == 'string' then
|
||||||
local layerName = layer
|
local layerName = layer
|
||||||
layer = self.layersByName[layerName]
|
layer = self:getLayerByName(layerName)
|
||||||
|
|
||||||
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
for _, triangle in ipairs(layer.trianglesList[category]) do
|
for _, triangle in ipairs(layer.trianglesList[category]) do
|
||||||
@@ -266,9 +273,7 @@ end
|
|||||||
---@param noiseParams NoiseParams Fractal noise parameters.
|
---@param noiseParams NoiseParams Fractal noise parameters.
|
||||||
function MapGen:registerLayerNoiseColor(layerName, category, color, noiseParams)
|
function MapGen:registerLayerNoiseColor(layerName, category, color, noiseParams)
|
||||||
---@type MapGen.Layer
|
---@type MapGen.Layer
|
||||||
local layer = self.layersByName[layerName]
|
local layer = self:getLayerByName(layerName)
|
||||||
|
|
||||||
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
|
|
||||||
|
|
||||||
layer:addNoiseParamsColor(category, color, noiseParams)
|
layer:addNoiseParamsColor(category, color, noiseParams)
|
||||||
end
|
end
|
||||||
@@ -305,9 +310,7 @@ end
|
|||||||
---@param def MapGen.PeakDef Peak description table, see details `MapGen.PeakDef`.
|
---@param def MapGen.PeakDef Peak description table, see details `MapGen.PeakDef`.
|
||||||
function MapGen:registerPeak(layerName, category, def)
|
function MapGen:registerPeak(layerName, category, def)
|
||||||
---@type MapGen.Layer
|
---@type MapGen.Layer
|
||||||
local layer = self.layersByName[layerName]
|
local layer = self:getLayerByName(layerName)
|
||||||
|
|
||||||
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
|
|
||||||
|
|
||||||
assert(self:getPeakByPos(layer, category, def.pos) == nil,
|
assert(self:getPeakByPos(layer, category, def.pos) == nil,
|
||||||
('In the `%s` layer in the `%s` category there is already a peak with coordinates: %s, %s, %s.'):format(
|
('In the `%s` layer in the `%s` category there is already a peak with coordinates: %s, %s, %s.'):format(
|
||||||
@@ -389,9 +392,7 @@ end
|
|||||||
---@param groups table<string, number> Groups to be added.
|
---@param groups table<string, number> Groups to be added.
|
||||||
function MapGen:addGroupsToPeakByPos(layerName, category, pos, groups)
|
function MapGen:addGroupsToPeakByPos(layerName, category, pos, groups)
|
||||||
---@type MapGen.Layer
|
---@type MapGen.Layer
|
||||||
local layer = self.layersByName[layerName]
|
local layer = self:getLayerByName(layerName)
|
||||||
|
|
||||||
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
|
|
||||||
|
|
||||||
local peak = self:getPeakByPos(layer, category, pos)
|
local peak = self:getPeakByPos(layer, category, pos)
|
||||||
assert( peak ~= nil, ('In the `%s` layer in the `%s` category there is no peak with coordinates: %s, %s, %s.'):format(
|
assert( peak ~= nil, ('In the `%s` layer in the `%s` category there is no peak with coordinates: %s, %s, %s.'):format(
|
||||||
@@ -405,8 +406,7 @@ end
|
|||||||
---@param biomeName string The name to be assigned to the biome. The name must be unique for each biome.
|
---@param biomeName string The name to be assigned to the biome. The name must be unique for each biome.
|
||||||
---@param def MapGen.BiomeDef Biome description table, see details `MapGen.BiomeDef`
|
---@param def MapGen.BiomeDef Biome description table, see details `MapGen.BiomeDef`
|
||||||
function MapGen:registerBiome(layerName, biomeName, def)
|
function MapGen:registerBiome(layerName, biomeName, def)
|
||||||
local layer = self.layersByName[layerName]
|
local layer = self:getLayerByName(layerName)
|
||||||
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
|
|
||||||
|
|
||||||
local biome = Biome:new(biomeName, def)
|
local biome = Biome:new(biomeName, def)
|
||||||
|
|
||||||
@@ -419,8 +419,7 @@ end
|
|||||||
---@param def MapGen.CavernDef Cavern description table, see details `MapGen.CavernDef`
|
---@param def MapGen.CavernDef Cavern description table, see details `MapGen.CavernDef`
|
||||||
---@param regionVertices Position[]? The region to which the cave generation will be limited.
|
---@param regionVertices Position[]? The region to which the cave generation will be limited.
|
||||||
function MapGen:registerCavern(layerName, cavernName, def, regionVertices)
|
function MapGen:registerCavern(layerName, cavernName, def, regionVertices)
|
||||||
local layer = self.layersByName[layerName]
|
local layer = self:getLayerByName(layerName)
|
||||||
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
|
|
||||||
|
|
||||||
if regionVertices ~= nil then
|
if regionVertices ~= nil then
|
||||||
self:registerRegion(layerName, cavernName, {
|
self:registerRegion(layerName, cavernName, {
|
||||||
@@ -440,8 +439,7 @@ end
|
|||||||
---@param regionName string The name to be assigned to the region. The name must be unique for each region.
|
---@param regionName string The name to be assigned to the region. The name must be unique for each region.
|
||||||
---@param def MapGen.RegionDef Region description table, see details `MapGen.RegionDef`
|
---@param def MapGen.RegionDef Region description table, see details `MapGen.RegionDef`
|
||||||
function MapGen:registerRegion(layerName, regionName, def)
|
function MapGen:registerRegion(layerName, regionName, def)
|
||||||
local layer = self.layersByName[layerName]
|
local layer = self:getLayerByName(layerName)
|
||||||
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
|
|
||||||
|
|
||||||
local region = Region:new(regionName, def)
|
local region = Region:new(regionName, def)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user