Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-22 10:31:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor mcl_title to be more efficient

Browse source
This commit is contained in:
AFCMS 2021-07-09 11:34:23 +02:00
parent cbfec5c5c8
commit 8e931e92f5
1 changed files with 90 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
mods/HUD/mcl_title/init.lua
View file

@ -8,8 +8,17 @@
--TODO: allow colorizing and styling of part of the text (NEEDS ENGINE CHANGE!!!)
--TODO: exactly mc like layout
--Note that the table storing timeouts use playername as index insteed of player objects (faster)
--This is intended in order to speedup the process of removing HUD elements the the timeout is up
local huds_idx = {}
local hud_hide_timeouts = {}
hud_hide_timeouts.title = {}
hud_hide_timeouts.subtitle = {}
hud_hide_timeouts.actionbar = {}
huds_idx.title = {}
huds_idx.subtitle = {}
huds_idx.actionbar = {}
@ -19,10 +28,13 @@ mcl_title.defaults = {fadein = 10, stay = 70, fadeout = 20}
mcl_title.layout = {}
mcl_title.layout.title = {position = {x = 0.5, y = 0.5}, alignment = {x = 0, y = -1.3}, size = 7}
mcl_title.layout.subtitle = {position = {x = 0.5, y = 0.5}, alignment = {x = 0, y = 1.7}, size = 4}
mcl_title.layout.actionbar = {position = {x = 0.5, y = 1}, alignment = {x = 0, y = -11}, size = 2}
mcl_title.layout.actionbar = {position = {x = 0.5, y = 1}, alignment = {x = 0, y = 0}, size = 1}
local get_color = mcl_util.get_color
local string = string
local pairs = pairs
local function gametick_to_secondes(gametick)
return gametick / 20
end
@ -32,15 +44,64 @@ end
local player_params = {}
minetest.register_on_joinplayer(function(player)
player_params[player] = {
local playername = player:get_player_name()
player_params[playername] = {
stay = gametick_to_secondes(mcl_title.defaults.stay),
--fadeIn = gametick_to_secondes(mcl_title.defaults.fadein),
--fadeOut = gametick_to_secondes(mcl_title.defaults.fadeout),
}
local _, hex_color = get_color("white")
huds_idx.title[player] = player:hud_add({
hud_elem_type = "text",
position = mcl_title.layout.title.position,
alignment = mcl_title.layout.title.alignment,
text = "",
--bold = data.bold,
--italic = data.italic,
size = {x = mcl_title.layout.title.size},
number = hex_color,
z_index = 100,
})
huds_idx.subtitle[player] = player:hud_add({
hud_elem_type = "text",
position = mcl_title.layout.subtitle.position,
alignment = mcl_title.layout.subtitle.alignment,
text = "",
--bold = data.bold,
--italic = data.italic,
size = {x = mcl_title.layout.subtitle.size},
number = hex_color,
z_index = 100,
})
huds_idx.actionbar[player] = player:hud_add({
hud_elem_type = "text",
position = mcl_title.layout.actionbar.position,
offset = {x = 0, y = -210},
alignment = mcl_title.layout.actionbar.alignment,
--bold = data.bold,
--italic = data.italic,
text = "",
size = {x = mcl_title.layout.actionbar.size},
number = hex_color,
z_index = 100,
})
end)
minetest.register_on_leaveplayer(function(player)
player_params = nil
local playername = player:get_player_name()
--remove player params from the list
player_params[player] = nil
--remove HUD idx from the list (HUD elements are removed by the engine)
huds_idx.title[player] = nil
huds_idx.subtitle[player] = nil
huds_idx.actionbar[player] = nil
--remove timers form list
hud_hide_timeouts.title[playername] = nil
hud_hide_timeouts.subtitle[playername] = nil
hud_hide_timeouts.actionbar[playername] = nil
end)
function mcl_title.params_set(player, data)
@ -66,43 +127,22 @@ function mcl_title.set(player, type, data)
return false
end
if huds_idx[type][player] then
player:hud_remove(huds_idx[type][player])
end
--TODO: enable this code then Fleckenstein's pr get merged (in about 5-6 years)
--if data.bold == nil then data.bold = false end
--if data.italic == nil then data.italic = false end
local stay = mcl_title.params_get(player).stay
player:hud_change(huds_idx[type][player], "text", data.text)
player:hud_change(huds_idx[type][player], "number", hex_color)
huds_idx[type][player] = player:hud_add({
hud_elem_type = "text",
position = mcl_title.layout[type].position,
alignment = mcl_title.layout[type].alignment,
text = data.text,
--bold = data.bold,
--italic = data.italic,
size = {x = mcl_title.layout[type].size},
number = hex_color,
z_index = 1100,
})
minetest.after(stay, function()
if huds_idx[type][player] then
player:hud_remove(huds_idx[type][player])
end
huds_idx[type][player] = nil
end)
hud_hide_timeouts[type][player:get_player_name()] = data.stay or mcl_title.params_get(player).stay
return true
end
function mcl_title.remove(player, type)
if huds_idx[type][player] then
player:hud_remove(huds_idx[type][player])
if player then
player:hud_change(huds_idx[type][player], "text", "")
end
huds_idx[type][player] = nil
end
function mcl_title.clear(player)
@ -115,6 +155,26 @@ minetest.register_on_dieplayer(function(player)
mcl_title.clear(player)
end)
minetest.register_globalstep(function(dtime)
local new_timeouts = {
title = {},
subtitle = {},
actionbar = {},
}
for element, content in pairs(hud_hide_timeouts) do
for name, timeout in pairs(content) do
timeout = timeout - dtime
if timeout <= 0 then
local player = minetest.get_player_by_name(name)
mcl_title.remove(player, element)
else
new_timeouts[element][name] = timeout
end
end
end
hud_hide_timeouts = new_timeouts
end)
--TEMP STUFF!!
--TODO: remove then testing/tweaking done