This commit is contained in:
Andrew Miner
2026-10-26 11:07:59 -06:00
parent bfd7f78a69
commit a822ebbdfd
25 changed files with 178 additions and 181 deletions
+45 -40
View File
@@ -1,37 +1,34 @@
-- Imports & Exports -------------------------------------------------------------------------------
local biomes = _G["jvmi_biomes"]
local core = _G["core"]
local math = _G["math"]
local mapgen = _G["mapgen"]
local table = _G["jvmi_table"]
local vector = _G["vector"]
local core = _G.core
local vector = _G.vector
-- Since this script runs inside the mapgen environment, we can't count on the jvmi_constants mod
-- to have been loaded. Instead, we just need to load the constants manually.
local jvmi_constants_path = core.get_modpath("jvmi_constants")
dofile(jvmi_constants_path.."/constants.lua")
local C = _G["jvmi_constants"]
local A = C.ALTITUDE
local path = core.get_game_info().path
local C = dofile(path.."/common/constants.lua")
local Region = dofile(path.."/common/region.lua")
local table = dofile(path.."/common/table.lua")
local Region = mapgen.Region
local biomes = dofile(core.get_modpath("jvmi_biomes").."/mapenv.lua")
-- Constants ---------------------------------------------------------------------------------------
local A = C.ALTITUDE
local TERRAIN_TYPES = nil
local TERRAIN_TYPE_NOISE = nil
-- Common Node Content Ids -----------------------------------------------------
local AIR_ID = core.CONTENT_AIR
local BEDROCK_ID = core.get_content_id("jvmi_nodes:bedrock")
local STONE_ID = core.get_content_id("jvmi_nodes:stone")
local WATER_ID = core.get_content_id("jvmi_nodes:water_source")
--[[ Create a deep clone of the shared terrain types as we need to augment the entries. ]]--
local TERRAIN_TYPES = nil
-- Private -----------------------------------------------------------------------------------------
local private = {
--[[ A share object which assists in generating regions of the map. ]]--
--[[ A shared object which assists in generating regions of the map. ]]--
region = Region:new()
}
@@ -43,31 +40,27 @@ local private = {
written back to the same map.
]]--
function private.assign_altitudes(region)
local pos = vector:new()
local pos = vector:new(0, 0, 0)
region.iterate_columns(function(x, z)
region:iterate_columns(function(x, z)
local altitude = 0
pos.x, pos.y = x, z
pos.x, pos.y = x, z -- odd, but as required by get_2d
for _, blend in ipairs(region:get_meta(Region.META.TERRAIN_BLEND)) do
for _, blend in ipairs(region:get_meta(Region.META.TERRAIN_BLEND, x, z)) do
local terrain = TERRAIN_TYPES[blend.terrain_type]
local contribution = blend.weight * terrain.noise:get_2d(pos)
altitude = altitude + contribution
end
region:set_meta(Region.META.ALTITUDE, x, z, altitude)
end)
end
--[[
]]--
function private.assign_biomes(region)
end
--[[
Compute the combination of terrain types which contribute to each map location.
This function uses a set of individual terrain types defined by `C.TERRAIN_TYPES`. An overall
terrain noise generator, `C.TERRAIN_TYPE_NOISE`, is used to determine which terrain type should
This function uses a set of individual terrain types defined by `TERRAIN_TYPES`. An overall
terrain noise generator, `TERRAIN_TYPE_NOISE`, is used to determine which terrain type should
appear at a given location.
To avoid abrupt lines where we shift from one terrain type to another, the `C.TERRAIN_BLEND`
@@ -76,7 +69,7 @@ end
Finally, we want the map to make up an island with a smooth transition from higher-altitude
terrain in the center to deep ocean terrain at the edges. So, we modify the values from
`C.TERRAIN_TYPE_NOISE` to force them lower and lower as you move toward `C.TERRAIN_RADIUS`. By
`TERRAIN_TYPE_NOISE` to force them lower and lower as you move toward `C.TERRAIN_RADIUS`. By
the time you reach that distance from the center of the islands, the terrain selection will be
pinned to the lowest possible terrain type.
@@ -91,12 +84,12 @@ function private.assign_terrain_meta(region)
local radius_squared = C.TERRAIN_RADIUS * C.TERRAIN_RADIUS
local pos = { x = 0, y = 0, z = 0 }
region.iterate_columns(function(x, z)
region:iterate_columns(function(x, z)
local radius_weight = ((x * x) + (z * z)) / radius_squared
radius_weight = math.max(0, math.min(1, 1.0 - radius_weight))
pos.x, pos.y = x, z
local raw_index = (C.TERRAIN_TYPE_NOISE:get_2d(pos) + 2) / 2
local raw_index = (TERRAIN_TYPE_NOISE:get_2d(pos) + 2) / 2
raw_index = math.max(0, math.min(1, raw_index))
raw_index = raw_index * radius_weight
@@ -120,7 +113,7 @@ function private.assign_terrain_meta(region)
end
end
region:set_meta(Region.META_TERRAIN_BLEND, x, z, blend)
region:set_meta(Region.META.TERRAIN_BLEND, x, z, blend)
end
end)
end
@@ -132,7 +125,7 @@ end
region:Region - the portion of the world currently being generated
]]--
function private.fill_bedrock(region)
region.iterate_plane(A.BEDROCK, function(x, y, z)
region:iterate_plane(A.BEDROCK, function(x, y, z)
region:set_content_id(x, y, z, BEDROCK_ID)
region:set_content_id(x, y + 1, z, STONE_ID)
end)
@@ -145,7 +138,7 @@ end
region:Region - the portion of the world currently being generated
]]--
function private.fill_ocean(region)
region.iterate_below(A.SURFACE, function(x, y, z)
region:iterate_below(A.SURFACE, function(x, y, z)
if region:get_content_id(x, y, z) == AIR_ID then
region:set_content_id(x, y, z, WATER_ID)
end
@@ -160,7 +153,13 @@ end
]]--
function private.fill_terrain(region)
region:iterate_fill(function(x, y, z)
local altitude = region:get_meta(Region.META.ALTITUDE)
local altitude = region:get_meta(Region.META.ALTITUDE, x, z)
if type(altitude) ~= "number" then
error(
"expected altitude at ("..x..","..z..") to be a number, "..
"but was a "..type(altitude)
)
end
if y > altitude then return end
region:set_content_id(x, y, z, STONE_ID)
end)
@@ -189,6 +188,12 @@ function private.make_noise_in_range(lowest, highest)
})
end
--[[ Perform any setup this module requires when it first loads. ]]--
function private.on_load()
private.prepare_terrain_table()
TERRAIN_TYPE_NOISE = core.get_value_noise(C.TERRAIN_TYPE_NOISE_PARAMS)
end
--[[
Clone the `C.TERRAIN_TYPES` table and add pre-computed values to it.
@@ -227,7 +232,7 @@ end
core.register_on_generated(function(voxels, fill_min, fill_max)
local region = private.region
region:read(voxels, fill_min, fill_max)
region:read_voxels(voxels, fill_min, fill_max)
private.assign_terrain_meta(region)
private.assign_altitudes(region)
@@ -236,12 +241,12 @@ core.register_on_generated(function(voxels, fill_min, fill_max)
private.fill_bedrock(region)
private.fill_ocean(region)
biomes.apply_biomes(region)
biomes.apply_to(region)
region:save()
region:save_voxels()
end)
-- Script ------------------------------------------------------------------------------------------
private.prepare_terrain_table()
private.on_load()