mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-12-23 08:29:34 +01:00
a55293d893
Some savings due to, e.g., `area:iter`, and some unnecessary code removal / code simplifications Some additional logging for getting more precise timings. Not very spectacular, but also not invasive. The slow parts seem to be data transfer to/from the voxelmanip, lighting/water updates and the ore generation in nether, so not much in lua code. Reviewed-on: https://git.minetest.land/VoxeLibre/VoxeLibre/pulls/4566 Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com> Co-authored-by: kno10 <erich.schubert@gmail.com> Co-committed-by: kno10 <erich.schubert@gmail.com>
143 lines
5.4 KiB
Lua
143 lines
5.4 KiB
Lua
local registered_generators = {}
|
|
|
|
local lvm, nodes, param2 = 0, 0, 0
|
|
local lvm_buffer, lvm_buffer2 = {}, {}
|
|
|
|
local logging = minetest.settings:get_bool("mcl_logging_mapgen", false)
|
|
local log_timing = minetest.settings:get_bool("mcl_logging_mapgen_timing", false) -- detailed, for performance debugging
|
|
|
|
local function run_generators(minp, maxp, blockseed)
|
|
if nodes == 0 then return end
|
|
for _, rec in ipairs(registered_generators) do
|
|
if rec.nf then
|
|
local gt1 = os.clock()
|
|
rec.nf(vector.copy(minp), vector.copy(maxp), blockseed) -- defensive copies against some generator changing the vectors
|
|
if log_timing then
|
|
minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", rec.id, minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt1)*1000))
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
minetest.register_on_generated(function(minp, maxp, blockseed)
|
|
local t1 = os.clock()
|
|
if lvm > 0 then
|
|
local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
|
|
local area = VoxelArea(emin, emax)
|
|
local data = vm:get_data(lvm_buffer)
|
|
local data2 = param2 > 0 and vm:get_param2_data(lvm_buffer2)
|
|
if log_timing then
|
|
minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "get_data", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - t1)*1000))
|
|
end
|
|
|
|
local lvm_used, shadow, deco_used, deco_table, ore_used, ore_table = false, false, false, false, false, false
|
|
for _, rec in ipairs(registered_generators) do
|
|
if rec.vf then
|
|
local gt1 = os.clock()
|
|
local p1, p2 = vector.copy(minp), vector.copy(maxp) -- defensive copies against some generator changing the vectors
|
|
local e1, e2 = vector.copy(emin), vector.copy(emax) -- defensive copies against some generator changing the vectors
|
|
local lvm_used0, shadow0, deco, ore = rec.vf(vm, data, data2, e1, e2, area, p1, p2, blockseed)
|
|
lvm_used = lvm_used or lvm_used0
|
|
shadow = shadow or shadow0
|
|
if deco and type(deco) == "table" then
|
|
deco_table = deco
|
|
elseif deco then
|
|
deco_used = true
|
|
end
|
|
if ore and type(ore) == "table" then
|
|
ore_table = ore
|
|
elseif deco then
|
|
ore_used = true
|
|
end
|
|
if log_timing then
|
|
minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", rec.id, minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt1)*1000))
|
|
end
|
|
end
|
|
end
|
|
|
|
if lvm_used then
|
|
local gt1 = os.clock()
|
|
vm:set_data(data)
|
|
if param2 > 0 then vm:set_param2_data(data2) end
|
|
if log_timing then
|
|
minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "set_data", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt1)*1000))
|
|
end
|
|
local gt2 = os.clock()
|
|
if deco_table then
|
|
minetest.generate_decorations(vm,vector.new(minp.x,deco_table.min,minp.z),vector.new(maxp.x,deco_table.max,maxp.z))
|
|
elseif deco_used then
|
|
minetest.generate_decorations(vm)
|
|
end
|
|
if log_timing and (deco_table or deco_used) then
|
|
minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "decorations", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt2)*1000))
|
|
end
|
|
local gt3 = os.clock()
|
|
if ore_table then
|
|
minetest.generate_ores(vm,vector.new(minp.x,ore_table.min,minp.z),vector.new(maxp.x,ore_table.max,maxp.z))
|
|
elseif ore_used then
|
|
minetest.generate_ores(vm)
|
|
end
|
|
if log_timing and (ore_table or ore_used) then
|
|
minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "ores", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt3)*1000))
|
|
end
|
|
local gt4 = os.clock()
|
|
vm:calc_lighting(minp, maxp, shadow)
|
|
vm:update_liquids()
|
|
vm:write_to_map(false)
|
|
if log_timing then
|
|
minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "light/write/liquids", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - gt4)*1000))
|
|
end
|
|
end
|
|
end
|
|
|
|
run_generators(minp, maxp, blockseed)
|
|
|
|
mcl_vars.add_chunk(minp)
|
|
if logging then
|
|
minetest.log("action", string.format("[mcl_mapgen_core] %-20s %s ... %s %8.2fms", "Generating chunk", minetest.pos_to_string(minp), minetest.pos_to_string(maxp), (os.clock() - t1)*1000))
|
|
end
|
|
end)
|
|
|
|
function minetest.register_on_generated(node_function)
|
|
mcl_mapgen_core.register_generator("mod_"..minetest.get_current_modname().."_"..tostring(#registered_generators+1), nil, node_function)
|
|
end
|
|
|
|
function mcl_mapgen_core.register_generator(id, lvm_function, node_function, priority, needs_param2)
|
|
if not id then return end
|
|
|
|
local priority = priority or 5000
|
|
|
|
if lvm_function then lvm = lvm + 1 end
|
|
if node_function then nodes = nodes + 1 end
|
|
if needs_param2 then param2 = param2 + 1 end
|
|
|
|
local new_record = {
|
|
id = id,
|
|
i = priority,
|
|
vf = lvm_function,
|
|
nf = node_function,
|
|
needs_param2 = needs_param2,
|
|
}
|
|
|
|
table.insert(registered_generators, new_record)
|
|
table.sort(registered_generators, function(a, b)
|
|
return (a.i < b.i) or ((a.i == b.i) and a.vf and (b.vf == nil))
|
|
end)
|
|
end
|
|
|
|
function mcl_mapgen_core.unregister_generator(id)
|
|
local index
|
|
for i, gen in ipairs(registered_generators) do
|
|
if gen.id == id then
|
|
index = i
|
|
break
|
|
end
|
|
end
|
|
if not index then return end
|
|
local rec = registered_generators[index]
|
|
table.remove(registered_generators, index)
|
|
if rec.vf then lvm = lvm - 1 end
|
|
if rec.nf then nodes = nodes - 1 end
|
|
if rec.needs_param2 then param2 = param2 - 1 end
|
|
--if rec.needs_level0 then level0 = level0 - 1 end
|
|
end
|