Fonts configurable in signs, posters and steles

This commit is contained in:
Pierre-Yves Rollo 2018-11-23 11:34:55 +01:00
parent 59ae9fa4d1
commit 367e5026dd
4 changed files with 93 additions and 55 deletions

View File

@ -101,16 +101,18 @@ local function show_font_formspec(playername)
end
table.sort(fonts)
local fs = 'size[4,'..(#fonts + 0.8)..']'
..default.gui_bg..default.gui_bg_img..default.gui_slots
..'button_exit[0,'..(#fonts)..';4,1;cancel;Cancel]'
local fs = string.format(
"size[4,%s]%s%s%sbutton_exit[0,%s;4,1;cancel;Cancel]",
#fonts + 0.8, default.gui_bg, default.gui_bg_img, default.gui_slots,
#fonts)
for line = 1, #fonts do
local font = font_api.get_font(fonts[line])
fs = fs..'image[0.1,'..(line-0.9)..';4.5,0.8;'
..font:make_text_texture(font.name, font:get_height()*5,
local texture = font:make_text_texture(font.name, font:get_height()*5,
font:get_height()*1.2, 1, "center", "top", "#fff")
..']button_exit[0,'..(line-1)..';4,1;font_'..font.name..';]'
fs = string.format(
"%simage[0.1,%s;4.5,0.8;%s]button_exit[0,%s;4,1;font_%s;]",
fs, line-0.9, texture, line-1, font.name)
end
minetest.show_formspec(context.playername, modname..':font_list', fs)
end
@ -127,7 +129,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
local playername = player:get_player_name()
local context = get_context(playername)
if minetest.is_protected(context.pos, playername) then
if not context.pos
or minetest.is_protected(context.pos, playername) then
return true
end
@ -139,16 +142,26 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
display_api.update_entities(context.pos)
end
end
-- Using after to avoid the "double close" bug
minetest.after(0, show_node_formspec, playername, context.pos)
if context.callback and type(context.callback) == "function" then
-- Using after to avoid the "double close" bug
minetest.after(0, context.callback, playername, context.pos)
else
-- Using after to avoid the "double close" bug
minetest.after(0, show_node_formspec, playername, context.pos)
end
end
return true
end)
function font_api.show_font_list_from_pos(player, pos)
-- @param player Player viewing the form
-- @param pos Node pos
-- @param callback function(playername, pos) to be called on form close
function font_api.show_font_list(player, pos, callback)
if minetest.is_player(player) then
local context = get_context(player:get_player_name())
context.pos = pos
context.callback = callback
show_font_formspec(player:get_player_name())
end
end

View File

@ -23,51 +23,58 @@ local F = function(...) return minetest.formspec_escape(S(...)) end
-- Poster specific formspec
local function display_poster(pos, node, player)
local formspec
local meta = minetest.get_meta(pos)
local def = minetest.registered_nodes[node.name].display_entities["signs:display_text"]
local font = font_api.get_font(meta:get_string("font") or def.font_name)
local fs
local fname = string.format("%s@%s:display",
node.name, minetest.pos_to_string(pos))
-- Title texture
local titletexture = font:make_text_texture(
meta:get_string("display_text"), font:get_height()*8.4, font:get_height(), 1, "center")
meta:get_string("display_text"), font:get_height()*8.4,
font:get_height(), 1, "center")
formspec =
"size[7,9]"..
"background[0,0;7,9;signs_poster_formspec.png]"..
"image[0,-0.2;8.4,2;"..titletexture.."]"..
"textarea[0.3,1.5;7,8;;"..minetest.colorize("#111", minetest.formspec_escape(meta:get_string("text")))..";]"..
"bgcolor[#0000]"
fs = string.format([=[
size[7,9]bgcolor[#0000]
background[0,0;7,9;signs_poster_formspec.png]
image[0,-0.2;8.4,2;%s]
textarea[0.3,1.5;7,8;;%s;]]=],
titletexture,
minetest.colorize("#111",
minetest.formspec_escape(meta:get_string("text"))))
if minetest.is_protected(pos, player:get_player_name()) then
formspec = formspec..
"button_exit[2.5,8;2,1;ok;"..F("Close").."]"
fs = string.format("%sbutton_exit[2.5,8;2,1;ok;%s]", fs, F("Close"))
else
formspec = formspec..
"button[1,8;2,1;edit;"..F("Edit").."]"..
"button_exit[4,8;2,1;ok;"..F("Close").."]"
fs = string.format(
"%sbutton[1,8;2,1;edit;%s]button_exit[4,8;2,1;ok;%s]",
fs, F("Edit"), F("Close"))
end
minetest.show_formspec(player:get_player_name(),
node.name.."@"..minetest.pos_to_string(pos)..":display",
formspec)
minetest.show_formspec(player:get_player_name(), fname, fs)
end
local function edit_poster(pos, node, player)
local formspec
local meta = minetest.get_meta(pos)
local fs
local fname = string.format("%s@%s:edit",
node.name, minetest.pos_to_string(pos))
if not minetest.is_protected(pos, player:get_player_name()) then
formspec =
"size[6.5,7.5]"..
default.gui_bg .. default.gui_bg_img .. default.gui_slots ..
"field[0.5,0.7;6,1;display_text;"..F("Title")..";"..
minetest.formspec_escape(meta:get_string("display_text")).."]"..
"textarea[0.5,1.7;6,6;text;"..F("Text")..";"..
minetest.formspec_escape(meta:get_string("text")).."]"..
"button_exit[2.25,7;2,1;write;"..F("Write").."]"
minetest.show_formspec(player:get_player_name(),
node.name.."@"..minetest.pos_to_string(pos)..":edit",
formspec)
fs = string.format([=[
size[6.5,7.5]%s%s%s
field[0.5,0.7;6,1;display_text;%s;%s]
textarea[0.5,1.7;6,6;text;%s;%s]
button[1.25,7;2,1;font;%s]
button_exit[3.25,7;2,1;write;%s]]=],
default.gui_bg, default.gui_bg_img, default.gui_slots, F("Title"),
minetest.formspec_escape(meta:get_string("display_text")),
F("Text"), minetest.formspec_escape(meta:get_string("text")),
F("Title font"), F("Write"))
minetest.show_formspec(player:get_player_name(), fname, fs)
end
end
@ -80,15 +87,29 @@ local function on_receive_fields_poster(pos, formname, fields, player)
if formname == node.name.."@"..minetest.pos_to_string(pos)..":display"
and fields.edit then
edit_poster(pos, node, player)
return true
end
if formname == node.name.."@"..minetest.pos_to_string(pos)..":edit"
and (fields.write or fields.key_enter) then
meta:set_string("display_text", fields.display_text)
meta:set_string("text", fields.text)
meta:set_string("infotext", "\""..fields.display_text
.."\"\n"..S("(right-click to read more text)"))
display_api.update_entities(pos)
display_poster(pos, node, player)
then
if (fields.write or fields.font or fields.key_enter) then
meta:set_string("display_text", fields.display_text)
meta:set_string("text", fields.text)
meta:set_string("infotext", "\""..fields.display_text
.."\"\n"..S("(right-click to read more text)"))
display_api.update_entities(pos)
end
if (fields.write or fields.key_enter) then
display_poster(pos, node, player)
elseif (fields.font) then
font_api.show_font_list(player, pos, function (playername, pos)
local player = minetest.get_player_by_name(playername)
local node = minetest.get_node(pos)
if player and node then
edit_poster(pos, node, player)
end
end)
end
return true
end
end
end

View File

@ -81,7 +81,7 @@ function signs_api.on_receive_fields(pos, formname, fields, player)
end
if fields and (fields.font) then
signs_api.set_display_text(pos, fields.display_text)
font_api.show_font_list_from_pos(player, pos)
font_api.show_font_list(player, pos)
end
end
end

View File

@ -63,12 +63,14 @@ for i, material in ipairs(steles.materials) do
end,
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string("formspec", "size[6,4]"
..default.gui_bg .. default.gui_bg_img .. default.gui_slots
.."textarea[0.5,0.7;5.5,2;display_text;"
..F("Displayed text (3 lines max)")
..";${display_text}]"
.."button_exit[2,3;2,1;ok;"..F("Write").."]")
meta:set_string("formspec", string.format([=[
size[6,4]%s%s%s
textarea[0.5,0.7;5.5,2;display_text;%s;${display_text}]
button[1,3;2,1;font;%s]
button_exit[3,3;2,1;ok;%s]]=],
default.gui_bg, default.gui_bg_img, default.gui_slots,
F("Displayed text (3 lines max)"),
F("Font"), F("Write")))
display_api.on_construct(pos)
end,
on_destruct = display_api.on_destruct,
@ -76,15 +78,17 @@ for i, material in ipairs(steles.materials) do
on_receive_fields = function(pos, formname, fields, player)
if not minetest.is_protected(pos, player:get_player_name()) then
local meta = minetest.get_meta(pos)
if fields and fields.ok then
if fields.ok or fields.font then
meta:set_string("display_text", fields.display_text)
meta:set_string("infotext", "\""..fields.display_text.."\"")
display_api.update_entities(pos)
end
if fields.font then
font_api.show_font_list(player, pos)
end
end
end,
on_punch = display_api.update_entities,
})
end
end