MapGen: Moving triangulation outside of Lua scripts, using pre-triangulated JSON files
This commit is contained in:
@@ -23,9 +23,6 @@ local Layer = require('MapGen.Layer')
|
|||||||
---@type MapGen.StaticLayer
|
---@type MapGen.StaticLayer
|
||||||
local StaticLayer = require('MapGen.StaticLayer')
|
local StaticLayer = require('MapGen.StaticLayer')
|
||||||
|
|
||||||
---@type MapGen.Peak
|
|
||||||
local Peak = require('MapGen.Peak')
|
|
||||||
|
|
||||||
---@type MapGen.Biome
|
---@type MapGen.Biome
|
||||||
local Biome = require('MapGen.Biome')
|
local Biome = require('MapGen.Biome')
|
||||||
|
|
||||||
@@ -203,7 +200,7 @@ end
|
|||||||
function MapGen:pointInRegion2D(layer, regionName, point)
|
function MapGen:pointInRegion2D(layer, regionName, point)
|
||||||
local region = layer.regionsByName[regionName]
|
local region = layer.regionsByName[regionName]
|
||||||
|
|
||||||
assert(layer ~= nil, ('There is no region named `%s` registered.'):format(regionName))
|
assert(region ~= nil, ('There is no region named `%s` registered.'):format(regionName))
|
||||||
|
|
||||||
return region:pointInRegion(point)
|
return region:pointInRegion(point)
|
||||||
end
|
end
|
||||||
@@ -418,105 +415,6 @@ function MapGen:registerStaticLayer(name, def)
|
|||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
---Mark a world point as `MapGen.Peak` and assign it a specific color that will affect the generation.
|
|
||||||
---
|
|
||||||
---Note: The peaks shouldn't overlap.
|
|
||||||
---@param layerName string The name of the layer in which the new peak will be included.
|
|
||||||
---@param category MapGen.Layer.Category Category indicating what will be generated by peak.
|
|
||||||
---@param def MapGen.PeakDef Peak description table, see details `MapGen.PeakDef`.
|
|
||||||
function MapGen:registerPeak(layerName, category, def)
|
|
||||||
local layer = self:getLayerByName(layerName)
|
|
||||||
|
|
||||||
--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(
|
|
||||||
-- layerName, category, def.pos.x, def.pos.y, def.pos.z))
|
|
||||||
|
|
||||||
---@type MapGen.Peak
|
|
||||||
local peak = Peak:new(def)
|
|
||||||
|
|
||||||
layer:addPeak(category, peak)
|
|
||||||
end
|
|
||||||
|
|
||||||
---Mark a world point as `MapGen.Peak` and assign it a specific color that will affect the generation.
|
|
||||||
---The Y coordinate will be forced to zero, and the `is2d` group will be added to the groups field.
|
|
||||||
---
|
|
||||||
---Note: The peaks shouldn't overlap.
|
|
||||||
---@param layerName string The name of the layer in which the new peak will be included.
|
|
||||||
---@param category MapGen.Layer.Category Category indicating what will be generated by peak.
|
|
||||||
---@param def MapGen.PeakDef Peak description table, see details `MapGen.PeakDef`.
|
|
||||||
function MapGen:register2DPeak(layerName, category, def)
|
|
||||||
def = table.copy_with_metatables(def)
|
|
||||||
|
|
||||||
def.pos.y = 0
|
|
||||||
|
|
||||||
if def.groups == nil then
|
|
||||||
def.groups = {is2d = 1}
|
|
||||||
else
|
|
||||||
def.groups.is2d = 1
|
|
||||||
end
|
|
||||||
|
|
||||||
self:registerPeak(layerName, category, def)
|
|
||||||
end
|
|
||||||
|
|
||||||
---Mark the world points as `MapGen.Peak` and assign them all a specific noise that will affect generation.
|
|
||||||
---The Y coordinate will be forced to zero, and the `is2d` group will be added to the groups field.
|
|
||||||
---
|
|
||||||
---Note: The peaks shouldn't overlap.
|
|
||||||
---@param layerName string The name of the layer in which the new peaks will be included.
|
|
||||||
---@param category MapGen.Layer.Category Category indicating what will be generated by peaks.
|
|
||||||
---@param defs MapGen.PeakDef[] Peaks description table, see details `MapGen.PeakDef`.
|
|
||||||
function MapGen:register2DPeaks(layerName,category, defs)
|
|
||||||
for _, def in ipairs(defs) do
|
|
||||||
self:register2DPeak(layerName, category, def)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
---Extract the `MapGen.Peak` from the image and assign them all a specific color that will affect the generation.
|
|
||||||
---@param layerName string The name of the layer in which the new peaks will be included.
|
|
||||||
---@param map string The name of the image from which the peaks will be extracted. It should be located in the `<mod_name>/textures/maps` folder and have the following format `<image_name>.ff`
|
|
||||||
---@param scale number Multiplier of how many blocks (nodes) will be between image pixels. It is not recommended to set the value below 50 for performance reasons.
|
|
||||||
---@param zeroPos IntegerPosition2d The position in pixels where the zero world coordinate will be in the image.
|
|
||||||
---@param category MapGen.Layer.Category Category indicating what will be generated by peaks.
|
|
||||||
---@param groups? table<string, number> Groups that will be added to all peaks.
|
|
||||||
function MapGen:register2DPeaksFromFile(layerName, map, scale,zeroPos, category, groups)
|
|
||||||
if scale < 2 then
|
|
||||||
error('The map scale should not be less than 2.')
|
|
||||||
end
|
|
||||||
|
|
||||||
local modPath = core.get_modpath(core.get_current_modname())
|
|
||||||
local peaks = ff2luat(modPath .. '/textures/maps/' .. map)
|
|
||||||
|
|
||||||
---@type {h:integer, w:integer}
|
|
||||||
local mapSize = peaks.size
|
|
||||||
peaks.size = nil
|
|
||||||
|
|
||||||
zeroPos.x = zeroPos.x + mathRound(mapSize.w/2)
|
|
||||||
zeroPos.y = zeroPos.y + mathRound(mapSize.h/2)
|
|
||||||
|
|
||||||
local x, z
|
|
||||||
|
|
||||||
for color, peaksPos in pairs(peaks) do
|
|
||||||
for _, peakPos in ipairs(peaksPos) do
|
|
||||||
---@type integer, integer
|
|
||||||
x, z = (peakPos.x - zeroPos.x - 1) * scale, (peakPos.y - zeroPos.y - 1) * -scale
|
|
||||||
|
|
||||||
-- Converting a rectangular grid into an isometric-like one.
|
|
||||||
if peakPos.y % 2 == 1 then
|
|
||||||
x = mathRound(x + (scale/2))
|
|
||||||
end
|
|
||||||
|
|
||||||
---@type MapGen.PeakDef
|
|
||||||
local def = {
|
|
||||||
pos = {x=x, y=0, z=z},
|
|
||||||
color = color,
|
|
||||||
groups = groups,
|
|
||||||
}
|
|
||||||
|
|
||||||
self:register2DPeak(layerName, category, def)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
---Adds groups to the already registered groups in the peak by coordinate.
|
---Adds groups to the already registered groups in the peak by coordinate.
|
||||||
---If the peak does not exist, an error will be raised.
|
---If the peak does not exist, an error will be raised.
|
||||||
---@param layerName string The name of the layer in which the new peak will be included.
|
---@param layerName string The name of the layer in which the new peak will be included.
|
||||||
@@ -588,11 +486,11 @@ end
|
|||||||
|
|
||||||
-- --- INITIALIZATION METHODS ---
|
-- --- INITIALIZATION METHODS ---
|
||||||
|
|
||||||
---Initialize the boundary region for a triangulated area.
|
---Initialize the boundary region for a layer and category.
|
||||||
---@param layer MapGen.Layer
|
---@param layer MapGen.Layer
|
||||||
---@param category MapGen.Layer.Category
|
---@param category MapGen.Layer.Category
|
||||||
---@param triangles MapGen.Triangle[]
|
function MapGen:initTriangultaionBoundaryRegion(layer, category)
|
||||||
function MapGen:initTriangultaionBoundaryRegion(layer, category, triangles)
|
local triangles = layer.trianglesList[category]
|
||||||
local regionVertices = self:getTriangulateBoundaryVertices(triangles)
|
local regionVertices = self:getTriangulateBoundaryVertices(triangles)
|
||||||
|
|
||||||
local regionName = category..'_boundary'
|
local regionName = category..'_boundary'
|
||||||
@@ -602,17 +500,13 @@ function MapGen:initTriangultaionBoundaryRegion(layer, category, triangles)
|
|||||||
layer:addRegion(regionName, region)
|
layer:addRegion(regionName, region)
|
||||||
end
|
end
|
||||||
|
|
||||||
---Divide all layers into triangles whose vertices are the `Mapgen.Peak` belonging to these layers.
|
---Initialize border regions for all layers and all categories.
|
||||||
function MapGen:initLayersTriangultaion()
|
function MapGen:initLayersBoundaryRegions()
|
||||||
---@param layer MapGen.Layer
|
---@param layer MapGen.Layer
|
||||||
for _, layer in ipairs(self.layersList) do
|
for _, layer in ipairs(self.layersList) do
|
||||||
for category, peaks in pairs(layer.peaksList) do
|
self:initTriangultaionBoundaryRegion(layer, 'landscape')
|
||||||
local triangles = Triangulation.triangulate(peaks)
|
self:initTriangultaionBoundaryRegion(layer, 'temp')
|
||||||
|
self:initTriangultaionBoundaryRegion(layer, 'humidity')
|
||||||
layer.trianglesList[category] = triangles
|
|
||||||
self:initTriangultaionBoundaryRegion(layer, category, triangles)
|
|
||||||
-- layer.tetrahedronsList = Triangulation.tetrahedralize(layer.peaksList) -- 3D not supported
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -1079,6 +973,7 @@ end
|
|||||||
function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
|
function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
|
||||||
-- We obtain a generation area for further manipulations
|
-- 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')
|
||||||
|
core.log('Chunk run')
|
||||||
|
|
||||||
local eMin, eMax = voxelManip:get_emerged_area()
|
local eMin, eMax = voxelManip:get_emerged_area()
|
||||||
|
|
||||||
@@ -1108,6 +1003,8 @@ function MapGen:onMapGenerated(voxelManip, minPos, maxPos, blockseed)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
core.log('Postprocces run')
|
||||||
|
|
||||||
-- Post-proccesing generation
|
-- Post-proccesing generation
|
||||||
for _, ppdata in pairs(postProcessing) do
|
for _, ppdata in pairs(postProcessing) do
|
||||||
if ppdata.biome.postProcessing ~= nil then
|
if ppdata.biome.postProcessing ~= nil then
|
||||||
@@ -1157,9 +1054,10 @@ function MapGen:run()
|
|||||||
end)
|
end)
|
||||||
|
|
||||||
self:initBiomesDiagram()
|
self:initBiomesDiagram()
|
||||||
self:initLayersTriangultaion()
|
self:initLayersBoundaryRegions()
|
||||||
|
|
||||||
MapGen.isRunning = true
|
MapGen.isRunning = true
|
||||||
|
core.log('MapGen run')
|
||||||
end
|
end
|
||||||
|
|
||||||
return MapGen
|
return MapGen
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
local getInstance = Class.getInstance
|
local getInstance = Class.getInstance
|
||||||
|
|
||||||
|
local modInfo = Mod.getInfo('smc__core__map_gen')
|
||||||
|
local require = modInfo.require
|
||||||
|
|
||||||
|
---@type MapGen.Peak
|
||||||
|
local Peak = require('MapGen.Peak')
|
||||||
|
---@type MapGen.Triangle
|
||||||
|
local Triangle = require('MapGen.Triangle')
|
||||||
|
|
||||||
---@class MapGen.Layer
|
---@class MapGen.Layer
|
||||||
---@field name string
|
---@field name string
|
||||||
---@field minY integer
|
---@field minY integer
|
||||||
@@ -11,9 +19,10 @@ local getInstance = Class.getInstance
|
|||||||
---@field waterLevel integer
|
---@field waterLevel integer
|
||||||
---@field calcTemp fun(self:MapGen.Layer, value:number, height:number):number
|
---@field calcTemp fun(self:MapGen.Layer, value:number, height:number):number
|
||||||
---@field calcHumidity fun(self:MapGen.Layer, value:number, height:number):number
|
---@field calcHumidity fun(self:MapGen.Layer, value:number, height:number):number
|
||||||
---@field peaksList {['landscape']:MapGen.Peak[],['temp']:MapGen.Peak[],['humidity']:MapGen.Peak[]}
|
---@field peaksList table<MapGen.Layer.Category, MapGen.Peak[]>
|
||||||
---@field noisesByColor {['landscape']:table<ColorString, ValueNoise>,['temp']:table<ColorString, ValueNoise>,['humidity']:table<ColorString, ValueNoise>}
|
---@field peaksByPos table<MapGen.Layer.Category, table<string, MapGen.Peak>>
|
||||||
---@field noisesParamsByColor {['landscape']:table<ColorString, NoiseParams>,['temp']:table<ColorString, NoiseParams>,['humidity']:table<ColorString, NoiseParams>}
|
---@field noisesByColor table<MapGen.Layer.Category, table<ColorString, ValueNoise>>
|
||||||
|
---@field noisesParamsByColor table<MapGen.Layer.Category, table<ColorString, NoiseParams>>
|
||||||
---@field biomesByName table<string, MapGen.Biome>
|
---@field biomesByName table<string, MapGen.Biome>
|
||||||
---@field biomesList MapGen.Biome[]
|
---@field biomesList MapGen.Biome[]
|
||||||
---@field biomesDiagram table
|
---@field biomesDiagram table
|
||||||
@@ -22,10 +31,15 @@ local getInstance = Class.getInstance
|
|||||||
---@field cavernsByName table<string, MapGen.Cavern>
|
---@field cavernsByName table<string, MapGen.Cavern>
|
||||||
---@field cavernsList MapGen.Cavern[]
|
---@field cavernsList MapGen.Cavern[]
|
||||||
---@field regionsByName table<string, MapGen.Region>
|
---@field regionsByName table<string, MapGen.Region>
|
||||||
---@field trianglesList {['landscape']:MapGen.Triangle[],['temp']:MapGen.Triangle[],['humidity']:MapGen.Triangle[]}
|
---@field trianglesList table<MapGen.Layer.Category, MapGen.Triangle[]>
|
||||||
---@field tetrahedronsList MapGen.Tetrahedron[] **Not supported**
|
---@field tetrahedronsList MapGen.Tetrahedron[] **Not supported**
|
||||||
local Layer = {
|
local Layer = {
|
||||||
peaksList = {
|
peaksList = {
|
||||||
|
landscape = {},
|
||||||
|
temp = {},
|
||||||
|
humidity = {},
|
||||||
|
},
|
||||||
|
peaksByPos = {
|
||||||
landscape = {},
|
landscape = {},
|
||||||
temp = {},
|
temp = {},
|
||||||
humidity = {},
|
humidity = {},
|
||||||
@@ -58,17 +72,23 @@ local Layer = {
|
|||||||
---
|
---
|
||||||
---**Only for EmmyLua.**
|
---**Only for EmmyLua.**
|
||||||
---@class MapGen.LayerDef
|
---@class MapGen.LayerDef
|
||||||
---@field minY number
|
---@field minY integer
|
||||||
---@field maxY number
|
---@field maxY integer
|
||||||
---@field minTemp number
|
---@field minTemp integer
|
||||||
---@field maxTemp number
|
---@field maxTemp integer
|
||||||
---@field minHumidity number
|
---@field minHumidity integer
|
||||||
---@field maxHumidity number
|
---@field maxHumidity integer
|
||||||
---@field waterLevel? number
|
---@field waterLevel? integer
|
||||||
---@field calcTemp (fun(self:MapGen.Layer, value:number, height:number):number)?
|
---@field calcTemp (fun(self:MapGen.Layer, value:number, height:number):number)?
|
||||||
---@field calcHumidity (fun(self:MapGen.Layer, value:number, height:number):number)?
|
---@field calcHumidity (fun(self:MapGen.Layer, value:number, height:number):number)?
|
||||||
---@field biomesGorizontalScattering number?
|
---@field biomesGorizontalScattering integer?
|
||||||
---@field biomesVerticalScattering number?
|
---@field biomesVerticalScattering integer?
|
||||||
|
---@field triangulationLandscapeFile string
|
||||||
|
---@field triangulationTempFile string
|
||||||
|
---@field triangulationHumidityFile string
|
||||||
|
---@field landscapeMapScale number
|
||||||
|
---@field tempMapScale number
|
||||||
|
---@field humidityMapScale number
|
||||||
|
|
||||||
---@param self MapGen.Layer
|
---@param self MapGen.Layer
|
||||||
---@param value number
|
---@param value number
|
||||||
@@ -78,6 +98,74 @@ local function defaultCalcFunc(self, value, height)
|
|||||||
return value
|
return value
|
||||||
end
|
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 category MapGen.Layer.Category
|
||||||
|
---@param scale number
|
||||||
|
---@return MapGen.Peak
|
||||||
|
function Layer:registerPeak(def, category, 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[category][positionStr]
|
||||||
|
|
||||||
|
if peak == nil then
|
||||||
|
peak = Peak:new(def)
|
||||||
|
self.peaksByPos[category][positionStr] = peak
|
||||||
|
elseif peak.getColor() ~= def.color then
|
||||||
|
error('There cannot be two peaks with the same coordinates but different colors.')
|
||||||
|
end
|
||||||
|
|
||||||
|
return peak
|
||||||
|
end
|
||||||
|
|
||||||
|
function Layer:initTrianglesNeighbours()
|
||||||
|
for _, triangles in pairs(self.trianglesList) do
|
||||||
|
for _, triangle in ipairs(triangles) do
|
||||||
|
for _, id in ipairs(triangle.neighboursIDs) do
|
||||||
|
table.insert(triangle.neighbours, triangles[id])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param fileName string
|
||||||
|
---@param category MapGen.Layer.Category
|
||||||
|
---@param scale number
|
||||||
|
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], category, scale)
|
||||||
|
local p2 = self:registerPeak( tr.vertices[2], category, scale)
|
||||||
|
local p3 = self:registerPeak( tr.vertices[3], category, scale)
|
||||||
|
|
||||||
|
local triangle = Triangle:new(tr.id,p1, p2, p3, tr.adjacent_triangle_ids)
|
||||||
|
|
||||||
|
self:addTriangle(category, triangle)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
---@param name string
|
---@param name string
|
||||||
---@param def MapGen.LayerDef
|
---@param def MapGen.LayerDef
|
||||||
---@return MapGen.Layer
|
---@return MapGen.Layer
|
||||||
@@ -93,20 +181,34 @@ function Layer:new(name, def)
|
|||||||
end
|
end
|
||||||
|
|
||||||
---@type MapGen.Layer
|
---@type MapGen.Layer
|
||||||
local instance = getInstance(self, {
|
local instance = getInstance(self, {})
|
||||||
name = name,
|
instance.name = name
|
||||||
minY = def.minY,
|
instance.minY = def.minY
|
||||||
maxY = def.maxY,
|
instance.maxY = def.maxY
|
||||||
minTemp = def.minTemp,
|
instance.minTemp = def.minTemp
|
||||||
maxTemp = def.maxTemp,
|
instance.maxTemp = def.maxTemp
|
||||||
minHumidity = def.minHumidity,
|
instance.minHumidity = def.minHumidity
|
||||||
maxHumidity = def.maxHumidity,
|
instance.maxHumidity = def.maxHumidity
|
||||||
waterLevel = def.waterLevel or 0,
|
instance.waterLevel = def.waterLevel or 0
|
||||||
calcTemp = def.calcTemp,
|
instance.calcTemp = def.calcTemp
|
||||||
calcHumidity = def.calcHumidity,
|
instance.calcHumidity = def.calcHumidity
|
||||||
biomesGorizontalScattering = def.biomesGorizontalScattering or 0,
|
instance.biomesGorizontalScattering = def.biomesGorizontalScattering or 0
|
||||||
biomesVerticalScattering = def.biomesVerticalScattering or 0,
|
instance.biomesVerticalScattering = def.biomesVerticalScattering or 0
|
||||||
})
|
|
||||||
|
instance:getTriaglesFromFile(
|
||||||
|
def.triangulationLandscapeFile,
|
||||||
|
'landscape',
|
||||||
|
def.landscapeMapScale)
|
||||||
|
instance:getTriaglesFromFile(
|
||||||
|
def.triangulationTempFile,
|
||||||
|
'temp',
|
||||||
|
def.tempMapScale)
|
||||||
|
instance:getTriaglesFromFile(
|
||||||
|
def.triangulationHumidityFile,
|
||||||
|
'humidity',
|
||||||
|
def.humidityMapScale)
|
||||||
|
|
||||||
|
instance:initTrianglesNeighbours()
|
||||||
|
|
||||||
return instance
|
return instance
|
||||||
end
|
end
|
||||||
@@ -114,6 +216,18 @@ end
|
|||||||
---A category of noise that affects specific map generation objects.
|
---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
|
||||||
|
---@param triangle MapGen.Triangle
|
||||||
|
function Layer:addTriangle(category, triangle)
|
||||||
|
local triangles = self.trianglesList[category]
|
||||||
|
if triangles ~= nil then
|
||||||
|
triangles[triangle.id] = triangle
|
||||||
|
else
|
||||||
|
error(('There is no peak category named %s.'):format(category))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
---Adds a peak to the `Layer.peaksList`
|
---Adds a peak to the `Layer.peaksList`
|
||||||
---@param category MapGen.Layer.Category
|
---@param category MapGen.Layer.Category
|
||||||
---@param peak MapGen.Peak
|
---@param peak MapGen.Peak
|
||||||
@@ -134,14 +248,11 @@ end
|
|||||||
---@param pos Position Coordinate of the desired peak.
|
---@param pos Position Coordinate of the desired peak.
|
||||||
---@return MapGen.Peak?
|
---@return MapGen.Peak?
|
||||||
function Layer:getPeakByPos(category, pos)
|
function Layer:getPeakByPos(category, pos)
|
||||||
pos = vector.new(pos)
|
local positionStr = core.pos_to_string(pos)
|
||||||
|
|
||||||
---@param peak MapGen.Peak
|
local peak = self.peaksByPos[category][positionStr]
|
||||||
for _, peak in ipairs(self.peaksList[category]) do
|
|
||||||
if peak:getPeakPos() == pos then
|
return peak
|
||||||
return peak
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
---Adds a NoiseParams color to the `Layer.noisesParamsByColor`
|
---Adds a NoiseParams color to the `Layer.noisesParamsByColor`
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ end
|
|||||||
---@alias MapGen.Triangle.Neighbours {t1:MapGen.Triangle?,t2:MapGen.Triangle?,t3:MapGen.Triangle?}
|
---@alias MapGen.Triangle.Neighbours {t1:MapGen.Triangle?,t2:MapGen.Triangle?,t3:MapGen.Triangle?}
|
||||||
|
|
||||||
---@class MapGen.Triangle
|
---@class MapGen.Triangle
|
||||||
|
---@field id integer
|
||||||
---@field p1 MapGen.Peak
|
---@field p1 MapGen.Peak
|
||||||
---@field p2 MapGen.Peak
|
---@field p2 MapGen.Peak
|
||||||
---@field p3 MapGen.Peak
|
---@field p3 MapGen.Peak
|
||||||
@@ -72,8 +73,9 @@ end
|
|||||||
---@field h1 MapGen.Triangulation.Edge
|
---@field h1 MapGen.Triangulation.Edge
|
||||||
---@field h2 MapGen.Triangulation.Edge
|
---@field h2 MapGen.Triangulation.Edge
|
||||||
---@field h3 MapGen.Triangulation.Edge
|
---@field h3 MapGen.Triangulation.Edge
|
||||||
---@field neighbours MapGen.Triangle.Neighbours
|
---@field neighboursIDs integer[]
|
||||||
---@field color ColorString?
|
---@field neighbours MapGen.Triangle.Neighbours
|
||||||
|
---@field color ColorString?
|
||||||
local Triangle = {
|
local Triangle = {
|
||||||
neighbours = {}
|
neighbours = {}
|
||||||
}
|
}
|
||||||
@@ -82,7 +84,7 @@ local Triangle = {
|
|||||||
---@param p2 MapGen.Peak
|
---@param p2 MapGen.Peak
|
||||||
---@param p3 MapGen.Peak
|
---@param p3 MapGen.Peak
|
||||||
---@return MapGen.Triangle
|
---@return MapGen.Triangle
|
||||||
function Triangle:new(p1, p2, p3)
|
function Triangle:new(id, p1, p2, p3, neighboursIDs)
|
||||||
assert(not isFlatAngle(p1, p2, p3), ("angle (p1, p2, p3) is flat:\n %s\n %s\n %s")
|
assert(not isFlatAngle(p1, p2, p3), ("angle (p1, p2, p3) is flat:\n %s\n %s\n %s")
|
||||||
:format(tostring(p1), tostring(p2), tostring(p3)))
|
:format(tostring(p1), tostring(p2), tostring(p3)))
|
||||||
|
|
||||||
@@ -96,6 +98,7 @@ function Triangle:new(p1, p2, p3)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local instance = getInstance(self, {
|
local instance = getInstance(self, {
|
||||||
|
id = id,
|
||||||
p1 = p1,
|
p1 = p1,
|
||||||
p2 = p2,
|
p2 = p2,
|
||||||
p3 = p3,
|
p3 = p3,
|
||||||
@@ -105,7 +108,8 @@ function Triangle:new(p1, p2, p3)
|
|||||||
e1 = Edge:new(p1, p2),
|
e1 = Edge:new(p1, p2),
|
||||||
e2 = Edge:new(p2, p3),
|
e2 = Edge:new(p2, p3),
|
||||||
e3 = Edge:new(p3, p1),
|
e3 = Edge:new(p3, p1),
|
||||||
color = color
|
neighboursIDs = neighboursIDs,
|
||||||
|
color = color,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
__tostring = self.toString,
|
__tostring = self.toString,
|
||||||
|
|||||||
32207
mods/ENVIRONMENT/mapGenerator/maps/tarion.json
Normal file
32207
mods/ENVIRONMENT/mapGenerator/maps/tarion.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -49,9 +49,396 @@ mapGenerator:registerLayer('midgard', {
|
|||||||
calcTemp = calcTemp,
|
calcTemp = calcTemp,
|
||||||
calcHumidity = calcHumidity,
|
calcHumidity = calcHumidity,
|
||||||
biomesVerticalScattering = 5,
|
biomesVerticalScattering = 5,
|
||||||
biomesGorizontalScattering = 5
|
biomesGorizontalScattering = 5,
|
||||||
|
triangulationLandscapeFile = 'tarion.json',
|
||||||
|
triangulationTempFile = 'tarion.json',
|
||||||
|
triangulationHumidityFile = 'tarion.json',
|
||||||
|
landscapeMapScale = 100,
|
||||||
|
tempMapScale = 100,
|
||||||
|
humidityMapScale = 100,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- TODO: Config should be imported from .json file in the world's folder
|
||||||
|
local ocean = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = -10,
|
||||||
|
scale = 3,
|
||||||
|
spread = {x = 10, y = 10, z = 10},
|
||||||
|
seed = 420,
|
||||||
|
octaves = 2,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = -10,
|
||||||
|
scale = 5,
|
||||||
|
spread = {x = 10, y = 10, z = 10},
|
||||||
|
seed = 47,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = -10,
|
||||||
|
scale = 5,
|
||||||
|
spread = {x = 10, y = 10, z = 10},
|
||||||
|
seed = 47,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local common_lands = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = 0,
|
||||||
|
scale = 5,
|
||||||
|
spread = {x = 10, y = 10, z = 10},
|
||||||
|
seed = 88005553535,
|
||||||
|
octaves = 2,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = -10,
|
||||||
|
scale = 5,
|
||||||
|
spread = {x = 10, y = 10, z = 10},
|
||||||
|
seed = 47,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = -10,
|
||||||
|
scale = 5,
|
||||||
|
spread = {x = 10, y = 10, z = 10},
|
||||||
|
seed = 47,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local foresty_lands = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = 5,
|
||||||
|
scale = 8,
|
||||||
|
spread = {x = 15, y = 15, z = 15},
|
||||||
|
seed = 12345,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.5,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = 20,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 20, y = 20, z = 20},
|
||||||
|
seed = 48,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 60,
|
||||||
|
scale = 15,
|
||||||
|
spread = {x = 15, y = 15, z = 15},
|
||||||
|
seed = 49,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local hilly_lands = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = 15,
|
||||||
|
scale = 12,
|
||||||
|
spread = {x = 20, y = 20, z = 20},
|
||||||
|
seed = 54321,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.5,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = 15,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 25, y = 25, z = 25},
|
||||||
|
seed = 50,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 40,
|
||||||
|
scale = 15,
|
||||||
|
spread = {x = 20, y = 20, z = 20},
|
||||||
|
seed = 51,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local low_mountains = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = 30,
|
||||||
|
scale = 20,
|
||||||
|
spread = {x = 25, y = 25, z = 25},
|
||||||
|
seed = 11111,
|
||||||
|
octaves = 4,
|
||||||
|
persistence = 0.5,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = 5,
|
||||||
|
scale = 15,
|
||||||
|
spread = {x = 30, y = 30, z = 30},
|
||||||
|
seed = 52,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 30,
|
||||||
|
scale = 15,
|
||||||
|
spread = {x = 25, y = 25, z = 25},
|
||||||
|
seed = 53,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local high_mountains = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = 60,
|
||||||
|
scale = 35,
|
||||||
|
spread = {x = 30, y = 30, z = 30},
|
||||||
|
seed = 22222,
|
||||||
|
octaves = 4,
|
||||||
|
persistence = 0.55,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = -10,
|
||||||
|
scale = 15,
|
||||||
|
spread = {x = 35, y = 35, z = 35},
|
||||||
|
seed = 54,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 20,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 30, y = 30, z = 30},
|
||||||
|
seed = 55,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local highest_peaks = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = 100,
|
||||||
|
scale = 50,
|
||||||
|
spread = {x = 40, y = 40, z = 40},
|
||||||
|
seed = 33333,
|
||||||
|
octaves = 5,
|
||||||
|
persistence = 0.6,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = -30,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 50, y = 50, z = 50},
|
||||||
|
seed = 56,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 10,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 40, y = 40, z = 40},
|
||||||
|
seed = 57,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local rivers = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = -5,
|
||||||
|
scale = 2,
|
||||||
|
spread = {x = 5, y = 5, z = 100},
|
||||||
|
seed = 44444,
|
||||||
|
octaves = 2,
|
||||||
|
persistence = 0.3,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = 10,
|
||||||
|
scale = 5,
|
||||||
|
spread = {x = 50, y = 50, z = 50},
|
||||||
|
seed = 58,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 80,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 20, y = 20, z = 20},
|
||||||
|
seed = 59,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local lakes = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = -8,
|
||||||
|
scale = 2,
|
||||||
|
spread = {x = 15, y = 15, z = 15},
|
||||||
|
seed = 55555,
|
||||||
|
octaves = 2,
|
||||||
|
persistence = 0.3,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = 10,
|
||||||
|
scale = 5,
|
||||||
|
spread = {x = 30, y = 30, z = 30},
|
||||||
|
seed = 60,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 90,
|
||||||
|
scale = 5,
|
||||||
|
spread = {x = 20, y = 20, z = 20},
|
||||||
|
seed = 61,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local rocky_shores = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = 2,
|
||||||
|
scale = 4,
|
||||||
|
spread = {x = 8, y = 8, z = 8},
|
||||||
|
seed = 66666,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.5,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = 15,
|
||||||
|
scale = 8,
|
||||||
|
spread = {x = 15, y = 15, z = 15},
|
||||||
|
seed = 62,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 70,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 15, y = 15, z = 15},
|
||||||
|
seed = 63,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local rocky_islands = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = 8,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 12, y = 12, z = 12},
|
||||||
|
seed = 77777,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.5,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = 20,
|
||||||
|
scale = 8,
|
||||||
|
spread = {x = 20, y = 20, z = 20},
|
||||||
|
seed = 64,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 60,
|
||||||
|
scale = 15,
|
||||||
|
spread = {x = 20, y = 20, z = 20},
|
||||||
|
seed = 65,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local swamp_land = {
|
||||||
|
['landscape'] = {
|
||||||
|
offset = 1,
|
||||||
|
scale = 2,
|
||||||
|
spread = {x = 12, y = 12, z = 12},
|
||||||
|
seed = 88888,
|
||||||
|
octaves = 2,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['temp'] = {
|
||||||
|
offset = 25,
|
||||||
|
scale = 5,
|
||||||
|
spread = {x = 15, y = 15, z = 15},
|
||||||
|
seed = 66,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
['humidity'] = {
|
||||||
|
offset = 85,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 15, y = 15, z = 15},
|
||||||
|
seed = 67,
|
||||||
|
octaves = 3,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
local v = vector.new
|
||||||
|
|
||||||
|
for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', ocean[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#81c948', common_lands[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#187726', foresty_lands[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#357a60', hilly_lands[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#5a7269', low_mountains[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#773b18', high_mountains[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#a3a3a3', highest_peaks[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#182077', rivers[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#06f5ff', lakes[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#677a48', rocky_shores[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#e4dc36', rocky_islands[c])
|
||||||
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#3b7718', swamp_land[c])
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
--[[
|
||||||
local land1 = {
|
local land1 = {
|
||||||
offset = -10,
|
offset = -10,
|
||||||
scale = 5,
|
scale = 5,
|
||||||
@@ -145,7 +532,7 @@ mapGenerator:register2DPeaks('midgard',
|
|||||||
v(200, 0, 100),
|
v(200, 0, 100),
|
||||||
v(-300, 0, -200),
|
v(-300, 0, -200),
|
||||||
})--]]
|
})--]]
|
||||||
|
--[[
|
||||||
for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
|
for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', land1)
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#4978c6', land1)
|
||||||
mapGenerator:registerLayerNoiseColor('midgard', c, '#77ea72', land2)
|
mapGenerator:registerLayerNoiseColor('midgard', c, '#77ea72', land2)
|
||||||
@@ -168,13 +555,9 @@ for _, c in ipairs({'landscape', 'temp', 'humidity'}) do
|
|||||||
color = '#4978c6',
|
color = '#4978c6',
|
||||||
pos = vector.new(-512, 0, 512)
|
pos = vector.new(-512, 0, 512)
|
||||||
},
|
},
|
||||||
})--]]
|
})
|
||||||
end
|
end
|
||||||
|
--]]
|
||||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 100,{x=0, y=0}, 'landscape')
|
|
||||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 150,{x=0, y=0}, 'temp')
|
|
||||||
mapGenerator:register2DPeaksFromFile('midgard', 'map.ff', 200,{x=0, y=0}, 'humidity')
|
|
||||||
|
|
||||||
-- [[
|
-- [[
|
||||||
mapGenerator:registerCavern('midgard', 'cavern1', {
|
mapGenerator:registerCavern('midgard', 'cavern1', {
|
||||||
minY = -48,
|
minY = -48,
|
||||||
|
|||||||
BIN
mods/ENVIRONMENT/mapGenerator/textures/maps/map.png
Normal file
BIN
mods/ENVIRONMENT/mapGenerator/textures/maps/map.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Reference in New Issue
Block a user