mtcontrib/mapgen_rivers
1
0
Fork 0
mirror of https://gitlab.com/gaelysam/mapgen_rivers.git synced 2024-12-29 12:20:41 +01:00
Code Issues Projects Releases Wiki Activity

Adapt to multithreading, now it is working!

Browse Source
This commit is contained in:
Gaël C 2024-01-05 00:02:30 +01:00
parent f26fd1cccb
commit e9fa7f9a5c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mapgen.lua
View File

@ -15,7 +15,7 @@ local elevation_chill = tonumber(settings:get('elevation_chill'))
local use_distort = settings:get_bool('distort') local use_distort = settings:get_bool('distort')
local use_biomes = settings:get_bool('biomes') local use_biomes = settings:get_bool('biomes')
local use_biomegen_mod = use_biomes and minetest.global_exists('biomegen') local use_biomegen_mod = use_biomes and minetest.global_exists('biomegen')
use_biomes = use_biomes and minetest.global_exists('default') and not use_biomegen_mod use_biomes = use_biomes and minetest.get_modpath("default") and not use_biomegen_mod
local noiseparams = { local noiseparams = {
distort_x = settings:get_np_group('np_distort_x'), distort_x = settings:get_np_group('np_distort_x'),
@ -77,7 +77,7 @@ local function init_mapgen(chulens)
end end
end end
local function generate(minp, maxp, seed) local function generate(vm, minp, maxp, seed)
minetest.log("info", ("[mapgen_rivers] Generating from %s to %s"):format(minetest.pos_to_string(minp), minetest.pos_to_string(maxp))) minetest.log("info", ("[mapgen_rivers] Generating from %s to %s"):format(minetest.pos_to_string(minp), minetest.pos_to_string(maxp)))
local chulens = { local chulens = {
@ -175,7 +175,7 @@ local function generate(minp, maxp, seed)
c_ice = minetest.get_content_id("default:ice") c_ice = minetest.get_content_id("default:ice")
end end
local vm, emin, emax = minetest.get_mapgen_object("voxelmanip") local emin, emax = vm:get_emerged_area()
vm:get_data(data) vm:get_data(data)
local a = VoxelArea:new({MinEdge = emin, MaxEdge = emax}) local a = VoxelArea:new({MinEdge = emin, MaxEdge = emax})
@ -276,7 +276,9 @@ local function generate(minp, maxp, seed)
vm:set_lighting({day = 0, night = 0}) vm:set_lighting({day = 0, night = 0})
vm:calc_lighting() vm:calc_lighting()
vm:update_liquids() vm:update_liquids()
if mapgen_rivers.thread == "main" then
vm:write_to_map() vm:write_to_map()
end
local t = os.clock()-t0 local t = os.clock()-t0
ngen = ngen + 1 ngen = ngen + 1
@ -285,7 +287,15 @@ local function generate(minp, maxp, seed)
minetest.log("verbose", ("[mapgen_rivers] Done in %5.3f s"):format(t)) minetest.log("verbose", ("[mapgen_rivers] Done in %5.3f s"):format(t))
end end
if mapgen_rivers.thread == "main" then
minetest.register_on_generated(function(minp, maxp, seed)
local vm = minetest.get_mapgen_object("voxelmanip")
generate(vm, minp, maxp, seed)
end)
elseif mapgen_rivers.thread == "mapgen" then
minetest.register_on_generated(generate) minetest.register_on_generated(generate)
end
minetest.register_on_shutdown(function() minetest.register_on_shutdown(function()
if ngen == 0 then if ngen == 0 then
return return