Mapgen: add smooth mapgen
This commit is contained in:
@@ -12,19 +12,35 @@ local mapGenerator = MapGen.Class:new()
|
|||||||
mapGenerator:RegisterLayer("world", -1000, 500)
|
mapGenerator:RegisterLayer("world", -1000, 500)
|
||||||
|
|
||||||
mapGenerator:RegisterRegion("world",
|
mapGenerator:RegisterRegion("world",
|
||||||
{x = -1000, y = 0, z = -1000},
|
{x = -100, y = 0, z = -100},
|
||||||
{x = 1000, y = 0, z = 1000},
|
{x = 100, y = 0, z = 100},
|
||||||
{
|
{
|
||||||
landscapeNoise = {
|
landscapeNoise = {
|
||||||
offset = 0,
|
offset = 50,
|
||||||
scale = 10,
|
scale = 10,
|
||||||
spread = {x = 10, y = 10, z = 10},
|
spread = {x = 10, y = 10, z = 10},
|
||||||
seed = 47,
|
seed = 47,
|
||||||
octaves = 4,
|
octaves = 8,
|
||||||
persistence = 0.3,
|
persistence = 0.4,
|
||||||
lacunarity = 3,
|
lacunarity = 2,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
true)
|
true)
|
||||||
|
|
||||||
|
mapGenerator:RegisterRegion("world",
|
||||||
|
{x = 50, y = 0, z = -100},
|
||||||
|
{x = 150, y = 0, z = 100},
|
||||||
|
{
|
||||||
|
landscapeNoise = {
|
||||||
|
offset = 100,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 100, y = 100, z = 100},
|
||||||
|
seed = 47,
|
||||||
|
octaves = 8,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
true)--]]
|
||||||
|
|
||||||
mapGenerator:run()
|
mapGenerator:run()
|
||||||
|
|||||||
@@ -11,6 +11,20 @@ local id_air = id("air")
|
|||||||
|
|
||||||
-- --- End Node's IDs
|
-- --- End Node's IDs
|
||||||
|
|
||||||
|
-- --- MapGen default moises ---
|
||||||
|
local oceanNoise
|
||||||
|
|
||||||
|
local oceanNoiseParams = {
|
||||||
|
offset = -30,
|
||||||
|
scale = 10,
|
||||||
|
spread = {x = 100, y = 100, z = 100},
|
||||||
|
seed = 47,
|
||||||
|
octaves = 8,
|
||||||
|
persistence = 0.4,
|
||||||
|
lacunarity = 2,
|
||||||
|
}
|
||||||
|
-- --- End default noises ---
|
||||||
|
|
||||||
local modInfo = Mod.getInfo()
|
local modInfo = Mod.getInfo()
|
||||||
local require = modInfo.require
|
local require = modInfo.require
|
||||||
|
|
||||||
@@ -101,8 +115,6 @@ function MapGen:RegisterRegion(layerName, minPos, maxPos, multinoise, regionIs2D
|
|||||||
---@type MapGen.Region
|
---@type MapGen.Region
|
||||||
local region = Region:new(minPos, maxPos, multinoise)
|
local region = Region:new(minPos, maxPos, multinoise)
|
||||||
|
|
||||||
--TODO: реализовать регистрацию дополнительных регионов для сглаживания шумов
|
|
||||||
|
|
||||||
layer:addRegion(region)
|
layer:addRegion(region)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -121,6 +133,21 @@ function MapGen:initRegionsMultinoise()
|
|||||||
self.multinoiseInitialized = true
|
self.multinoiseInitialized = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
---@return number
|
||||||
|
local function calculateWeight(minPos, maxPos, x, z)
|
||||||
|
--TODO: написать поддержку коэффициента, чтобы функция была не линейной и отключение учитывание веса
|
||||||
|
local centerX = (minPos.x + maxPos.x) / 2
|
||||||
|
local centerZ = (minPos.z + maxPos.z) / 2
|
||||||
|
|
||||||
|
local distX = 1 - math.abs(x - centerX) / (math.abs((maxPos.x - minPos.x)) / 2)
|
||||||
|
local distZ = 1 - math.abs(z - centerZ) / (math.abs((maxPos.z - minPos.z)) / 2)
|
||||||
|
|
||||||
|
local weight = math.min(distX, distZ)
|
||||||
|
|
||||||
|
return weight
|
||||||
|
end
|
||||||
|
|
||||||
local function landscapeGeneration(mapGenerator, data, index, x, y, z)
|
local function landscapeGeneration(mapGenerator, data, index, x, y, z)
|
||||||
|
|
||||||
-- If generation occurs outside the layers, then a void is generated
|
-- If generation occurs outside the layers, then a void is generated
|
||||||
@@ -131,32 +158,33 @@ local function landscapeGeneration(mapGenerator, data, index, x, y, z)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
-- If generation occurs outside the regions, then a ocean is generated
|
-- The ocean floor height is used as the default value.
|
||||||
local regions = layer:getRegionsByPos(x, y, z)
|
if oceanNoise == nil then
|
||||||
if table.is_empty(regions) then
|
oceanNoise = core.get_value_noise(oceanNoiseParams)
|
||||||
-- TODO: прописать генерацию океана
|
|
||||||
|
|
||||||
return
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local noiseHeightValue = 0
|
local noiseHeightValue = oceanNoise:get_2d({x = x, y = z})
|
||||||
|
|
||||||
-- The height noise values of all regions that a node is part of are added together...
|
local regions = layer:getRegionsByPos(x, y, z)
|
||||||
|
|
||||||
|
-- The height noise values of all regions that a node is part of are added together.
|
||||||
---@param region MapGen.Region
|
---@param region MapGen.Region
|
||||||
for _, region in ipairs(regions) do
|
for _, region in ipairs(regions) do
|
||||||
local noise = region:getMultinoise().landscapeNoise
|
local noise = region:getMultinoise().landscapeNoise
|
||||||
|
|
||||||
noiseHeightValue = noiseHeightValue + noise:get_2d({x = x, y = z})
|
-- The further a point is from the center of a region, the less noise affects it.
|
||||||
|
local weight = calculateWeight(region:getMinPos(), region:getMaxPos(), x, z)
|
||||||
|
|
||||||
|
noiseHeightValue = noiseHeightValue + ( noise:get_2d({x = x, y = z}) * weight )
|
||||||
end
|
end
|
||||||
|
|
||||||
-- ...And the average height is found: this provides smoothing
|
if y > noiseHeightValue and y >= 0 then
|
||||||
noiseHeightValue = mathCeil(noiseHeightValue / #regions)
|
|
||||||
|
|
||||||
if y > noiseHeightValue then
|
|
||||||
data[index] = id_air
|
data[index] = id_air
|
||||||
|
elseif y < noiseHeightValue then
|
||||||
|
data[index] = core.get_content_id("rocks:falmyte") -- TODO: сделать генерацию разных камней
|
||||||
else
|
else
|
||||||
data[index] = core.get_content_id("rocks:sylite") -- TODO: прописать заполнение камнем
|
data[index] = core.get_content_id("liquids:water_source")
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user