MapGen: Layer:get<Object>ByName() methods added. Add Layer:getPeakByPos(). close #20
This commit is contained in:
@@ -141,14 +141,7 @@ function MapGen:getPeakByPos(layer, category, pos)
|
|||||||
layer = self:getLayerByName(layerName)
|
layer = self:getLayerByName(layerName)
|
||||||
end
|
end
|
||||||
|
|
||||||
pos = vector.new(pos)
|
return layer:getPeakByPos(category, pos)
|
||||||
|
|
||||||
---@param peak MapGen.Peak
|
|
||||||
for _, peak in ipairs(layer.peaksList[category]) do
|
|
||||||
if peak:getPeakPos() == pos then
|
|
||||||
return peak
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
---Returns `true` if the point is within the triangle's region.
|
---Returns `true` if the point is within the triangle's region.
|
||||||
|
|||||||
@@ -129,6 +129,21 @@ function Layer:addPeak(category, peak)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---Returns the `MapGen.Peak` at the coordinates. If there is no peak at these coordinates, it returns `nil`.
|
||||||
|
---@param category MapGen.Layer.Category The category in which the peak is located.
|
||||||
|
---@param pos Position Coordinate of the desired peak.
|
||||||
|
---@return MapGen.Peak?
|
||||||
|
function Layer:getPeakByPos(category, pos)
|
||||||
|
pos = vector.new(pos)
|
||||||
|
|
||||||
|
---@param peak MapGen.Peak
|
||||||
|
for _, peak in ipairs(self.peaksList[category]) do
|
||||||
|
if peak:getPeakPos() == pos then
|
||||||
|
return peak
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
---Adds a NoiseParams color to the `Layer.noisesParamsByColor`
|
---Adds a NoiseParams color to the `Layer.noisesParamsByColor`
|
||||||
---@param category MapGen.Layer.Category
|
---@param category MapGen.Layer.Category
|
||||||
---@param color ColorString
|
---@param color ColorString
|
||||||
@@ -187,6 +202,17 @@ function Layer:addBiome(biomeName, biome)
|
|||||||
table.insert(self.biomesList, biome)
|
table.insert(self.biomesList, biome)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---Returns a biome by name, if there is no such biome, it will raise an error.
|
||||||
|
---@param biomeName string
|
||||||
|
---@return MapGen.Biome
|
||||||
|
function Layer:getBiomeByName(biomeName)
|
||||||
|
local biome = self.biomesByName[biomeName]
|
||||||
|
assert(biome ~= nil, ('Biome named `%s` does not exist in the `%s` layer.'):format(
|
||||||
|
biomeName, self.name))
|
||||||
|
|
||||||
|
return biome
|
||||||
|
end
|
||||||
|
|
||||||
---Adds a cavern to the `Layer.cavernsByName` & `Layer.cavernsList`
|
---Adds a cavern to the `Layer.cavernsByName` & `Layer.cavernsList`
|
||||||
---@param cavernName string
|
---@param cavernName string
|
||||||
---@param cavern MapGen.Cavern
|
---@param cavern MapGen.Cavern
|
||||||
@@ -199,6 +225,17 @@ function Layer:addCavern(cavernName, cavern)
|
|||||||
table.insert(self.cavernsList, cavern)
|
table.insert(self.cavernsList, cavern)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---Returns a cavern by name, if there is no such cavern, it will raise an error.
|
||||||
|
---@param cavernName string
|
||||||
|
---@return MapGen.Cavern
|
||||||
|
function Layer:getCavernByName(cavernName)
|
||||||
|
local cavern = self.cavernsByName[cavernName]
|
||||||
|
assert(cavern ~= nil, ('Cavern named `%s` does not exist in the `%s` layer.'):format(
|
||||||
|
cavernName, self.name))
|
||||||
|
|
||||||
|
return cavern
|
||||||
|
end
|
||||||
|
|
||||||
function Layer:addRegion(regionName, region)
|
function Layer:addRegion(regionName, region)
|
||||||
assert(self.regionsByName[regionName] == nil,
|
assert(self.regionsByName[regionName] == nil,
|
||||||
('A region named `%s` already exists in the `%s` layer.'):format(
|
('A region named `%s` already exists in the `%s` layer.'):format(
|
||||||
@@ -208,6 +245,18 @@ function Layer:addRegion(regionName, region)
|
|||||||
--table.insert(self.regionsList, region)
|
--table.insert(self.regionsList, region)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---Returns a region by name, if there is no such region, it will raise an error.
|
||||||
|
---@param regionName string
|
||||||
|
---@return MapGen.Region
|
||||||
|
function Layer:getRegionByName(regionName)
|
||||||
|
local region = self.regionsByName[regionName]
|
||||||
|
assert(region ~= nil, ('Region named `%s` does not exist in the `%s` layer.'):format(
|
||||||
|
regionName, self.name))
|
||||||
|
|
||||||
|
return region
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
---@param height number
|
---@param height number
|
||||||
---@param biomesList MapGen.Biome[]
|
---@param biomesList MapGen.Biome[]
|
||||||
---@return string[], MapGen.Biome[]
|
---@return string[], MapGen.Biome[]
|
||||||
|
|||||||
Reference in New Issue
Block a user