]> git.lizzy.rs Git - signs_lib.git/blobdiff - api.lua
attempt to work around engine player model bug
[signs_lib.git] / api.lua
diff --git a/api.lua b/api.lua
index 0acc2c48a58395ec23208c411f241befbbb75cff..cac59a81ed55f5f5770d2af8b3a140a1f8976fb5 100644 (file)
--- a/api.lua
+++ b/api.lua
@@ -6,7 +6,6 @@ signs_lib.lbm_restore_nodes = {}
 signs_lib.old_fenceposts = {}
 signs_lib.old_fenceposts_replacement_signs = {}
 signs_lib.old_fenceposts_with_signs = {}
-signs_lib.allowed_poles = {}
 
 -- Settings used for a standard wood or steel wall sign
 signs_lib.standard_lines = 6
@@ -31,6 +30,11 @@ signs_lib.standard_steel_sign_sounds = table.copy(minetest.registered_items["def
 
 signs_lib.default_text_scale = {x=10, y=10}
 
+signs_lib.old_widefont_signs = {}
+
+signs_lib.block_list = {}
+signs_lib.totalblocks = 0
+
 signs_lib.standard_yaw = {
        0,
        math.pi / -2,
@@ -164,7 +168,12 @@ minetest.register_entity("signs_lib:text", {
 function signs_lib.delete_objects(pos)
        local objects = minetest.get_objects_inside_radius(pos, 0.5)
        for _, v in ipairs(objects) do
-               v:remove()
+               if v then
+                       local e = v:get_luaentity()
+                       if e and string.match(e.name, "sign.*text") then
+                               v:remove()
+                       end
+               end
        end
 end
 
@@ -178,8 +187,17 @@ function signs_lib.spawn_entity(pos, texture)
        local obj
 
        if #objects > 0 then
-               obj = objects[1]
-       else
+               for _, v in ipairs(objects) do
+                       if v then
+                               local e = v:get_luaentity()
+                               if e and e.name == "signs_lib:text" then
+                                       obj = v
+                               end
+                       end
+               end
+       end
+
+       if not obj then
                obj = minetest.add_entity(pos, "signs_lib:text")
        end
 
@@ -226,6 +244,14 @@ function signs_lib.spawn_entity(pos, texture)
        end
 end
 
+function signs_lib.set_obj_text(pos, text)
+       local split = signs_lib.split_lines_and_words
+       local text_ansi = Utf8ToAnsi(text)
+       local n = minetest.registered_nodes[minetest.get_node(pos).name]
+       signs_lib.delete_objects(pos)
+       signs_lib.spawn_entity(pos, signs_lib.make_sign_texture(split(text_ansi), pos) )
+end
+
 -- rotation
 
 function signs_lib.handle_rotation(pos, node, user, mode)
@@ -284,7 +310,6 @@ function signs_lib.handle_rotation(pos, node, user, mode)
                minetest.swap_node(tpos, { name = node.name, param2 = signs_lib.rotate_facedir[node.param2] or 0 })
        end
 
-       signs_lib.delete_objects(tpos)
        signs_lib.update_sign(tpos)
        return true
 end
@@ -540,8 +565,10 @@ local function make_line_texture(line, lineno, pos, line_width, line_height, cwi
        return table.concat(texture), lineno
 end
 
-local function make_sign_texture(lines, pos)
+function signs_lib.make_sign_texture(lines, pos)
        local node = minetest.get_node(pos)
+       local meta = minetest.get_meta(pos)
+
        local def = minetest.registered_items[node.name]
        if not def or not def.entity_info then return end
 
@@ -550,16 +577,21 @@ local function make_sign_texture(lines, pos)
        local line_height
        local char_width
        local colorbgw
+       local widemult = 1
+
+       if meta:get_int("widefont") == 1 then
+               widemult = 0.5
+       end
 
        if def.font_size and def.font_size == 31 then
                font_size = 31
-               line_width = math.floor(signs_lib.avgwidth31 * def.chars_per_line) * def.horiz_scaling
+               line_width = math.floor(signs_lib.avgwidth31 * def.chars_per_line) * (def.horiz_scaling * widemult)
                line_height = signs_lib.lineheight31
                char_width = signs_lib.charwidth31
                colorbgw = signs_lib.colorbgw31
        else
                font_size = 15
-               line_width = math.floor(signs_lib.avgwidth15 * def.chars_per_line) * def.horiz_scaling
+               line_width = math.floor(signs_lib.avgwidth15 * def.chars_per_line) * (def.horiz_scaling * widemult)
                line_height = signs_lib.lineheight15
                char_width = signs_lib.charwidth15
                colorbgw = signs_lib.colorbgw15
@@ -581,45 +613,23 @@ end
 function signs_lib.split_lines_and_words(text)
        if not text then return end
        local lines = { }
-       for _, line in ipairs(text:split("\n")) do
+       for _, line in ipairs(text:split("\n", true)) do
                table.insert(lines, line:split(" "))
        end
        return lines
 end
 
-function signs_lib.set_obj_text(pos, text)
-       local split = signs_lib.split_lines_and_words
-       local text_ansi = Utf8ToAnsi(text)
-       local n = minetest.registered_nodes[minetest.get_node(pos).name]
-       signs_lib.delete_objects(pos)
-       signs_lib.spawn_entity(pos, make_sign_texture(split(text_ansi), pos))
-end
-
-local function make_widefont_nodename(name)
-       if string.find(name, "_widefont") then return name end
-       if string.find(name, "_onpole")  then
-               if string.find(name, "_horiz") then
-                       return string.gsub(name, "_onpole_horiz", "_widefont_onpole_horiz")
-               else
-                       return string.gsub(name, "_onpole", "_widefont_onpole")
-               end
-       elseif string.find(name, "_hanging") then
-               return string.gsub(name, "_hanging", "_widefont_hanging")
-       else
-               return name.."_widefont"
-       end
-end
-
 function signs_lib.construct_sign(pos)
        local form = "size[6,4]"..
                "textarea[0,-0.3;6.5,3;text;;${text}]"..
                "background[-0.5,-0.5;7,5;signs_lib_sign_bg.jpg]"
        local node = minetest.get_node(pos)
-       local wname = make_widefont_nodename(node.name)
+       local def = minetest.registered_items[node.name]
+       local meta = minetest.get_meta(pos)
 
-       if minetest.registered_items[wname] then
+       if def.allow_widefont then
                local state = "off"
-               if string.find(node.name, "widefont") then state = "on" end
+               if meta:get_int("widefont") == 1 then state = "on" end
                form = form.."label[1,3.4;Use wide font]"..
                        "image_button[1.1,3.7;1,0.6;signs_lib_switch_"..
                        state..".png;"..
@@ -629,7 +639,6 @@ function signs_lib.construct_sign(pos)
                form = form.."button_exit[2,3.4;2,1;ok;"..S("Write").."]"
        end
 
-       local meta = minetest.get_meta(pos)
        meta:set_string("formspec", form)
        local i = meta:get_string("infotext")
        if i == "" then -- it wasn't even set, so set it.
@@ -679,21 +688,22 @@ function signs_lib.receive_fields(pos, formname, fields, sender)
                signs_lib.update_sign(pos, fields)
        elseif fields.on or fields.off then
                local node = minetest.get_node(pos)
-               local newname
-
-               if fields.on and string.find(node.name, "widefont") then
-                       newname = string.gsub(node.name, "_widefont", "")
-               elseif fields.off and not string.find(node.name, "widefont") then
-                       newname = make_widefont_nodename(node.name)
+               local meta = minetest.get_meta(pos)
+               local change
+
+               if fields.on and meta:get_int("widefont") == 1 then
+                       meta:set_int("widefont", 0)
+                       change = true
+               elseif fields.off and meta:get_int("widefont") == 0 then
+                       meta:set_int("widefont", 1)
+                       change = true
                end
-               if newname then
+               if change then
                        minetest.log("action", S("@1 flipped the wide-font switch to \"@2\" at @3",
                                (sender:get_player_name() or ""),
                                (fields.on and "off" or "on"),
                                minetest.pos_to_string(pos)
                        ))
-
-                       minetest.swap_node(pos, {name = newname, param2 = node.param2})
                        signs_lib.construct_sign(pos)
                        signs_lib.update_sign(pos, fields)
                end
@@ -751,36 +761,33 @@ function signs_lib.check_for_pole(pos, pointed_thing)
        local pnode = minetest.get_node(ppos)
        local pdef = minetest.registered_items[pnode.name]
 
-       if (signs_lib.allowed_poles[pnode.name]
-         or (pdef and pdef.drawtype == "fencelike")
-         or string.find(pnode.name, "default:fence_")
+       if not pdef then return end
+
+       if type(pdef.check_for_pole) == "function" then
+               local node = minetest.get_node(pos)
+               local def = minetest.registered_items[node.name]
+               return pdef.check_for_pole(pos, node, def, ppos, pnode, pdef)
+       elseif pdef.check_for_pole
+         or pdef.drawtype == "fencelike"
          or string.find(pnode.name, "_post")
-         or string.find(pnode.name, "fencepost")
-         or string.find(pnode.name, "streets:streetlamp_basic_top")
-         or (pnode.name == "streets:bigpole" and pnode.param2 < 4)
-         or (pnode.name == "streets:bigpole" and pnode.param2 > 19 and pnode.param2 < 24) )
-         and (pos.x ~= ppos.x or pos.z ~= ppos.z) then
+         or string.find(pnode.name, "fencepost") then
                return true
        end
 end
 
 function signs_lib.check_for_horizontal_pole(pos, pointed_thing)
-       local node = minetest.get_node(pos)
-       local def = minetest.registered_items[node.name]
        local ppos = minetest.get_pointed_thing_position(pointed_thing)
        local pnode = minetest.get_node(ppos)
-       if pnode.name == "streets:bigpole" then
-               if def.paramtype2 == "wallmounted" then
-                       if   ((node.param2 == 2 or node.param2 == 3) and (pnode.param2 > 3 and pnode.param2 < 12)) -- E/W
-                         or ((node.param2 == 4 or node.param2 == 5) and (pnode.param2 > 11 and pnode.param2 < 20)) -- N/S
-                               then return true
-                       end
-               else
-                       if   ((node.param2 == 1 or node.param2 == 3) and (pnode.param2 > 3 and pnode.param2 < 12)) -- E/W
-                         or ((node.param2 == 0 or node.param2 == 2) and (pnode.param2 > 11 and pnode.param2 < 20)) -- N/S
-                               then return true
-                       end
-               end
+       local pdef = minetest.registered_items[pnode.name]
+
+       if not pdef then return end
+
+       if type(pdef.check_for_horiz_pole) == "function" then
+               local node = minetest.get_node(pos)
+               local def = minetest.registered_items[node.name]
+               return pdef.check_for_horiz_pole(pos, node, def, ppos, pnode, pdef)
+       elseif pdef.check_for_horiz_pole then
+               return true
        end
 end
 
@@ -847,7 +854,7 @@ function signs_lib.register_fence_with_sign()
        minetest.log("warning", "[signs_lib] ".."Attempt to call no longer used function signs_lib.register_fence_with_sign()")
 end
 
-local function register_sign(name, rdef)
+function signs_lib.register_sign(name, rdef)
        local def = table.copy(rdef)
 
        if rdef.entity_info == "standard" then
@@ -985,64 +992,11 @@ local function register_sign(name, rdef)
                minetest.register_node(":"..name.."_hanging", hdef)
                table.insert(signs_lib.lbm_restore_nodes, name.."_hanging")
        end
-end
-
---[[
-The main sign registration function
-===================================
-
-Example minimal recommended def for writable signs:
-
-signs_lib.register_sign("foo:my_cool_sign", {
-       description = "Wooden cool sign",
-       inventory_image = "signs_lib_sign_cool_inv.png",
-       tiles = {
-               "signs_lib_sign_cool.png",
-               "signs_lib_sign_cool_edges.png"
-       },
-       number_of_lines = 2,
-       horiz_scaling = 0.8,
-       vert_scaling = 1,
-       line_spacing = 9,
-       font_size = 31,
-       x_offset = 7,
-       y_offset = 4,
-       chars_per_line = 40,
-       entity_info = "standard"
-})
-
-* default def assumes a wallmounted sign with on-pole being allowed.
-
-*For signs that can support being on a pole, include in the def:
-       allow_onpole = true,
-       (defaults to disabled)
-
-*For signs that can support being on a horizontal pole, include in the def:
-       allow_onpole_horizontal = true,
-       (defaults to disabled)
-
-* onpole/onpole_horizontal are independent; one may be allowed without the other
-
-* "standard" entity info implies the standard wood/steel sign model, in
-  wallmounted mode.  For facedir signs using the standard model, use:
-
-       entity_info = {
-               mesh = "signs_lib_standard_wall_sign_entity.obj",
-               yaw = signs_lib.standard_yaw
-       },
-
-]]--
-
-function signs_lib.register_sign(name, rdef)
-       register_sign(name, rdef)
 
        if rdef.allow_widefont then
-
-               local wdef = table.copy(minetest.registered_items[name])
-               wdef.groups.not_in_creative_inventory = 1
-               wdef.horiz_scaling = wdef.horiz_scaling / 2
-
-               register_sign(name.."_widefont", wdef)
+               table.insert(signs_lib.old_widefont_signs, name.."_widefont")
+               table.insert(signs_lib.old_widefont_signs, name.."_widefont_onpole")
+               table.insert(signs_lib.old_widefont_signs, name.."_widefont_hanging")
        end
 end
 
@@ -1092,8 +1046,21 @@ minetest.register_lbm({
        end
 })
 
-signs_lib.block_list = {}
-signs_lib.totalblocks = 0
+-- Convert widefont sign nodes to use one base node with meta flag to select wide mode
+
+minetest.register_lbm({
+       nodenames = signs_lib.old_widefont_signs,
+       name = "signs_lib:convert_widefont_signs",
+       label = "Convert widefont sign nodes",
+       run_at_every_load = false,
+       action = function(pos, node)
+               local basename = string.gsub(node.name, "_widefont", "")
+               minetest.swap_node(pos, {name = basename, param2 = node.param2})
+               local meta = minetest.get_meta(pos)
+               meta:set_int("widefont", 1)
+               signs_lib.update_sign(pos)
+       end
+})
 
 -- Maintain a list of currently-loaded blocks
 minetest.register_lbm({