diff --git a/areas/api.lua b/areas/api.lua index 8103b84b..40a9841c 100644 --- a/areas/api.lua +++ b/areas/api.lua @@ -94,9 +94,13 @@ function areas:canInteract(pos, name) for _, area in pairs(self:getAreasAtPos(pos)) do if area.owner == name or area.open then return true - else - owned = true + elseif areas.factions_available and area.faction_open then + local faction_name = factions.get_player_faction(area.owner) + if faction_name ~= nil and faction_name == factions.get_player_faction(name) then + return true + end end + owned = true end return not owned end diff --git a/areas/chatcommands.lua b/areas/chatcommands.lua index ddff8509..faffb03a 100644 --- a/areas/chatcommands.lua +++ b/areas/chatcommands.lua @@ -286,6 +286,30 @@ minetest.register_chatcommand("area_open", { }) +if areas.factions_available then + minetest.register_chatcommand("area_faction_open", { + params = "", + description = "Toggle an area open/closed for members in your faction.", + func = function(name, param) + local id = tonumber(param) + if not id then + return false, "Invalid usage, see /help area_faction_open." + end + + if not areas:isAreaOwner(id, name) then + return false, "Area "..id.." does not exist" + .." or is not owned by you." + end + local open = not areas.areas[id].faction_open + -- Save false as nil to avoid inflating the DB. + areas.areas[id].faction_open = open or nil + areas:save() + return true, ("Area %s for faction members."):format(open and "opened" or "closed") + end + }) +end + + minetest.register_chatcommand("move_area", { params = "", description = "Move (or resize) an area to the current positions.", diff --git a/areas/hud.lua b/areas/hud.lua index 24f54140..ffe764ea 100644 --- a/areas/hud.lua +++ b/areas/hud.lua @@ -21,9 +21,13 @@ minetest.register_globalstep(function(dtime) local areaStrings = {} for id, area in pairs(areas:getAreasAtPos(pos)) do - table.insert(areaStrings, ("%s [%u] (%s%s)") + local faction_info = area.faction_open and areas.factions_available and + factions.get_player_faction(area.owner) + area.faction_open = faction_info + table.insert(areaStrings, ("%s [%u] (%s%s%s)") :format(area.name, id, area.owner, - area.open and ":open" or "")) + area.open and ":open" or "", + faction_info and ":"..faction_info or "")) end for i, area in pairs(areas:getExternalHudEntries(pos)) do diff --git a/areas/init.lua b/areas/init.lua index 8179b28f..53d4eb6b 100644 --- a/areas/init.lua +++ b/areas/init.lua @@ -4,6 +4,8 @@ areas = {} +areas.factions_available = minetest.global_exists("factions") + areas.adminPrivs = {areas=true} areas.startTime = os.clock() diff --git a/areas/mod.conf b/areas/mod.conf index 0ca8ec16..e694301e 100644 --- a/areas/mod.conf +++ b/areas/mod.conf @@ -1 +1,2 @@ name = areas +optional_depends = playerfactions diff --git a/basic_signs/crafting.lua b/basic_signs/crafting.lua index 6887b4d9..51a3647a 100644 --- a/basic_signs/crafting.lua +++ b/basic_signs/crafting.lua @@ -173,3 +173,11 @@ minetest.register_craft( { }, }) +minetest.register_craft( { + output = "basic_signs:sign_wall_plastic 3", + recipe = { + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "", "default:steel_ingot", "" } + }, +}) diff --git a/basic_signs/init.lua b/basic_signs/init.lua index 6d383bad..f85d514b 100644 --- a/basic_signs/init.lua +++ b/basic_signs/init.lua @@ -9,65 +9,11 @@ dofile(basic_signs.path .. "/crafting.lua") local S, NS = dofile(basic_signs.path .. "/intllib.lua") basic_signs.gettext = S -function basic_signs.check_for_floor(pointed_thing) - if pointed_thing.above.x == pointed_thing.under.x - and pointed_thing.above.z == pointed_thing.under.z - and pointed_thing.above.y > pointed_thing.under.y then - return true - end -end - -function basic_signs.determine_sign_type(pos, placer, itemstack, pointed_thing) - - local playername = placer:get_player_name() - local pt_name = minetest.get_node(pointed_thing.under).name - local node = minetest.get_node(pos) -- since we're in after-place, this will be the wall sign itself - - if minetest.is_protected(pointed_thing.under, playername) then - minetest.record_protection_violation(pointed_thing.under, playername) - return itemstack - end - - local newparam2 = minetest.dir_to_facedir(placer:get_look_dir()) - - if minetest.registered_nodes[pt_name] and - minetest.registered_nodes[pt_name].on_rightclick and - not placer:get_player_control().sneak then - return minetest.registered_nodes[pt_name].on_rightclick(pos, node, placer, itemstack, pointed_thing) - elseif signs_lib.check_for_pole(pos, pointed_thing) then - minetest.swap_node(pos, {name = "default:sign_wall_wood_onpole", param2 = node.param2}) - elseif signs_lib.check_for_horizontal_pole(pos, pointed_thing) then - minetest.swap_node(pos, {name = "default:sign_wall_wood_onpole_horiz", param2 = node.param2}) - elseif signs_lib.check_for_ceiling(pointed_thing) then - minetest.swap_node(pos, {name = "default:sign_wall_wood_hanging", param2 = newparam2}) - elseif basic_signs.check_for_floor(pointed_thing) then - minetest.swap_node(pos, {name = "basic_signs:yard_sign", param2 = newparam2}) - end - signs_lib.update_sign(pos) - - if not creative.is_enabled_for(playername) then - itemstack:take_item() - end - return itemstack -end - -local def - -local wgroups = table.copy(signs_lib.standard_wood_groups) -wgroups.not_in_creative_inventory = 1 - -local sgroups = table.copy(signs_lib.standard_steel_groups) -sgroups.not_in_creative_inventory = 1 - -minetest.override_item("default:sign_wall_wood", { - after_place_node = basic_signs.determine_sign_type -}) - signs_lib.register_sign("basic_signs:sign_wall_locked", { description = S("Locked Sign"), tiles = { "basic_signs_sign_wall_locked.png", - "signs_lib_sign_wall_steel_edges.png", + "signs_lib_sign_wall_steel_edges.png" }, inventory_image = "basic_signs_sign_wall_locked_inv.png", locked = true, @@ -75,18 +21,22 @@ signs_lib.register_sign("basic_signs:sign_wall_locked", { allow_hanging = true, allow_widefont = true, allow_onpole = true, - allow_onpole_horizontal = true + allow_onpole_horizontal = true, + allow_yard = true, }) signs_lib.register_sign("basic_signs:sign_wall_glass", { description = S("Glass Sign"), + yard_mesh = "signs_lib_standard_sign_yard_two_sticks.obj", tiles = { { name = "basic_signs_sign_wall_glass.png", backface_culling = true}, "basic_signs_sign_wall_glass_edges.png", + "basic_signs_pole_mount_glass.png", + nil, + "default_steel_block.png" -- the sticks on back of the yard sign model }, inventory_image = "basic_signs_sign_wall_glass_inv.png", default_color = "c", - locked = true, entity_info = "standard", sounds = default.node_sound_glass_defaults(), groups = {cracky = 3, oddly_breakable_by_hand = 3}, @@ -94,18 +44,22 @@ signs_lib.register_sign("basic_signs:sign_wall_glass", { allow_widefont = true, allow_onpole = true, allow_onpole_horizontal = true, + allow_yard = true, use_texture_alpha = true, }) signs_lib.register_sign("basic_signs:sign_wall_obsidian_glass", { description = S("Obsidian Glass Sign"), + yard_mesh = "signs_lib_standard_sign_yard_two_sticks.obj", tiles = { { name = "basic_signs_sign_wall_obsidian_glass.png", backface_culling = true}, "basic_signs_sign_wall_obsidian_glass_edges.png", + "basic_signs_pole_mount_obsidian_glass.png", + nil, + "default_steel_block.png" -- the sticks on back of the yard sign model }, inventory_image = "basic_signs_sign_wall_obsidian_glass_inv.png", default_color = "c", - locked = true, entity_info = "standard", sounds = default.node_sound_glass_defaults(), groups = {cracky = 3}, @@ -113,11 +67,34 @@ signs_lib.register_sign("basic_signs:sign_wall_obsidian_glass", { allow_widefont = true, allow_onpole = true, allow_onpole_horizontal = true, + allow_yard = true, use_texture_alpha = true, }) minetest.register_alias("locked_sign:sign_wall_locked", "basic_signs:sign_wall_locked") +signs_lib.register_sign("basic_signs:sign_wall_plastic", { + description = S("Plastic Sign"), + yard_mesh = "signs_lib_standard_sign_yard_two_sticks.obj", + tiles = { + "basic_signs_sign_wall_plastic.png", + "basic_signs_sign_wall_plastic_edges.png", + "basic_signs_pole_mount_plastic.png", + nil, + "default_steel_block.png" -- the sticks on back of the yard sign model + }, + inventory_image = "basic_signs_sign_wall_plastic_inv.png", + default_color = "0", + entity_info = "standard", + sounds = default.node_sound_leaves_defaults(), + groups = {snappy = 3, flammable = 2}, + allow_hanging = true, + allow_widefont = true, + allow_onpole = true, + allow_onpole_horizontal = true, + allow_yard = true, + use_texture_alpha = true, +}) -- array : color, translated color, default text color @@ -139,48 +116,33 @@ for i, color in ipairs(sign_colors) do description = S("Sign (@1, steel)", color[2]), paramtype2 = "facedir", selection_box = cbox, - mesh = "signs_lib_standard_wall_sign_facedir.obj", + mesh = "signs_lib_standard_facedir_sign_wall.obj", tiles = { "basic_signs_steel_"..color[1]..".png", "signs_lib_sign_wall_steel_edges.png", + nil, + nil, + "default_steel_block.png" }, inventory_image = "basic_signs_steel_"..color[1].."_inv.png", groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, default_color = color[3], entity_info = { - mesh = "signs_lib_standard_wall_sign_entity.obj", + mesh = "signs_lib_standard_sign_entity_wall.obj", yaw = signs_lib.standard_yaw }, allow_hanging = true, allow_widefont = true, allow_onpole = true, - allow_onpole_horizontal = true + allow_onpole_horizontal = true, + allow_yard = true, }) + minetest.register_alias("basic_signs:sign_wall_steel_"..color[1].."_onpole", "basic_signs:sign_steel_"..color[1].."_onpole") + minetest.register_alias("basic_signs:sign_wall_steel_"..color[1].."_onpole_horiz", "basic_signs:sign_steel_"..color[1].."_onpole_horiz") + minetest.register_alias("basic_signs:sign_wall_steel_"..color[1].."_hanging", "basic_signs:sign_steel_"..color[1].."_hanging") + table.insert(signs_lib.lbm_restore_nodes, "signs:sign_wall_"..color[1]) minetest.register_alias("signs:sign_wall_"..color[1], "basic_signs:sign_wall_steel_"..color[1]) end - -signs_lib.register_sign("basic_signs:yard_sign", { - description = "Wooden yard sign", - paramtype2 = "facedir", - selection_box = signs_lib.make_selection_boxes(35, 34.5, false, 0, -1.25, -19.69, true), - mesh = "basic_signs_yard_sign.obj", - tiles = { - "signs_lib_sign_wall_wooden.png", - "signs_lib_sign_wall_wooden_edges.png", - "default_wood.png" - }, - inventory_image = "default_sign_wood.png", - entity_info = { - mesh = "basic_signs_yard_sign_entity.obj", - yaw = signs_lib.standard_yaw - }, - groups = wgroups, - drop = "default:sign_wall_wood", - allow_widefont = true -}) - -table.insert(signs_lib.lbm_restore_nodes, "signs:sign_yard") -minetest.register_alias("signs:sign_yard", "basic_signs:yard_sign") diff --git a/basic_signs/textures/basic_signs_pole_mount_glass.png b/basic_signs/textures/basic_signs_pole_mount_glass.png new file mode 100644 index 00000000..90e3157e Binary files /dev/null and b/basic_signs/textures/basic_signs_pole_mount_glass.png differ diff --git a/basic_signs/textures/basic_signs_pole_mount_obsidian_glass.png b/basic_signs/textures/basic_signs_pole_mount_obsidian_glass.png new file mode 100644 index 00000000..769cba91 Binary files /dev/null and b/basic_signs/textures/basic_signs_pole_mount_obsidian_glass.png differ diff --git a/basic_signs/textures/basic_signs_pole_mount_plastic.png b/basic_signs/textures/basic_signs_pole_mount_plastic.png new file mode 100644 index 00000000..6390dc9f Binary files /dev/null and b/basic_signs/textures/basic_signs_pole_mount_plastic.png differ diff --git a/street_signs/textures/basic_signs_sign_wall_glass_inv.png b/basic_signs/textures/basic_signs_sign_wall_glass_inv.png similarity index 100% rename from street_signs/textures/basic_signs_sign_wall_glass_inv.png rename to basic_signs/textures/basic_signs_sign_wall_glass_inv.png diff --git a/street_signs/textures/basic_signs_sign_wall_obsidian_glass_inv.png b/basic_signs/textures/basic_signs_sign_wall_obsidian_glass_inv.png similarity index 100% rename from street_signs/textures/basic_signs_sign_wall_obsidian_glass_inv.png rename to basic_signs/textures/basic_signs_sign_wall_obsidian_glass_inv.png diff --git a/basic_signs/textures/basic_signs_sign_wall_plastic.png b/basic_signs/textures/basic_signs_sign_wall_plastic.png new file mode 100644 index 00000000..62fa27f2 Binary files /dev/null and b/basic_signs/textures/basic_signs_sign_wall_plastic.png differ diff --git a/basic_signs/textures/basic_signs_sign_wall_plastic_edges.png b/basic_signs/textures/basic_signs_sign_wall_plastic_edges.png new file mode 100644 index 00000000..51fd3c38 Binary files /dev/null and b/basic_signs/textures/basic_signs_sign_wall_plastic_edges.png differ diff --git a/basic_signs/textures/basic_signs_sign_wall_plastic_inv.png b/basic_signs/textures/basic_signs_sign_wall_plastic_inv.png new file mode 100644 index 00000000..f5ef3db0 Binary files /dev/null and b/basic_signs/textures/basic_signs_sign_wall_plastic_inv.png differ diff --git a/farming/crops/beans.lua b/farming/crops/beans.lua index d02cff5c..50172483 100644 --- a/farming/crops/beans.lua +++ b/farming/crops/beans.lua @@ -27,7 +27,7 @@ local function place_beans(itemstack, placer, pointed_thing, plantname) -- am I right-clicking on something that has a custom on_place set? -- thanks to Krock for helping with this issue :) local def = minetest.registered_nodes[under.name] - if placer and def and def.on_rightclick then + if placer and itemstack and def and def.on_rightclick then return def.on_rightclick(pt.under, under, placer, itemstack) end diff --git a/farming/crops/cocoa.lua b/farming/crops/cocoa.lua index fc044e47..3f54a895 100644 --- a/farming/crops/cocoa.lua +++ b/farming/crops/cocoa.lua @@ -21,7 +21,7 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname) -- am I right-clicking on something that has a custom on_place set? -- thanks to Krock for helping with this issue :) local def = minetest.registered_nodes[under.name] - if placer and def and def.on_rightclick then + if placer and itemstack and def and def.on_rightclick then return def.on_rightclick(pt.under, under, placer, itemstack) end diff --git a/farming/crops/grapes.lua b/farming/crops/grapes.lua index af573452..a41bb885 100644 --- a/farming/crops/grapes.lua +++ b/farming/crops/grapes.lua @@ -22,7 +22,7 @@ local function place_grapes(itemstack, placer, pointed_thing, plantname) -- am I right-clicking on something that has a custom on_place set? -- thanks to Krock for helping with this issue :) local def = minetest.registered_nodes[under.name] - if placer and def and def.on_rightclick then + if placer and itemstack and def and def.on_rightclick then return def.on_rightclick(pt.under, under, placer, itemstack) end diff --git a/farming/init.lua b/farming/init.lua index 77e43fff..07697094 100644 --- a/farming/init.lua +++ b/farming/init.lua @@ -421,7 +421,7 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname) -- am I right-clicking on something that has a custom on_place set? -- thanks to Krock for helping with this issue :) local def = minetest.registered_nodes[under.name] - if placer and def and def.on_rightclick then + if placer and itemstack and def and def.on_rightclick then return def.on_rightclick(pt.under, under, placer, itemstack) end diff --git a/maptools/.pre-commit-config.yaml b/maptools/.pre-commit-config.yaml index 9c724986..f9254a42 100644 --- a/maptools/.pre-commit-config.yaml +++ b/maptools/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.1.0 + rev: v2.3.0 hooks: - id: end-of-file-fixer - id: trailing-whitespace diff --git a/mesecons/util.lua b/mesecons/util.lua index b15858dc..7485cac1 100644 --- a/mesecons/util.lua +++ b/mesecons/util.lua @@ -186,19 +186,11 @@ function mesecon.invertRule(r) return vector.multiply(r, -1) end -function mesecon.tablecopy(table) -- deep table copy - if type(table) ~= "table" then return table end -- no need to copy - local newtable = {} - - for idx, item in pairs(table) do - if type(item) == "table" then - newtable[idx] = mesecon.tablecopy(item) - else - newtable[idx] = item - end +function mesecon.tablecopy(obj) -- deep copy + if type(obj) == "table" then + return table.copy(obj) end - - return newtable + return obj end function mesecon.cmpAny(t1, t2) diff --git a/mesecons_movestones/init.lua b/mesecons_movestones/init.lua index cd822940..49ac2b54 100644 --- a/mesecons_movestones/init.lua +++ b/mesecons_movestones/init.lua @@ -43,10 +43,16 @@ function mesecon.register_movestone(name, def, is_sticky, is_vertical) local function movestone_move(pos, node, rulename) local direction = get_movestone_direction(rulename, is_vertical) local frontpos = vector.add(pos, direction) + local meta = minetest.get_meta(pos) + local owner = meta:get_string("owner") -- ### Step 1: Push nodes in front ### - local success, stack, oldstack = mesecon.mvps_push(frontpos, direction, max_push) + local success, stack, oldstack = mesecon.mvps_push(frontpos, direction, max_push, owner) if not success then + if stack == "protected" then + meta:set_string("infotext", "Can't move: protected area on the way") + return + end minetest.get_node_timer(pos):start(timer_interval) return end @@ -54,6 +60,8 @@ function mesecon.register_movestone(name, def, is_sticky, is_vertical) -- ### Step 2: Move the movestone ### minetest.set_node(frontpos, node) + local meta2 = minetest.get_meta(frontpos) + meta2:set_string("owner", owner) minetest.remove_node(pos) mesecon.on_dignode(pos, node) mesecon.on_placenode(frontpos, node) @@ -62,7 +70,7 @@ function mesecon.register_movestone(name, def, is_sticky, is_vertical) -- ### Step 3: If sticky, pull stack behind ### if is_sticky then local backpos = vector.subtract(pos, direction) - success, stack, oldstack = mesecon.mvps_pull_all(backpos, direction, max_pull) + success, stack, oldstack = mesecon.mvps_pull_all(backpos, direction, max_pull, owner) if success then mesecon.mvps_move_objects(backpos, vector.multiply(direction, -1), oldstack, -1) end @@ -83,6 +91,16 @@ function mesecon.register_movestone(name, def, is_sticky, is_vertical) rules = mesecon.rules.default, }} + def.after_place_node = mesecon.mvps_set_owner + + def.on_punch = function(pos, node, player) + local player_name = player and player.get_player_name and player:get_player_name() + if mesecon.mvps_claim(pos, player_name) then + minetest.get_node_timer(pos):start(timer_interval) + minetest.chat_send_player(player_name, "Reclaimed movestone") + end + end + def.on_timer = function(pos, elapsed) local sourcepos = mesecon.is_powered(pos) if not sourcepos then diff --git a/mesecons_mvps/init.lua b/mesecons_mvps/init.lua index 495e93b1..6bd3ca66 100644 --- a/mesecons_mvps/init.lua +++ b/mesecons_mvps/init.lua @@ -133,31 +133,100 @@ function mesecon.mvps_get_stack(pos, dir, maximum, all_pull_sticky) return nodes end -function mesecon.mvps_push(pos, dir, maximum) - return mesecon.mvps_push_or_pull(pos, dir, dir, maximum) +function mesecon.mvps_set_owner(pos, placer) + local meta = minetest.get_meta(pos) + local owner = placer and placer.get_player_name and placer:get_player_name() + if owner and owner ~= "" then + meta:set_string("owner", owner) + else + meta:set_string("owner", "$unknown") -- to distinguish from older pistons + end end -function mesecon.mvps_pull_all(pos, dir, maximum) - return mesecon.mvps_push_or_pull(pos, vector.multiply(dir, -1), dir, maximum, true) +function mesecon.mvps_claim(pos, player_name) + if not player_name or player_name == "" then return end + local meta = minetest.get_meta(pos) + if meta:get_string("infotext") == "" then return end + if meta:get_string("owner") == player_name then return end -- already owned + if minetest.is_protected(pos, player_name) then + minetest.chat_send_player(player_name, "Can't reclaim: protected") + return + end + meta:set_string("owner", player_name) + meta:set_string("infotext", "") + return true end -function mesecon.mvps_pull_single(pos, dir, maximum) - return mesecon.mvps_push_or_pull(pos, vector.multiply(dir, -1), dir, maximum) +local function add_pos(positions, pos) + local hash = minetest.hash_node_position(pos) + positions[hash] = pos end --- pos: pos of mvps; stackdir: direction of building the stack +local function are_protected(positions, player_name) + local mode = mesecon.setting("mvps_protection_mode", "compat") + if mode == "ignore" then + return false + end + local name = player_name + if player_name == "" or not player_name then -- legacy MVPS + if mode == "normal" then + name = "$unknown" -- sentinel, for checking for *any* protection + elseif mode == "compat" then + return false + elseif mode == "restrict" then + return true + else + error("Invalid protection mode") + end + end + local is_protected = minetest.is_protected + for _, pos in pairs(positions) do + if is_protected(pos, name) then + return true + end + end + return false +end + +function mesecon.mvps_push(pos, dir, maximum, player_name) + return mesecon.mvps_push_or_pull(pos, dir, dir, maximum, false, player_name) +end + +function mesecon.mvps_pull_all(pos, dir, maximum, player_name) + return mesecon.mvps_push_or_pull(pos, vector.multiply(dir, -1), dir, maximum, true, player_name) +end + +function mesecon.mvps_pull_single(pos, dir, maximum, player_name) + return mesecon.mvps_push_or_pull(pos, vector.multiply(dir, -1), dir, maximum, false, player_name) +end + +-- pos: pos of mvps +-- stackdir: direction of building the stack -- movedir: direction of actual movement -- maximum: maximum nodes to be pushed -- all_pull_sticky: All nodes are sticky in the direction that they are pulled from -function mesecon.mvps_push_or_pull(pos, stackdir, movedir, maximum, all_pull_sticky) +-- player_name: Player responsible for the action. +-- - empty string means legacy MVPS, actual check depends on configuration +-- - "$unknown" is a sentinel for forcing the check +function mesecon.mvps_push_or_pull(pos, stackdir, movedir, maximum, all_pull_sticky, player_name) local nodes = mesecon.mvps_get_stack(pos, movedir, maximum, all_pull_sticky) if not nodes then return end + + local protection_check_set = {} + if vector.equals(stackdir, movedir) then -- pushing + add_pos(protection_check_set, pos) + end -- determine if one of the nodes blocks the push / pull for id, n in ipairs(nodes) do if mesecon.is_mvps_stopper(n.node, movedir, nodes, id) then return end + add_pos(protection_check_set, n.pos) + add_pos(protection_check_set, vector.add(n.pos, movedir)) + end + if are_protected(protection_check_set, player_name) then + return false, "protected" end -- remove all nodes diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua index 56a3f734..1af80c53 100644 --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -86,11 +86,15 @@ local piston_on = function(pos, node) local pistonspec = get_pistonspec(node.name, "offname") local dir = vector.multiply(minetest.facedir_to_dir(node.param2), -1) local pusher_pos = vector.add(pos, dir) - local success, stack, oldstack = mesecon.mvps_push(pusher_pos, dir, max_push) + local meta = minetest.get_meta(pos) + local success, stack, oldstack = mesecon.mvps_push(pusher_pos, dir, max_push, meta:get_string("owner")) if not success then + if stack == "protected" then + meta:set_string("infotext", "Can't extend: protected area on the way") + end return end - minetest.set_node(pos, {param2 = node.param2, name = pistonspec.onname}) + minetest.swap_node(pos, {param2 = node.param2, name = pistonspec.onname}) minetest.set_node(pusher_pos, {param2 = node.param2, name = pistonspec.pusher}) minetest.sound_play("piston_extend", { pos = pos, @@ -103,15 +107,16 @@ end local function piston_off(pos, node) local pistonspec = get_pistonspec(node.name, "onname") - minetest.set_node(pos, {param2 = node.param2, name = pistonspec.offname}) - piston_remove_pusher(pos, node, not pistonspec.sticky) + minetest.swap_node(pos, {param2 = node.param2, name = pistonspec.offname}) + piston_remove_pusher(pos, node, not pistonspec.sticky) -- allow that even in protected area if not pistonspec.sticky then return end local dir = minetest.facedir_to_dir(node.param2) local pullpos = vector.add(pos, vector.multiply(dir, -2)) - local success, stack, oldstack = mesecon.mvps_pull_single(pullpos, dir, max_pull) + local meta = minetest.get_meta(pos) + local success, stack, oldstack = mesecon.mvps_pull_single(pullpos, dir, max_pull, meta:get_string("owner")) if success then mesecon.mvps_move_objects(pullpos, vector.multiply(dir, -1), oldstack, -1) end @@ -125,6 +130,7 @@ local orientations = { } local function piston_orientate(pos, placer) + mesecon.mvps_set_owner(pos, placer) if not placer then return end @@ -237,6 +243,13 @@ local function piston_rotate_pusher(pos, node, player, mode) return piston_rotate_on(piston_pos, piston_node, player, mode) end +local function piston_punch(pos, node, player) + local player_name = player and player.get_player_name and player:get_player_name() + if mesecon.mvps_claim(pos, player_name) then + minetest.chat_send_player(player_name, "Reclaimed piston") + end +end + -- Boxes: @@ -279,6 +292,7 @@ minetest.register_node("mesecons_pistons:piston_normal_off", { action_on = piston_on, rules = piston_get_rules, }}, + on_punch = piston_punch, on_rotate = piston_rotate, on_blast = mesecon.on_blastnode, }) @@ -357,6 +371,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", { action_on = piston_on, rules = piston_get_rules, }}, + on_punch = piston_punch, on_rotate = piston_rotate, on_blast = mesecon.on_blastnode, }) diff --git a/moreblocks/.pre-commit-config.yaml b/moreblocks/.pre-commit-config.yaml index 9c724986..f9254a42 100644 --- a/moreblocks/.pre-commit-config.yaml +++ b/moreblocks/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.1.0 + rev: v2.3.0 hooks: - id: end-of-file-fixer - id: trailing-whitespace diff --git a/moreores/.pre-commit-config.yaml b/moreores/.pre-commit-config.yaml index 22f1dbea..04507b47 100644 --- a/moreores/.pre-commit-config.yaml +++ b/moreores/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.1.0 + rev: v2.3.0 hooks: - id: end-of-file-fixer - id: trailing-whitespace diff --git a/moretrees/default_settings.txt b/moretrees/default_settings.txt index 3b7ce86b..a0fae226 100644 --- a/moretrees/default_settings.txt +++ b/moretrees/default_settings.txt @@ -25,12 +25,16 @@ moretrees.enable_beech = false moretrees.spawn_saplings = true -- Set this to true to allow defining stairs/slabs/etc. If Moreblocks is --- installed, this will use that mod's Stairs Plus component. Otherwise, it +-- installed, this will use that mod's Stairs Plus component. Otherwise, it -- will use the default stairs mod in minetest_game, if present moretrees.enable_stairs = true --- Set this to true if you want the plantlike drawtype for leaves, which +-- If this variable is set to true, register fences for moretrees wood + +moretrees.enable_fences = false + +-- Set this to true if you want the plantlike drawtype for leaves, which -- improves some peoples' framerates without resorting to making leaf nodes opaque. -- Affects default leaves and default jungle leaves also. diff --git a/moretrees/node_defs.lua b/moretrees/node_defs.lua index 1d228124..9fb42252 100644 --- a/moretrees/node_defs.lua +++ b/moretrees/node_defs.lua @@ -209,6 +209,41 @@ for i in ipairs(moretrees.treelist) do end end + + if moretrees.enable_fences then + local planks_name = "moretrees:" .. treename .. "_planks" + local planks_tile = "moretrees_" .. treename .. "_wood.png" + default.register_fence("moretrees:" .. treename .. "_fence", { + description = S(treedesc.." Fence"), + texture = planks_tile, + inventory_image = "default_fence_overlay.png^" .. planks_tile .. + "^default_fence_overlay.png^[makealpha:255,126,126", + wield_image = "default_fence_overlay.png^" .. planks_tile .. + "^default_fence_overlay.png^[makealpha:255,126,126", + material = planks_name, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = default.node_sound_wood_defaults() + }) + default.register_fence_rail("moretrees:" .. treename .. "_fence_rail", { + description = S(treedesc.." Fence Rail"), + texture = planks_tile, + inventory_image = "default_fence_rail_overlay.png^" .. planks_tile .. + "^default_fence_rail_overlay.png^[makealpha:255,126,126", + wield_image = "default_fence_rail_overlay.png^" .. planks_tile .. + "^default_fence_rail_overlay.png^[makealpha:255,126,126", + material = planks_name, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = default.node_sound_wood_defaults() + }) + if minetest.global_exists("doors") then + doors.register_fencegate("moretrees:" .. treename .. "_gate", { + description = S(treedesc .. " Fence Gate"), + texture = planks_tile, + material = planks_name, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2} + }) + end + end end minetest.register_node("moretrees:"..treename.."_sapling_ongen", { @@ -360,6 +395,7 @@ end -- we need our own copy of that node, which moretrees will match against. local jungle_tree = table.copy(minetest.registered_nodes["default:jungletree"]) +jungle_tree.drop = "default:jungletree" minetest.register_node("moretrees:jungletree_trunk", jungle_tree) default.register_leafdecay({ diff --git a/pipeworks/depends.txt b/pipeworks/depends.txt index d84e2240..efa0b33e 100644 --- a/pipeworks/depends.txt +++ b/pipeworks/depends.txt @@ -4,3 +4,4 @@ screwdriver mesecons? mesecons_mvps? digilines? +signs_lib? diff --git a/pipeworks/devices.lua b/pipeworks/devices.lua index 2ace81ff..3d232102 100644 --- a/pipeworks/devices.lua +++ b/pipeworks/devices.lua @@ -142,7 +142,7 @@ for s in ipairs(states) do paramtype = "light", paramtype2 = "facedir", groups = dgroups, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, pipe_connections = { top = 1 }, after_place_node = function(pos) @@ -194,7 +194,7 @@ for s in ipairs(states) do fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 } }, groups = dgroups, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -240,7 +240,7 @@ minetest.register_node(nodename_valve_loaded, { fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 } }, groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -289,7 +289,7 @@ minetest.register_node("pipeworks:grating", { sunlight_propagates = true, paramtype = "light", groups = {snappy=3, pipe=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, pipe_connections = { top = 1 }, after_place_node = function(pos) @@ -313,7 +313,7 @@ minetest.register_node(nodename_spigot_empty, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, pipe_connections = { left=1, right=1, front=1, back=1, left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 }, @@ -355,7 +355,7 @@ minetest.register_node(nodename_spigot_loaded, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, pipe_connections = { left=1, right=1, front=1, back=1, left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 }, @@ -409,7 +409,7 @@ minetest.register_node(nodename_panel_empty, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -429,7 +429,7 @@ minetest.register_node(nodename_panel_loaded, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -456,7 +456,7 @@ minetest.register_node(nodename_sensor_empty, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -495,7 +495,7 @@ minetest.register_node(nodename_sensor_loaded, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -560,7 +560,7 @@ for fill = 0, 10 do paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, drop = "pipeworks:storage_tank_0", pipe_connections = { top = 1, bottom = 1}, @@ -588,7 +588,7 @@ for fill = 0, 10 do paramtype = "light", paramtype2 = "facedir", groups = sgroups, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, drop = "pipeworks:storage_tank_0", pipe_connections = { top = 1, bottom = 1}, @@ -614,7 +614,7 @@ minetest.register_node(nodename_fountain_empty, { sunlight_propagates = true, paramtype = "light", groups = {snappy=3, pipe=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, pipe_connections = { bottom = 1 }, after_place_node = function(pos) @@ -648,7 +648,7 @@ minetest.register_node(nodename_fountain_loaded, { sunlight_propagates = true, paramtype = "light", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, pipe_connections = { bottom = 1 }, after_place_node = function(pos) @@ -698,7 +698,7 @@ minetest.register_node(nodename_sp_empty, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -706,7 +706,9 @@ minetest.register_node(nodename_sp_empty, { end, selection_box = sp_cbox, collision_box = sp_cbox, - on_rotate = pipeworks.fix_after_rotation + on_rotate = pipeworks.fix_after_rotation, + check_for_pole = pipeworks.check_for_vert_pipe, + check_for_horiz_pole = pipeworks.check_for_horiz_pipe }) local nodename_sp_loaded = "pipeworks:straight_pipe_loaded" @@ -718,7 +720,7 @@ minetest.register_node(nodename_sp_loaded, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -727,7 +729,9 @@ minetest.register_node(nodename_sp_loaded, { selection_box = sp_cbox, collision_box = sp_cbox, drop = "pipeworks:straight_pipe_empty", - on_rotate = pipeworks.fix_after_rotation + on_rotate = pipeworks.fix_after_rotation, + check_for_pole = pipeworks.check_for_vert_pipe, + check_for_horiz_pole = pipeworks.check_for_horiz_pipe }) new_flow_logic_register.directional_horizonal_rotate(nodename_sp_empty, true) diff --git a/pipeworks/init.lua b/pipeworks/init.lua index 445a8d42..ed93dd59 100644 --- a/pipeworks/init.lua +++ b/pipeworks/init.lua @@ -102,6 +102,10 @@ if pipeworks.toggles.finite_water == nil then dofile(pipeworks.modpath.."/autodetect-finite-water.lua") end +if minetest.get_modpath("signs_lib") then + dofile(pipeworks.modpath.."/signs_compat.lua") +end + dofile(pipeworks.modpath.."/common.lua") dofile(pipeworks.modpath.."/models.lua") dofile(pipeworks.modpath.."/autoplace_pipes.lua") diff --git a/pipeworks/pipes.lua b/pipeworks/pipes.lua index 82fadb13..3201d797 100644 --- a/pipeworks/pipes.lua +++ b/pipeworks/pipes.lua @@ -73,7 +73,7 @@ for index, connects in ipairs(cconnects) do fixed = outsel }, groups = pgroups, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, drop = "pipeworks:pipe_1_empty", after_place_node = function(pos) @@ -82,7 +82,10 @@ for index, connects in ipairs(cconnects) do after_dig_node = function(pos) pipeworks.scan_for_pipe_objects(pos) end, - on_rotate = false + on_rotate = false, + check_for_pole = pipeworks.check_for_vert_pipe, + check_for_horiz_pole = pipeworks.check_for_horiz_pipe, + pipenumber = index }) local pgroups = {snappy = 3, pipe = 1, not_in_creative_inventory = 1} @@ -104,7 +107,7 @@ for index, connects in ipairs(cconnects) do fixed = outsel }, groups = pgroups, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_metal_defaults(), walkable = true, drop = "pipeworks:pipe_1_empty", after_place_node = function(pos) @@ -114,7 +117,10 @@ for index, connects in ipairs(cconnects) do after_dig_node = function(pos) pipeworks.scan_for_pipe_objects(pos) end, - on_rotate = false + on_rotate = false, + check_for_pole = pipeworks.check_for_vert_pipe, + check_for_horiz_pole = pipeworks.check_for_horiz_pipe, + pipenumber = index }) local emptypipe = "pipeworks:pipe_"..index.."_empty" diff --git a/pipeworks/routing_tubes.lua b/pipeworks/routing_tubes.lua index 45fcea8f..3a69c0ad 100644 --- a/pipeworks/routing_tubes.lua +++ b/pipeworks/routing_tubes.lua @@ -162,6 +162,8 @@ if pipeworks.enable_one_way_tube then after_place_node = pipeworks.after_place, after_dig_node = pipeworks.after_dig, on_rotate = pipeworks.on_rotate, + check_for_pole = pipeworks.check_for_vert_tube, + check_for_horiz_pole = pipeworks.check_for_horiz_tube }) minetest.register_craft({ output = "pipeworks:one_way_tube 2", diff --git a/pipeworks/signs_compat.lua b/pipeworks/signs_compat.lua new file mode 100644 index 00000000..8644df68 --- /dev/null +++ b/pipeworks/signs_compat.lua @@ -0,0 +1,227 @@ +-- This file adds placement rules for signs_lib, if present + +local spv = { + [4] = true, + [6] = true, + [8] = true, + [10] = true, + [13] = true, + [15] = true, + [17] = true, + [19] = true +} + +local sphns = { + [1] = true, + [3] = true, + [5] = true, + [7] = true, + [9] = true, + [11] = true, + [21] = true, + [23] = true +} + +local sphew = { + [0] = true, + [2] = true, + [12] = true, + [14] = true, + [16] = true, + [18] = true, + [20] = true, + [22] = true +} + +local owtv = { + [5] = true, + [7] = true, + [9] = true, + [11] = true, + [12] = true, + [14] = true, + [16] = true, + [18] = true +} + +local owtns = { + [0] = true, + [2] = true, + [4] = true, + [6] = true, + [8] = true, + [10] = true, + [20] = true, + [22] = true +} + +local owtew = { + [1] = true, + [3] = true, + [13] = true, + [15] = true, + [17] = true, + [19] = true, + [21] = true, + [23] = true +} + +local vert_n = { + [3] = {[5] = true}, + [6] = {[9] = true, [12] = true, [16] = true}, + [7] = {[9] = true, [11] = true}, +} + +local vert_e = { + [3] = {[5] = true}, + [6] = {[5] = true, [9] = true, [16] = true}, + [7] = {[7] = true, [11] = true}, +} + +local vert_s = { + [3] = {[5] = true}, + [6] = {[5] = true, [12] = true, [16] = true}, + [7] = {[5] = true, [7] = true}, +} + +local vert_w = { + [3] = {[5] = true}, + [6] = {[5] = true, [9] = true, [12] = true}, + [7] = {[5] = true, [9] = true}, +} + +local horiz_n = { + [3] = {[0] = true}, + [6] = {[0] = true, [4] = true, [20] = true}, + [7] = {[2] = true, [10] = true}, + [8] = {[0] = true}, + [9] = {[2] = true}, +} + +local horiz_e = { + [3] = {[1] = true}, + [6] = {[1] = true, [17] = true, [21] = true}, + [7] = {[3] = true, [19] = true}, + [8] = {[1] = true}, + [9] = {[3] = true}, +} + +local horiz_s = { + [3] = {[0] = true}, + [6] = {[0] = true, [8] = true, [20] = true}, + [7] = {[0] = true, [4] = true}, + [8] = {[0] = true}, + [9] = {[0] = true}, +} + +local horiz_w = { + [3] = {[1] = true}, + [6] = {[1] = true, [13] = true, [21] = true}, + [7] = {[1] = true, [13] = true}, + [8] = {[1] = true}, + [9] = {[1] = true}, +} + +local function get_sign_dir(node, def) + if (node.param2 == 4 and def.paramtype2 == "wallmounted") + or (node.param2 == 0 and def.paramtype2 ~= "wallmounted") then + return {["N"] = true} + elseif (node.param2 == 2 and def.paramtype2 == "wallmounted") + or (node.param2 == 1 and def.paramtype2 ~= "wallmounted") then + return {["E"] = true} + elseif (node.param2 == 5 and def.paramtype2 == "wallmounted") + or (node.param2 == 2 and def.paramtype2 ~= "wallmounted") then + return {["S"] = true} + elseif node.param2 == 3 then + return {["W"] = true} + end + return {} +end + +-- pipes + +function pipeworks.check_for_vert_pipe(pos, node, def, ppos, pnode, pdef) + local signdir = get_sign_dir(node, def) + local pipenumber = pdef.pipenumber + local pipedir = pnode.param2 + if string.find(pnode.name, "straight_pipe") and spv[pipedir] then + return true + elseif signdir["N"] and vert_n[pipenumber] and vert_n[pipenumber][pipedir] then + return true + elseif signdir["E"] and vert_e[pipenumber] and vert_e[pipenumber][pipedir] then + return true + elseif signdir["S"] and vert_s[pipenumber] and vert_s[pipenumber][pipedir] then + return true + elseif signdir["W"] and vert_w[pipenumber] and vert_w[pipenumber][pipedir] then + return true + end +end + +function pipeworks.check_for_horiz_pipe(pos, node, def, ppos, pnode, pdef) + local signdir = get_sign_dir(node, def) + local pipenumber = pdef.pipenumber + local pipedir = pnode.param2 + if string.find(pnode.name, "straight_pipe") then + if (signdir["N"] or signdir["S"]) and sphns[pipedir] then + return true + elseif (signdir["E"] or signdir["W"]) and sphew[pipedir] then + return true + end + elseif signdir["N"] and horiz_n[pipenumber] and horiz_n[pipenumber][pipedir] then + return true + elseif signdir["E"] and horiz_e[pipenumber] and horiz_e[pipenumber][pipedir] then + return true + elseif signdir["S"] and horiz_s[pipenumber] and horiz_s[pipenumber][pipedir] then + return true + elseif signdir["W"] and horiz_w[pipenumber] and horiz_w[pipenumber][pipedir] then + return true + end +end + +-- tubes + +function pipeworks.check_for_vert_tube(pos, node, def, ppos, pnode, pdef) + local signdir = get_sign_dir(node, def) + local tubenumber = pdef.tubenumber + local tubedir = pnode.param2 + if pnode.name == "pipeworks:one_way_tube" and owtv[tubedir] then + return true + elseif tubenumber == 2 and (tubedir == 5 or tubedir == 7) then -- it's a stub pointing up or down + return true + elseif signdir["N"] and vert_n[tubenumber] and vert_n[tubenumber][tubedir] then + return true + elseif signdir["E"] and vert_e[tubenumber] and vert_e[tubenumber][tubedir] then + return true + elseif signdir["S"] and vert_s[tubenumber] and vert_s[tubenumber][tubedir] then + return true + elseif signdir["W"] and vert_w[tubenumber] and vert_w[tubenumber][tubedir] then + return true + end +end + +function pipeworks.check_for_horiz_tube(pos, node, def, ppos, pnode, pdef) + local signdir = get_sign_dir(node, def) + local tubenumber = pdef.tubenumber + local tubedir = pnode.param2 + if tubenumber == 2 then -- it'a a stub pointing sideways + if (tubedir == 0 or tubedir == 2) and (signdir["N"] or signdir["S"]) then + return true + elseif (tubedir == 1 or tubedir == 3) and (signdir["E"] or signdir["W"]) then + return true + end + elseif pnode.name == "pipeworks:one_way_tube" then + if (signdir["N"] or signdir["S"]) and owtns[tubedir] then + return true + elseif (signdir["E"] or signdir["W"]) and owtew[tubedir] then + return true + end + elseif signdir["N"] and horiz_n[tubenumber] and horiz_n[tubenumber][tubedir] then + return true + elseif signdir["E"] and horiz_e[tubenumber] and horiz_e[tubenumber][tubedir] then + return true + elseif signdir["S"] and horiz_s[tubenumber] and horiz_s[tubenumber][tubedir] then + return true + elseif signdir["W"] and horiz_w[tubenumber] and horiz_w[tubenumber][tubedir] then + return true + end +end diff --git a/pipeworks/tube_registration.lua b/pipeworks/tube_registration.lua index 7bef10ea..e92e6769 100644 --- a/pipeworks/tube_registration.lua +++ b/pipeworks/tube_registration.lua @@ -116,7 +116,10 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e end minetest.swap_node(pos, {name = "pipeworks:broken_tube_1"}) pipeworks.scan_for_tube_objects(pos) - end + end, + check_for_pole = pipeworks.check_for_vert_tube, + check_for_horiz_pole = pipeworks.check_for_horiz_tube, + tubenumber = tonumber(tname) } if style == "6d" then nodedef.paramtype2 = "facedir" diff --git a/signs_lib/API.md b/signs_lib/API.md new file mode 100644 index 00000000..29a15168 --- /dev/null +++ b/signs_lib/API.md @@ -0,0 +1,367 @@ +# Signs_lib API + +In this text, common terms such as `pos`, `node`, or `placer`/`digger` will not be explained unless they have a different meaning than what's usually used in Minetest mods. See [minetest/doc/lua_api.txt](https://github.com/minetest/minetest/blob/master/doc/lua_api.txt) for details on these and other common terms, if necessary. Similarly, common shorthand such as `int`, `float`, etc. should require no explanation. + +## Registering a sign + +* `signs_lib.register_sign(nodename, def)` + + To put it simply, where you'd have used `minetest.register_node()` before, just replace it with this call. The syntax is identical, and in general, all settings/items allowed there are allowed here as well. Anything that `signs_lib` doesn't need to override or alter will be passed straight through to `register_node()`, unchanged (such as `description`, `tiles`, or `inventory_image`). + + The supplied node name will be prepended with ":", so that any mod can register signs under any other mod's namespace, if desired. + + Many items have default settings applied when omitted, most of which would produce something equivalent to "default:sign_wall_wood" if enough other node defintion settings were to be included. + + * `drawtype = "string"` + + Default: "mesh" + + * `tiles = {table}` + + Since this is a sign-specific library, this parameter behaves rather different from what you would normally use in `minetest.register_node()`. The first two entries are mandatory. The third, fourth and fifth entries are optional, depending on which mounting styles are enabled for a given node. + + * entry 1: the front and back of the sign. + * entry 2: the sides/edges + * entry 3: texture for the pole mount. If unspecified, the standard pole mount image is used, if needed. + * entry 4: texture for the hanging part. If unspecified, the standard hanging chains image is used, if needed. + * entry 5: texture for the yard sign stick. If unspecified, "default_wood.png" is used, if needed. + * entry 6: ignored. + + * `mesh = "string"` + + Default: "signs_lib_standard_wall_sign.obj". + + * `paramtype = "string"` + + Default: "light" + + * `paramtype2 = "string"` + + As with any other node, this determines how param2 is interpreted. Since these are signs, only two modes make sense: "wallmounted" and "facedir". Any other string is the same as "facedir". + + Default: "wallmounted" + + * `wield_image = "string"` + + Default: whatever the `inventory_image` is set to (if anything). + + * `selection_box = {table}` + + Works the same as usual. A helper function exists to create boxes by specifying only and X/Y size and offset: + `signs_lib.make_selection_boxes()` (see below). + + * `groups = {table}` + + Sets the sign's groups, as usual. In addition to whatever arbitrary groups you may have in mind, there are two presets available (both of which have `attached_node` removed, and `sign = 1` added): + + * `signs_lib.standard_wood_groups`, inherited from "default:sign_wall_wood" + * `signs_lib.standard_steel_groups`, inherited from "default:sign_wall_steel" + + Default: `signs_lib.standard_wood_groups` + + * `sounds = something` + + Sets the sign's sound profile, as usual. In addition to whatever sound profile you may have in mind, there are two presets available: + + * `signs_lib.standard_wood_sign_sounds`, inherited from "default:sign_wall_wood" + * `signs_lib.standard_steel_sign_sounds`, inherited from "default:sign_wall_steel" + + Default: `signs_lib.standard_wood_sign_sounds` + + * `drop = something` + + Default: inherited from the `nodename` argument given to `signs_lib.register_sign()` + + * `after_place_node = function(pos, placer, itemstack, pointed_thing, locked)` + + See below under "Main functions". + + Default: `signs_lib.after_place_node` + + * `on_rightclick = function(pos)` + + See below under "Main functions". + + Default: `signs_lib.construct_sign` + + * `on_construct = function(pos)` + + See below under "Main functions". + + Default: `signs_lib.construct_sign` + + * `on_destruct = function(pos)` + + See below under "Main functions". + + Default: `signs_lib.destruct_sign` + + * `on_receive_fields = function(pos, formname, fields, sender)` + + See below under "Main functions". + + Default: `signs_lib.receive_fields` + + * `on_punch = function(pos)` + + See below under "Main functions". + + Default: `signs_lib.update_sign` + + * `onpole_mesh = "string"` + * `hanging_mesh = "string"` + * `yard_mesh = "string"` + + If your node needs a custom model for its on-pole, hanging, and/or yard variants, specify them here, as needed. The materials and textures behave the same on these as on other sign models. All sign model filenames are still derived from the base sign model, when not overridden here (so these can be totally arbitrary filenames). + + Defaults: the normal "_onpole", "_hanging", or "_yard" version of the model specified by `mesh`. + + * `selection_box = {table}` + * `node_box = {table}` + + As usual, the former sets the sign's selection box, while the latter sets its collision information (since signs use model meshes). At the very least, you'll want to specify `selection_box`. If the sign node is in "wallmounted" mode, this must contain proper `wall_top`, `wall_side`, and `wall_bottom` entries, as one normally uses with such nodes. Signs that use "facedir" mode just need the usual `fixed` setting. + + Defaults: `selection_box` is a box that fits the standard wall sign, if not specified. `node_box` takes on the value given to `selection_box`, if not specified (or the standard wall sign setting, if neither is present). + + * `onpole_selection_box = {table}` + * `hanging_selection_box = {table}` + * `yard_selection_box = {table}` + * `onpole_node_box = {table}` + * `hanging_node_box = {table}` + * `yard_node_box = {table}` + + If your node needs special handling for its onpole-, hanging-, or yard-mode selection boxes or for their collision info (which `signs_lib` always uses the node's `node_box` item for), you can specify them here. Same syntax as the regular `selection_box` setting. + + Defaults: whatever the `selection_box` and `node_box` entries are set to. + + * `default_color = "string"` + + Sets the default text color for this sign, in hexadecimal (one digit, lowercase), from the standard Linux/IRC/CGA color palette. Same as the colors shown in the sign's formspec. + + Default: "0" (black) + + * `number_of_lines = int` + + Just what it says on the tin. How many lines you can fit will vary with overall sign node size, font size, scaling, line spacing, etc. + + Default: 6 + + * `horiz_scaling = float` + * `vert_scaling = float` + + Scaling factor applied to the entity texture horizontal or vertical resolution. Larger values increase the resolution. Since a given sign's entity is always displayed at a fixed visual scale, increasing these squeezes more pixels into the same space, making the text appear narrower or shorter. Increasing `vert_scaling` also increases the number of lines of text the sign will hold. + + Defaults: 1.0 for both + + * `line_spacing = int` + + Number of blank pixels to add between lines. + + Default: 1 + + * `font_size = int` + + Selects which font to use, either 15 or 31 (pixel height). This setting directly affects the sign's vertical resolution. + + Default: 15 + + * `x_offset = int` + * `y_offset = int` + + Starting X and Y position in pixels, relative to the text entity UV map upper-left corner. + + Defaults: 4 for X, 0 for Y + + * `chars_per_line = int` + + Approximate number of characters that should fit on a line. This, the selected font's average character width, and the `horiz_scaling` together set the horizontal resolution of the text entity's texture. + + Default: 35 + + * `entity_info = something` + + Describes the entity model and yaw table to use. May be one of: + + * A table specifying the two settings directly, such as: + + ```lua + entity_info = { + mesh = "signs_lib_standard_wall_sign_entity.obj", + yaw = signs_lib.wallmounted_yaw + } + ``` + * `signs_lib.standard_yaw` is also available as a yaw preset, if desired. + + * a string reading "standard", which tells `signs_lib` to use the standard wood/steel sign model, in wallmounted mode. Equivalent to the example above. + * nothing at all: if omitted, the sign will not have a formspec, basically all text-related settings will be ignored and/or omitted entirely, and no entity will be spawned for this sign, thus the sign will not be writable. This is the default, and is of course what one would want for any sign that's just an image wrapped around a model, as in most of the signs in [my street signs mod](https://forum.minetest.net/viewtopic.php?t=20866). + + Default: **nil** + + * `allow_hanging = bool` + * `allow_onpole = bool` + * `allow_onpole_horizontal = bool` + * `allow_yard = bool` + + + If **true**, these allow the registration function to create versions of the initial, base sign node that either hang from the ceiling, are mounted on a vertical pole/post, are mounted on a horizontal pole, or are free-standing, on a small stick. Their node names will be the same as the base wall sign node, except with "_hanging", "_onpole", "_onpole_horiz", or "_yard", respectively, appended to the end of the node name. If the base node name has "_wall" in it, that bit is deleted before appending the above. + + These options are independent of one another. + + Defaults: all **nil** + + * `allow_widefont = bool` + + Just what it says on the tin. If enabled, the formspec will have a little "on/off switch" left of the "Write" button, to select the font width. + + Default: **nil** + + * `locked = bool` + + Sets this sign to be locked/owned, like the original default steel wall sign. + + Default: **nil** + +### Example sign definition: + +```lua +signs_lib.register_sign("basic_signs:sign_wall_glass", { + description = S("Glass Sign"), + yard_mesh = "signs_lib_standard_sign_yard_two_sticks.obj", + tiles = { + { name = "basic_signs_sign_wall_glass.png", backface_culling = true}, + "basic_signs_sign_wall_glass_edges.png", + "basic_signs_pole_mount_glass.png", + nil, + nil, + "default_steel_block.png" -- the sticks on back of the yard sign model + }, + inventory_image = "basic_signs_sign_wall_glass_inv.png", + default_color = "c", + locked = true, + entity_info = "standard", + sounds = default.node_sound_glass_defaults(), + groups = {cracky = 3, oddly_breakable_by_hand = 3}, + allow_hanging = true, + allow_widefont = true, + allow_onpole = true, + allow_onpole_horizontal = true, + allow_yard = true, + use_texture_alpha = true, +}) +``` + +### Main functions used within a sign definition + +* `signs_lib.after_place_node(pos, placer, itemstack, pointed_thing, locked)` + + Determines if the `pointed_thing` is a wall, floor, ceiling, or pole/post, and swaps the placed sign for the correct model. + + * `locked`: if set to **true**, the sign's meta will be tweaked to indicate its ownership by the `placer`. + +* `signs_lib.construct_sign(pos)` + + Sets up the sign's formspec and infotext overlay. + +* `signs_lib.destruct_sign(pos)` + + Deletes the sign's entity, if any, when the sign is dug. + +* `signs_lib.receive_fields(pos, formname, fields, sender)` + + This handles the text input and wide font on/off switch, logging any actions the user takes. Bails-out silently if the user is not allowed to edit the sign. See the standard Minetest lua_api.txt for details. + +* `signs_lib.update_sign(pos, fields)` + + If the sign's writable, this deletes any sign-related entities in the sign's node space, spawns a new one, and renders whatever text is in the sign's meta. + +* `signs_lib.can_modify(pos, player)` + + Returns **true** if the player is allowed to dig, edit, or change the font width of the sign. + +* `signs_lib.handle_rotation(pos, node, player, mode)` + + Just what it says on the tin. Limits the sign's rotation as needed (for example, a sign on a horizontal pole can only flip from one side to the other). + + * `mode`: the screwdriver's mode, as passed from the screwdriver mod. + + Returns **false** if the user tried to right-click with the screwdriver, **true** otherwise. + +* `signs_lib.make_selection_boxes(x_size, y_size, foo, x_offset, y_offset, z_offset, is_facedir)` + + * `x_size`/`y_size`: dimensions in inches. One node is 39.37 inches on a side. This function uses inches instead of metric because it started out as a selection box maker for [MUTCD-2009](https://mutcd.fhwa.dot.gov/pdfs/2009r1r2/mutcd2009r1r2edition.pdf)-compliant signs, which are measured in inches. + * `x_offset`/`y_offset`/`z_offset`: shift the selection box (inches, defaults to centered, with the back face flush with the back of the node). + * `is_facedir`: if unset, the selection boxes will be created with the assumption that `paramtype2 = "wallmounted"` mode is set on the node the box will be used on. Any other value creates a selection box for "facedir" mode. + * `foo` is ignored (leftover from an argument that's long since been rendered obsolete. + + Returns a table suitable for the `selection_box` node definition entry. + +#### Helper functions + +You probably won't need to call any of these directly. + +* `signs_lib.read_image_size(filename)` + + Returns width and height of the indicated PNG file (return values will be gibberish if it isn't a PNG). + +* `signs_lib.split_lines_and_words(text)` + + Just what it says on the tin. + + Returns a table of lines, each line entry being a table of words. + +* `signs_lib.delete_objects(pos)` + + Deletes all entities within the node space given by `pos`. + +* `signs_lib.spawn_entity(pos, texture)` + + Spawns a new text entity at the given position and assigns the supplied `texture` to it, if any. + +* `signs_lib.check_for_pole(pos, pointed_thing)` + + Attempts to determine if the `pointed_thing` qualifies as a vertical pole or post of some kind. + + Returns **true** if a suitable pole/post is found + +* `signs_lib.check_for_horizontal_pole(pos, pointed_thing)` + + Same idea, but for horizontal poles/posts. + + Returns **true** if a suitable pole/post is found. + +* `signs_lib.check_for_ceiling(pointed_thing)` + + Returns **true** if the `pointed_thing` appears to be the bottom of a node. + +* `signs_lib.check_for_floor(pointed_thing)` + + Returns **true** if the `pointed_thing` appears to be the top of a node. + +* `signs_lib.set_obj_text(pos, text)` + + Cooks the supplied `text` as needed and passes it to the entity rendering code. Essentially, this is where rendering text into an image starts. + +## Options for pole/post nodes + +Occasionally, you'll run into a node that either looks like a pole/post, or has one in the middle of its node space (with room to fit a sign in there), but which isn't detected as a pole/post by the standard sign placement code. In these situations, some kind of special check is needed. + +Supplying one or both of the following in the pole/post node's definition will cause `signs_lib` to skip its usual pole/post detection code, in favor of the supplied function(s). + + * `check_for_pole = function(pos, node, def, pole_pos, pole_node, pole_def)` + + If supplied, this function will be run when the mod is looking for a normal vertical pole/post. Useful if the target node's orientation and/or shape determine what sides a sign can attach to. For example, [Pipeworks](https://forum.minetest.net/viewtopic.php?pid=27794) uses this to figure out if a sign can be attached to a tube or pipe, depending on the tube's/pipe's number of junctions, and on its orientation and that of the placed sign. + + * `def`: the placed sign's node defintion + * `pole_pos`: the target node's position + * `pole_node`: the target node itself + * `pole_def`: its node definition + + Your code must return **true** if the sign should attach to the target node. + + If desired, this entry may simply be set to `check_for_pole = true` if a sign can always attach to this node regardless of facing direction (for example, [Home Decor](https://forum.minetest.net/viewtopic.php?pid=26061) has a round brass pole/post, which always stands vertical, and [Cottages](https://forum.minetest.net/viewtopic.php?id=5120) has a simple table that's basically a fencepost with a platform on top). + + * `check_for_horiz_pole = function(pos, node, def, pole_pos, pole_node, pole_def)` + + If supplied, this does the same thing for horizontal poles. + + Your code must return **true** if the sign should attach to the target node. diff --git a/signs_lib/MODELS.md b/signs_lib/MODELS.md new file mode 100644 index 00000000..e12046e0 --- /dev/null +++ b/signs_lib/MODELS.md @@ -0,0 +1,104 @@ +# Anatomy of a sign model + +In the model files: + +* The base sign model should be designed to look like a flat board placed on one side of the node space. The first material entry in the model file must be assigned to the front and back faces of the sign, the second material must be the sign's edges. The filename should be something along the lines of "mymod_my_cool_sign_wall.obj". + + In each of the variants below, generally-speaking, the third material in the model must be assigned to whatever it is that that model uses for the sign's mounting method, and the mounting style will be the last word in the model filename. + +* For most signs that are allowed to sit on a vertical pole/post such as a fencepost, the pole-mounted model is just a copy of the base model, shifted back a bit, with a pole mount added to the back. In these models, the third material in the model file must be assigned to the pole mount. Name the model file the same as the base sign, but end the name with "_onpole" instead of "_wall". For example, "mymod_my_cool_sign_onpole.obj". + + For signs that allow mounting onto a horizontal pole (such as a Streets mod horizontal "bigpole"), the third material is still the vertical pole mount as above, but there must also be another the pole mount included, designed to wrap around such a pole/post, to which fourth material must be assigned. In most cases, this alternate mount will just be a copy of the vertical pole mount, but rotated by 90°, and explicitly centered vertically in the node space. + + While vertical and horizontal pole/post mounting options are independent in the code, if horizontal mounting is enabled, the on-pole model must still have *four* materials, even if the third material is unused, with the horizontal pole mount assigned to the fourth material. In most situations, you'll probably have both vertical and horizontal pole mounts assigned to the third and fourth materials, as above. + +* For hanging sign models, the third material must be assigned to whatever it is that makes the sign look like it's hanging from the ceiling (default signs have a simple, flat rectangle, meant to show an image of a simple pair of chains). The model file for these must be named the same as the base model, but ending with "_hanging". For example, "mymod_my_cool_sign_hanging.obj". + +* For yard sign models, the third material must be assigned to the "stick" on the back of the sign. The model for this type must be named the same as the base model, but ending with "_yard". For example, "mymod_my_cool_sign_yard.obj". + +* For most signs, the sign entity (if applicable) will be a simple rectangle, sized just slightly smaller than the width and height of the sign, and centered relative to the sign face. Its UV map should cover the entire image area, so that the image is shrunk down to fit within the sign's intended text area. The rectangle must be positioned slightly in front of the sign (by 10 millimeters or so, due to engine position precision limitations). + + The entity should be named the same as the corresponding wall, on-pole, hanging, and/or yard models, but with "_entity" added just before the mounting style. For example: a sign using "mymod_my_cool_sign_wall.obj" for the base model file should have an entity model file named "mymod_my_cool_sign_entity_wall.obj", if one will be needed. + +In your code: + +* The first `tiles{}` entry in the sign definition needs to be the front-back texture (how things are arranged within the image file is up to you, provided you match your sign model's UV map to the layout of your image). The second entry will be the texture for the sign's edges. + +* For signs that can be mounted on a pole/post, the third item in your `tiles{}` setting specifies the pole mount image to use. When `signs_lib` goes to register the on-pole node(s), the image you specified here will be passed to `register_node()` as either the third or *fourth* tile item, setting the other to the standard blank/empty image, thus revealing only the vertical or horizontal pole mount, respectively. If you don't specify a pole mount image, the standard pole mount texture will be used instead, if needed. + +* For signs that can hang from a ceiling, the fourth entry in your `tiles{}` setting specifies the image to apply to the part of the model that makes it look like it's hanging. If not specified, the standard hanging chains image will be used instead, if needed. + +* For signs that can stand up in the yard, the fifth `tiles{}` entry specifies the image to be wrapped around the "stick" that the sign's mounted on. If not specified, "default_wood.png" will be used instead, if needed. + +* Some signs may allow for more complex entity shapes, images, and UV mapping. For example, [street_signs](https://forum.minetest.net/viewtopic.php?t=20866) has a standard city street intersection sign, the entity mesh for which consists of four simple rectangles. Two of them are identically UV-mapped to the top portion of the texture image, and placed on either side of the upper half of the sign portion of the model. The other two rectangles are also identically UV-mapped, but point to a lower section of the texture, and are rotated by 90° and shifted down in the model, to place them on either side of the lower half of the sign. This causes the first line of text to appear on both sides of the upper half of the sign, with the second line of text appearing on both sides of the lower half. + + Signs which don't use the simple models described above may not be compatible with the wall/pole/ceiling/yard placement code, but these things can be overridden/disabled in the node definition, if needed (as with the above intersection sign). + +* `signs_lib` automatically blanks-out all redundant `tiles{}` entries for each node. + +## Blender users + +Start a new project, open the "Sidebar" (usually by pressing `N`), and scroll down to the Display section. Set the Grid floor to 5 lines, Scale to 0.5, and Subdivisions to 8. + +This will create an environment where the world origin/center will be the center of a node space at (0,0,0), with major divisions at half-node intervals. With the camera aligned to an axis, zooming in so that one node space fills the window should put the grid at 16 minor divisions per meter, so the grid will correspond to pixels in a typical 16px-apparent texture, if your UV mapping is correct (though a standard sign model uses 32px-apparent textures). + +Zoom in a bit more, and you'll see 256 divisions per meter, which can be thought of as 16 divisions per pixel. This is where you'll want to be when positioning the sign entity. In my configuration, the grid maxes out at 256 divisions per meter, even when zoomed in extremely close (this may be standard behavior). + +For signs that will use "wallmounted" mode, the model must be lying flat, with its front side facing up along Blender's Z axis, and centered on the X and Y axes. The back of the sign should be exactly flush with the -0.5m mark on the Z axis, putting the whole sign below the world center. The bottom edge of the sign faces the negative end of the Y axis. + +For signs that will use "facedir" mode, the sign must be upright, with its back flush with the +0.5m mark along the Y axis, centered on X/Z, with the bottom edge of the sign facing down along the Z axis. + +When adding materials, you MUST add them in the order you want them to appear in the exported model, as Blender provides no easy way to enforce a particular order if they come out wrong. + +If you look in the `models/` directory, you'll find the standard sign project file, "standard wooden sign.blend", which contains all four variants of the standard sign model ("wallmounted" and "facedir", on-wall and on-pole), designed per the above requirements. This file also contains both entity variants (on-wall and on-pole). You'll notice that there are only two entities. This is because entity rotation has no concept of "wallmounted", "facedir", etc., so all standard signs use the same pair of entities. + +To create the text entity model, assuming you're starting with a properly-UV-mapped, "wallmounted" base sign model with a simple one-piece flat design (comparable to, say, a standard wall sign or a [street_signs](https://forum.minetest.net/viewtopic.php?t=20866) warning diamond), do these steps: + +1. Snap the cursor to the world center, and set your viewport to Orthographic (usually `5` on the keypad). +2. Switch to Object Mode. +3. Select the sign model. +4. Create a linked duplicate (`Alt-D` in my keymap), as distinct from a simple duplicate (`Shift-D`). Blender will automatically select the duplicate and immediately go into move/translate mode to let you move it around. +5. Without bothering to move the duplicate, press `R` `X` to go into rotatation mode around the X axis, which will also snap the duplicate back to its precise starting point in the process. +6. Rotate the duplicate by 90°, thus putting it upright, with its back side flush with the +0.5m mark on the Y axis. +7. With the duplicate still selected, switch to Edit Mode. +8. Select only the duplicate sign's front face. +9. Rotate your view to the right or left side (usually `3` or `Ctrl-3` on the keypad). +10. Zoom in close enough to get the grid to show 256 divisions per meter, while keeping the selected face in view. +11. Make a simple duplicate of the selected face (`Shift-D`). Blender will automatically select just the new, duplicate face and go into move/translate mode. Yeah, you're making a copy of a copy. 🙂 +12. Press `Y` to limit movement to just the Y axis, and move the duplicate face in the negative direction, while snapping to the grid. Put it at least 2 minor divisions from the front of the sign (that is, 2/256 of a meter). +13. Zoom out far enough to get the grid back to 16 divisions per meter, and align your view forward along the Y axis (usually `1` on the keypad). +14. With the duplicate face still selected, scale it along X and/or Z until its edges are just within the limits of your sign model's intended text area. You could also directly move the face's edges inward, perhaps while snapping to the grid, if the sign shape lends itself to that. Make sure the face stays properly-positioned (usually centered) relative to the sign's front! +15. UV-map the duplicate face: `Mesh` → `UV Unwrap` → `Reset` followed by `Mesh` → `UV Unwrap` → `Project from view (bounds)`. +16. Separate the duplicate face into a new object (`P` in my keymap, then `Selection` in the menu that pops-up). +17. Switch to Object Mode +18. In the model/data tree at the upper-right (well, on my layout), rename the original sign mesh, its duplicate, and the entity mesh to something meaningful. +19. With only the text entity mesh selected, delete all materials from the list on the right, below the model/data tree (these were inherited from the base sign, and aren't needed with an entity mesh). +20. Save your project file. +21. Export the text entity mesh. It is highly recommended that you export to "Wavefront (.obj)" format, as with most other Minetest node models. + +Note that the duplicate sign model you created can also be used directly as a "facedir" sign model, as well as being a position reference for the text entity mesh, so I suggest leaving it in your project file when you save. + +Use the following export settings (I strongly advise saving them as an Operator Preset; applies to all models and modes): + + Forward: [_Z_Forward_] + Up: [_Y_Up______] + 🆇 Selection Only + 🞎 Animation + 🆇 Apply Modifiers + 🞎 Use Modifiers Render Settings + 🞎 Include Edges + 🞎 Smooth Groups + 🞎 Bitflag Smooth Groups + 🆇 Write Normals + 🆇 Include UVs + 🞎 Write Materials + 🞎 Triangulate Faces + 🞎 Write Nurbs + 🞎 Polygroups + 🆇 Objects as OBJ Objects + 🞎 Objects as OBJ Groups + 🆇 Material Groups + 🞎 Keep Vertex Order + (_Scale:________1.00_) + Path Mode: [_Auto____] + diff --git a/signs_lib/README.md b/signs_lib/README.md new file mode 100644 index 00000000..fbb625fe --- /dev/null +++ b/signs_lib/README.md @@ -0,0 +1,59 @@ +# signs_lib + +This is kaeza's and my signs library mod, originally forked from PilzAdam's version and rewritten mostly by kaeza to include a number of new features, then rewritten again a couple more times (finding its way into my [street_signs](https://forum.minetest.net/viewtopic.php?t=20866) mod for a while, where it developed nicely 🙂). + +The purpose of PilzAdam's original mod was to just provide a no-frills way make default signs show their text, via an entity placed right in front. It was hacky, but it worked! + +While still hacky, this library is a modernized, feature-enhanced version of his code, which not only has visible text, but which allows that text to be colored, and displayed at any reasonable size, with any reasonable amount of text (as configured in a given node definition), with two font resolutions available. Plus, almost any sign can be attached to almost any kind of suitable pole or fencepost. Most signs that use the standard wall sign model can also be hung from a ceiling, or placed upright as a yard sign, in addition to being flat on a wall or floor. Unlike previous incarnations of this code, signs' text is visible when the sign is flat on the floor or ceiling, as well as all other supported orientations/mounting styles. + +Without any other add-ons, this mod upgrades only the default wooden and steel signs. + +## Text formatting + +In general, text is rendered exactly as-written, left-to-right, top to bottom, without any translations or modifications. The standard fonts support 7-bit ASCII as well as Cyrllic. + +That said, there are some basic text formatting options: + +* Paragraph breaks (blank lines) may be inserted by simply hitting `Enter` twice. + +* Eight arrow symbols are available, occupying positions 0x81 through 0x88 in the character set. These are produced by writing a "^" followed by a number 1 to 8: + + "^1" = `⬆`, "^2" = `⬈`, "^3" = `➡`, "^4" = `⬊`, "^5" = `⬇`, "^6" = `⬋`, "^7" = `⬅`, "^8" = `⬉` + + Writing "^" followed by a letter "a" through "h" will produce double-wide versions of these arrows, in the same order. These wide arrows occupy 0x89 to 0x91 in the character set. + +* A color may be specified in the sign text by using "#" followed by a single hexadcimal digit (0-9 or a-f). These colors come from the standard Linux/IRC/CGA color set, and are shown in the sign's formspec. Any color change will remain in effect until changed again, or until the next line break. Any number of color changes in any arbitrary arrangement is allowed. + +## Sign placement and rotation notes + +* Pointing at a wall while placing will, of course, place the sign on the wall. + +* For most signs, pointing at the ground while placing puts the sign flat on the ground. + + Exception: if you have [basic_signs](https://forum.minetest.net/viewtopic.php?f=11&t=23289) installed, placing a default wooden sign on the ground will instead create a "yard" sign (basically a regular wooden sign mounted upright on a small stick). + +* For most signs, pointing at the ceiling while placing will put the sign flat against the ceiling. + + Exception: default wood and steel signs will instead be hung from the ceiling by a pair of chains. If you have [basic_signs](https://forum.minetest.net/viewtopic.php?f=11&t=23289), all standard signs created by it will do the same. + +* Pointing at an X or Z side of something that's detected as a pole/post will mount the sign onto that pole. Note that the sign actually occupies the node space in front of the pole, since they're still separate nodes. But, I figure, no one's going to want to use the space in front of the sign anyway, because doing so would of course obscure the sign, so it doesn't matter if the sign logically occupies that node space. + +* If you're holding the "Sneak" key (usually `Shift`) while placing, the on-pole/hanging/yard checks are skipped, allowing you to just place a sign flat onto the ground, ceiling, or top/bottom of a pole/post, like they used to work before `signs_lib` was a thing. + +* If a sign is on the wall or flat on the ground, the screwdriver will spin it from one wall to the next, in clockwise order, whether there's a wall to attach to or not, followed by putting it flat on the ground, then flat against the ceiling, then back to wall orientation. + +* If a sign is hanging from the ceiling (not flat against it), the screwdriver will just rotate it around its Y axis. + +* If a sign is on a vertical pole/post, the screwdriver will rotate it around the pole, but only if there's nothing in the way. + +* If a sign is on a horizontal pole/post, the screwdriver will flip it from one side to the other as long as there's nothing in the way. + +## Chat commands + +At present, only one command is defined: + +* `/regen_signs` + +This will read through the list of currently-loaded blocks known to contain one or more signs, delete all entities found in each sign's node space, and respawn and re-render each from scratch. + +The list of loaded, sign-bearing blocks is created/populated by an LBM (and trimmed by this command if any listed blocks are found to have been unloaded). diff --git a/signs_lib/api.lua b/signs_lib/api.lua index 11d40e6c..d15be3ff 100644 --- a/signs_lib/api.lua +++ b/signs_lib/api.lua @@ -168,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 @@ -182,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 @@ -230,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) @@ -288,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 @@ -544,7 +565,7 @@ 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) @@ -598,14 +619,6 @@ function signs_lib.split_lines_and_words(text) 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 - function signs_lib.construct_sign(pos) local form = "size[6,4]".. "textarea[0,-0.3;6.5,3;text;;${text}]".. @@ -750,6 +763,10 @@ function signs_lib.check_for_pole(pos, pointed_thing) if not pdef then return end + if signs_lib.check_for_ceiling(pointed_thing) or signs_lib.check_for_floor(pointed_thing) then + return false + end + if type(pdef.check_for_pole) == "function" then local node = minetest.get_node(pos) local def = minetest.registered_items[node.name] @@ -769,12 +786,14 @@ function signs_lib.check_for_horizontal_pole(pos, pointed_thing) if not pdef then return end + if signs_lib.check_for_ceiling(pointed_thing) or signs_lib.check_for_floor(pointed_thing) then + return false + 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 @@ -796,12 +815,19 @@ end function signs_lib.after_place_node(pos, placer, itemstack, pointed_thing, locked) local playername = placer:get_player_name() - local def = minetest.registered_items[itemstack:get_name()] + + local controls = placer:get_player_control() + + local signname = itemstack:get_name() + local no_wall_name = string.gsub(signname, "_wall", "") + + local def = minetest.registered_items[signname] local ppos = minetest.get_pointed_thing_position(pointed_thing) local pnode = minetest.get_node(ppos) local pdef = minetest.registered_items[pnode.name] - if def.allow_onpole and signs_lib.check_for_pole(pos, pointed_thing) then + + if def.allow_onpole and signs_lib.check_for_pole(pos, pointed_thing) and not controls.sneak then local newparam2 local lookdir = minetest.yaw_to_dir(placer:get_look_horizontal()) if def.paramtype2 == "wallmounted" then @@ -810,8 +836,8 @@ function signs_lib.after_place_node(pos, placer, itemstack, pointed_thing, locke newparam2 = minetest.dir_to_facedir(lookdir) end local node = minetest.get_node(pos) - minetest.swap_node(pos, {name = itemstack:get_name().."_onpole", param2 = newparam2}) - elseif def.allow_onpole_horizontal and signs_lib.check_for_horizontal_pole(pos, pointed_thing) then + minetest.swap_node(pos, {name = no_wall_name.."_onpole", param2 = newparam2}) + elseif def.allow_onpole_horizontal and signs_lib.check_for_horizontal_pole(pos, pointed_thing) and not controls.sneak then local newparam2 local lookdir = minetest.yaw_to_dir(placer:get_look_horizontal()) if def.paramtype2 == "wallmounted" then @@ -820,16 +846,21 @@ function signs_lib.after_place_node(pos, placer, itemstack, pointed_thing, locke newparam2 = minetest.dir_to_facedir(lookdir) end local node = minetest.get_node(pos) - minetest.swap_node(pos, {name = itemstack:get_name().."_onpole_horiz", param2 = newparam2}) - elseif def.allow_hanging and signs_lib.check_for_ceiling(pointed_thing) then + minetest.swap_node(pos, {name = no_wall_name.."_onpole_horiz", param2 = newparam2}) + elseif def.allow_hanging and signs_lib.check_for_ceiling(pointed_thing) and not controls.sneak then local newparam2 = minetest.dir_to_facedir(placer:get_look_dir()) local node = minetest.get_node(pos) - minetest.swap_node(pos, {name = itemstack:get_name().."_hanging", param2 = newparam2}) + minetest.swap_node(pos, {name = no_wall_name.."_hanging", param2 = newparam2}) + elseif def.allow_yard and signs_lib.check_for_floor(pointed_thing) and not controls.sneak then + local newparam2 = minetest.dir_to_facedir(placer:get_look_dir()) + local node = minetest.get_node(pos) + minetest.swap_node(pos, {name = no_wall_name.."_yard", param2 = newparam2}) elseif def.paramtype2 == "facedir" and signs_lib.check_for_ceiling(pointed_thing) then - minetest.swap_node(pos, {name = itemstack:get_name(), param2 = 6}) + minetest.swap_node(pos, {name = signname, param2 = 6}) elseif def.paramtype2 == "facedir" and signs_lib.check_for_floor(pointed_thing) then - minetest.swap_node(pos, {name = itemstack:get_name(), param2 = 4}) + minetest.swap_node(pos, {name = signname, param2 = 4}) end + if locked then local meta = minetest.get_meta(pos) meta:set_string("owner", playername) @@ -841,195 +872,194 @@ 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 ---[[ -The main sign registration function -=================================== +function signs_lib.register_sign(name, raw_def) + local def = table.copy(raw_def) -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) - local def = table.copy(rdef) - - if rdef.entity_info == "standard" then + if raw_def.entity_info == "standard" then def.entity_info = { - mesh = "signs_lib_standard_wall_sign_entity.obj", + mesh = "signs_lib_standard_sign_entity_wall.obj", yaw = signs_lib.wallmounted_yaw } - elseif rdef.entity_info then - def.entity_info = rdef.entity_info + elseif raw_def.entity_info then + def.entity_info = raw_def.entity_info end - def.after_place_node = rdef.after_place_node or signs_lib.after_place_node + def.after_place_node = raw_def.after_place_node or signs_lib.after_place_node - if rdef.entity_info then - def.on_rightclick = rdef.on_rightclick or signs_lib.construct_sign - def.on_construct = rdef.on_construct or signs_lib.construct_sign - def.on_destruct = rdef.on_destruct or signs_lib.destruct_sign - def.on_receive_fields = rdef.on_receive_fields or signs_lib.receive_fields - def.on_punch = rdef.on_punch or signs_lib.update_sign - def.number_of_lines = rdef.number_of_lines or signs_lib.standard_lines - def.horiz_scaling = rdef.horiz_scaling or signs_lib.standard_hscale - def.vert_scaling = rdef.vert_scaling or signs_lib.standard_vscale - def.line_spacing = rdef.line_spacing or signs_lib.standard_lspace - def.font_size = rdef.font_size or signs_lib.standard_fsize - def.x_offset = rdef.x_offset or signs_lib.standard_xoffs - def.y_offset = rdef.y_offset or signs_lib.standard_yoffs - def.chars_per_line = rdef.chars_per_line or signs_lib.standard_cpl - def.default_color = rdef.default_color or "0" - if rdef.locked and not rdef.after_place_node then + if raw_def.entity_info then + def.on_rightclick = raw_def.on_rightclick or signs_lib.construct_sign + def.on_construct = raw_def.on_construct or signs_lib.construct_sign + def.on_destruct = raw_def.on_destruct or signs_lib.destruct_sign + def.on_receive_fields = raw_def.on_receive_fields or signs_lib.receive_fields + def.on_punch = raw_def.on_punch or signs_lib.update_sign + def.number_of_lines = raw_def.number_of_lines or signs_lib.standard_lines + def.horiz_scaling = raw_def.horiz_scaling or signs_lib.standard_hscale + def.vert_scaling = raw_def.vert_scaling or signs_lib.standard_vscale + def.line_spacing = raw_def.line_spacing or signs_lib.standard_lspace + def.font_size = raw_def.font_size or signs_lib.standard_fsize + def.x_offset = raw_def.x_offset or signs_lib.standard_xoffs + def.y_offset = raw_def.y_offset or signs_lib.standard_yoffs + def.chars_per_line = raw_def.chars_per_line or signs_lib.standard_cpl + def.default_color = raw_def.default_color or "0" + if raw_def.locked and not raw_def.after_place_node then def.after_place_node = function(pos, placer, itemstack, pointed_thing) signs_lib.after_place_node(pos, placer, itemstack, pointed_thing, true) end end end - def.paramtype = rdef.paramtype or "light" - def.drawtype = rdef.drawtype or "mesh" - def.mesh = rdef.mesh or "signs_lib_standard_wall_sign.obj" - def.wield_image = rdef.wield_image or def.inventory_image - def.drop = rdef.drop or name - def.sounds = rdef.sounds or signs_lib.standard_wood_sign_sounds - def.paramtype2 = rdef.paramtype2 or "wallmounted" - def.on_rotate = rdef.on_rotate or signs_lib.handle_rotation + def.paramtype = raw_def.paramtype or "light" + def.drawtype = raw_def.drawtype or "mesh" + def.mesh = raw_def.mesh or "signs_lib_standard_sign_wall.obj" + def.wield_image = raw_def.wield_image or def.inventory_image + def.drop = raw_def.drop or name + def.sounds = raw_def.sounds or signs_lib.standard_wood_sign_sounds + def.paramtype2 = raw_def.paramtype2 or "wallmounted" + def.on_rotate = raw_def.on_rotate or signs_lib.handle_rotation - if rdef.groups then - def.groups = rdef.groups + if raw_def.groups then + def.groups = raw_def.groups else def.groups = signs_lib.standard_wood_groups end local cbox = signs_lib.make_selection_boxes(35, 25) - def.selection_box = rdef.selection_box or cbox - def.node_box = table.copy(rdef.node_box or rdef.selection_box or cbox) + def.selection_box = raw_def.selection_box or cbox + def.node_box = table.copy(raw_def.node_box or raw_def.selection_box or cbox) if def.sunlight_propagates ~= false then def.sunlight_propagates = true end + def.tiles[3] = "signs_lib_blank.png" + def.tiles[4] = "signs_lib_blank.png" + def.tiles[5] = "signs_lib_blank.png" + def.tiles[6] = "signs_lib_blank.png" + minetest.register_node(":"..name, def) table.insert(signs_lib.lbm_restore_nodes, name) - local opdef = table.copy(def) + local no_wall_name = string.gsub(name, "_wall", "") - if rdef.allow_onpole or rdef.allow_onpole_horizontal then + local othermounts_def = table.copy(def) + + if raw_def.allow_onpole or raw_def.allow_onpole_horizontal then local offset = 0.3125 - if opdef.uses_slim_pole_mount then + if othermounts_def.uses_slim_pole_mount then offset = 0.35 end - opdef.selection_box = rdef.onpole_selection_box or opdef.selection_box - opdef.node_box = rdef.onpole_node_box or opdef.selection_box + othermounts_def.selection_box = raw_def.onpole_selection_box or othermounts_def.selection_box + othermounts_def.node_box = raw_def.onpole_node_box or othermounts_def.selection_box - if opdef.paramtype2 == "wallmounted" then - opdef.node_box.wall_side[1] = def.node_box.wall_side[1] - offset - opdef.node_box.wall_side[4] = def.node_box.wall_side[4] - offset + if othermounts_def.paramtype2 == "wallmounted" then + othermounts_def.node_box.wall_side[1] = def.node_box.wall_side[1] - offset + othermounts_def.node_box.wall_side[4] = def.node_box.wall_side[4] - offset - opdef.selection_box.wall_side[1] = def.selection_box.wall_side[1] - offset - opdef.selection_box.wall_side[4] = def.selection_box.wall_side[4] - offset + othermounts_def.selection_box.wall_side[1] = def.selection_box.wall_side[1] - offset + othermounts_def.selection_box.wall_side[4] = def.selection_box.wall_side[4] - offset else - opdef.node_box.fixed[3] = def.node_box.fixed[3] + offset - opdef.node_box.fixed[6] = def.node_box.fixed[6] + offset + othermounts_def.node_box.fixed[3] = def.node_box.fixed[3] + offset + othermounts_def.node_box.fixed[6] = def.node_box.fixed[6] + offset - opdef.selection_box.fixed[3] = def.selection_box.fixed[3] + offset - opdef.selection_box.fixed[6] = def.selection_box.fixed[6] + offset + othermounts_def.selection_box.fixed[3] = def.selection_box.fixed[3] + offset + othermounts_def.selection_box.fixed[6] = def.selection_box.fixed[6] + offset end - opdef.groups.not_in_creative_inventory = 1 - opdef.mesh = string.gsub(opdef.mesh, ".obj$", "_onpole.obj") + othermounts_def.groups.not_in_creative_inventory = 1 + othermounts_def.mesh = raw_def.onpole_mesh or string.gsub(othermounts_def.mesh, "wall.obj$", "onpole.obj") - if opdef.entity_info then - opdef.entity_info.mesh = string.gsub(opdef.entity_info.mesh, ".obj$", "_onpole.obj") + if othermounts_def.entity_info then + othermounts_def.entity_info.mesh = string.gsub(othermounts_def.entity_info.mesh, "entity_wall.obj$", "entity_onpole.obj") end end -- setting one of item 3 or 4 to a texture and leaving the other "blank", -- reveals either the vertical or horizontal pole mount part of the model - if rdef.allow_onpole then - opdef.tiles[3] = "signs_lib_pole_mount.png" - opdef.tiles[4] = "signs_lib_blank.png" - minetest.register_node(":"..name.."_onpole", opdef) - table.insert(signs_lib.lbm_restore_nodes, name.."_onpole") + if raw_def.allow_onpole then + othermounts_def.tiles[3] = raw_def.tiles[3] or "signs_lib_pole_mount.png" + othermounts_def.tiles[4] = "signs_lib_blank.png" + othermounts_def.tiles[5] = "signs_lib_blank.png" + othermounts_def.tiles[6] = "signs_lib_blank.png" + + minetest.register_node(":"..no_wall_name.."_onpole", othermounts_def) + table.insert(signs_lib.lbm_restore_nodes, no_wall_name.."_onpole") end - local ophdef = table.copy(opdef) + if raw_def.allow_onpole_horizontal then + local onpole_horiz_def = table.copy(othermounts_def) - if rdef.allow_onpole_horizontal then - ophdef.tiles[3] = "signs_lib_blank.png" - ophdef.tiles[4] = "signs_lib_pole_mount.png" - minetest.register_node(":"..name.."_onpole_horiz", ophdef) - table.insert(signs_lib.lbm_restore_nodes, name.."_onpole_horiz") + onpole_horiz_def.tiles[3] = "signs_lib_blank.png" + onpole_horiz_def.tiles[4] = raw_def.tiles[3] or "signs_lib_pole_mount.png" + onpole_horiz_def.tiles[5] = "signs_lib_blank.png" + onpole_horiz_def.tiles[6] = "signs_lib_blank.png" + + minetest.register_node(":"..no_wall_name.."_onpole_horiz", onpole_horiz_def) + table.insert(signs_lib.lbm_restore_nodes, no_wall_name.."_onpole_horiz") end - if rdef.allow_hanging then + if raw_def.allow_hanging then - local hdef = table.copy(def) - hdef.paramtype2 = "facedir" + local hanging_def = table.copy(def) + hanging_def.paramtype2 = "facedir" local hcbox = signs_lib.make_selection_boxes(35, 32, nil, 0, 3, -18.5, true) - hdef.selection_box = rdef.hanging_selection_box or hcbox - hdef.node_box = rdef.hanging_node_box or rdef.hanging_selection_box or hcbox + hanging_def.selection_box = raw_def.hanging_selection_box or hcbox + hanging_def.node_box = raw_def.hanging_node_box or raw_def.hanging_selection_box or hcbox - hdef.groups.not_in_creative_inventory = 1 - hdef.tiles[3] = "signs_lib_hangers.png" - hdef.mesh = string.gsub(string.gsub(hdef.mesh, "_facedir.obj", ".obj"), ".obj$", "_hanging.obj") + hanging_def.groups.not_in_creative_inventory = 1 + hanging_def.tiles[3] = raw_def.tiles[4] or "signs_lib_hangers.png" + hanging_def.tiles[4] = "signs_lib_blank.png" + hanging_def.tiles[5] = "signs_lib_blank.png" + hanging_def.tiles[6] = "signs_lib_blank.png" - if hdef.entity_info then - hdef.entity_info.mesh = string.gsub(string.gsub(hdef.entity_info.mesh, "_facedir.obj", ".obj"), ".obj$", "_hanging.obj") - hdef.entity_info.yaw = signs_lib.standard_yaw + hanging_def.mesh = raw_def.hanging_mesh or string.gsub(string.gsub(hanging_def.mesh, "wall.obj$", "hanging.obj"), "_facedir", "") + + if hanging_def.entity_info then + hanging_def.entity_info.mesh = string.gsub(string.gsub(hanging_def.entity_info.mesh, "entity_wall.obj$", "entity_hanging.obj"), "_facedir", "") + hanging_def.entity_info.yaw = signs_lib.standard_yaw end - minetest.register_node(":"..name.."_hanging", hdef) - table.insert(signs_lib.lbm_restore_nodes, name.."_hanging") + minetest.register_node(":"..no_wall_name.."_hanging", hanging_def) + table.insert(signs_lib.lbm_restore_nodes, no_wall_name.."_hanging") end - if rdef.allow_widefont then + if raw_def.allow_yard then + + local ydef = table.copy(def) + ydef.paramtype2 = "facedir" + + local ycbox = signs_lib.make_selection_boxes(35, 34.5, false, 0, -1.25, -19.69, true) + + ydef.selection_box = raw_def.yard_selection_box or ycbox + ydef.tiles[3] = raw_def.tiles[5] or "default_wood.png" + ydef.tiles[4] = "signs_lib_blank.png" + ydef.tiles[5] = "signs_lib_blank.png" + ydef.tiles[6] = "signs_lib_blank.png" + + ydef.node_box = raw_def.yard_node_box or raw_def.yard_selection_box or ycbox + + ydef.groups.not_in_creative_inventory = 1 + ydef.mesh = raw_def.yard_mesh or string.gsub(string.gsub(ydef.mesh, "wall.obj$", "yard.obj"), "_facedir", "") + + if ydef.entity_info then + ydef.entity_info.mesh = string.gsub(string.gsub(ydef.entity_info.mesh, "entity_wall.obj$", "entity_yard.obj"), "_facedir", "") + ydef.entity_info.yaw = signs_lib.standard_yaw + end + + minetest.register_node(":"..no_wall_name.."_yard", ydef) + table.insert(signs_lib.lbm_restore_nodes, no_wall_name.."_yard") + end + + if raw_def.allow_widefont then 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") + table.insert(signs_lib.old_widefont_signs, name.."_widefont_yard") end end @@ -1091,7 +1121,6 @@ minetest.register_lbm({ minetest.swap_node(pos, {name = basename, param2 = node.param2}) local meta = minetest.get_meta(pos) meta:set_int("widefont", 1) - signs_lib.delete_objects(pos) signs_lib.update_sign(pos) end }) diff --git a/signs_lib/compat.lua b/signs_lib/compat.lua index 76405d3e..b9a04a79 100644 --- a/signs_lib/compat.lua +++ b/signs_lib/compat.lua @@ -13,6 +13,29 @@ for _, n in ipairs(default_fences) do }) end +if minetest.get_modpath("cottages") then + local cbox = table.copy(minetest.registered_items["cottages:table"].node_box) + minetest.override_item("cottages:table", { + check_for_pole = true, + selection_box = cbox + }) +end + +if minetest.get_modpath("prefab_redo") then + minetest.override_item("prefab_redo:concrete_railing", { + check_for_pole = true, + selection_box = { + type = "connected", + connect_right = { -0.125, -0.5, -0.125, 0.5, 0.375, 0.125 }, + connect_left = { -0.5, -0.5, -0.125, 0.125, 0.375, 0.125 }, + connect_back = { -0.125, -0.5, -0.125, 0.125, 0.375, 0.5 }, + connect_front = { -0.125, -0.5, -0.5, 0.125, 0.375, 0.125 }, + disconnected = { -0.125, -0.5, -0.125, 0.125, 0.25, 0.125 }, + fixed = {} + } + }) +end + if minetest.get_modpath("streetspoles") then local htj_north = { diff --git a/signs_lib/depends.txt b/signs_lib/depends.txt index 7e47df4a..768e4024 100644 --- a/signs_lib/depends.txt +++ b/signs_lib/depends.txt @@ -3,3 +3,4 @@ intllib? screwdriver? streetspoles? streetlamps? +cottages? diff --git a/signs_lib/models/basic_signs wooden yard sign two sticks.blend b/signs_lib/models/basic_signs wooden yard sign two sticks.blend new file mode 100644 index 00000000..05991f60 Binary files /dev/null and b/signs_lib/models/basic_signs wooden yard sign two sticks.blend differ diff --git a/signs_lib/models/signs_lib_standard_facedir_sign_onpole.obj b/signs_lib/models/signs_lib_standard_facedir_sign_onpole.obj new file mode 100644 index 00000000..58e505b2 --- /dev/null +++ b/signs_lib/models/signs_lib_standard_facedir_sign_onpole.obj @@ -0,0 +1,232 @@ +# Blender v2.79 (sub 0) OBJ File: 'standard wooden sign.blend' +# www.blender.org +o facedir,_on_pole_Cube.005 +v 0.437500 -0.312500 0.812500 +v 0.437500 -0.312500 0.750000 +v 0.437500 0.312500 0.750000 +v -0.437500 -0.312500 0.812500 +v -0.437500 -0.312500 0.750000 +v -0.437500 0.312500 0.812500 +v 0.437500 0.312500 0.812500 +v -0.437500 0.312500 0.750000 +v -0.125000 -0.187500 0.812500 +v -0.125000 -0.187500 0.875000 +v -0.125000 0.187500 0.875000 +v 0.125000 -0.187500 0.812500 +v 0.164062 -0.125000 1.164063 +v -0.164063 -0.125000 1.164063 +v 0.164062 -0.187500 1.164063 +v -0.164063 -0.187500 1.164063 +v 0.125000 0.125000 0.812500 +v -0.125000 -0.125000 1.125000 +v 0.164062 0.187500 0.812500 +v 0.164062 0.187500 1.125000 +v 0.164062 0.125000 0.812500 +v 0.164062 0.125000 1.125000 +v 0.125000 -0.125000 0.812500 +v 0.125000 -0.125000 1.125000 +v 0.164062 -0.125000 0.812500 +v 0.164062 -0.187500 0.812500 +v -0.164063 0.187500 0.812500 +v -0.164063 0.125000 0.812500 +v -0.125000 0.125000 0.812500 +v -0.125000 0.125000 1.125000 +v -0.164063 -0.125000 0.812500 +v -0.164063 -0.125000 1.125000 +v -0.164063 -0.187500 0.812500 +v -0.164063 -0.187500 1.125000 +v -0.125000 -0.125000 0.812500 +v 0.125000 0.187500 0.875000 +v 0.125000 -0.187500 0.875000 +v 0.125000 0.187500 0.812500 +v -0.125000 0.187500 0.812500 +v 0.164062 -0.187500 1.125000 +v 0.164062 -0.125000 1.125000 +v -0.164063 0.125000 1.164063 +v 0.164062 0.125000 1.164063 +v -0.164063 0.187500 1.164063 +v 0.164062 0.187500 1.164063 +v -0.164063 0.125000 1.125000 +v -0.164063 0.187500 1.125000 +v 0.125000 -0.187500 1.125000 +v 0.125000 0.187500 1.125000 +v 0.125000 0.125000 1.125000 +v -0.125000 0.187500 1.125000 +v -0.125000 -0.187500 1.125000 +v 0.125000 -0.125000 0.875000 +v 0.125000 0.125000 0.875000 +v -0.125000 0.125000 0.875000 +v -0.125000 -0.125000 0.875000 +vt 0.468750 0.812500 +vt 0.031250 0.812500 +vt 0.031250 0.187500 +vt 0.468750 0.187500 +vt 0.531250 0.812500 +vt 0.968750 0.812500 +vt 0.968750 0.187500 +vt 0.531250 0.187500 +vt 0.234375 0.000000 +vt 0.234375 1.000000 +vt 0.015625 1.000000 +vt 0.015625 -0.000000 +vt 0.609375 -0.000000 +vt 0.609375 1.000000 +vt 0.390625 1.000000 +vt 0.390625 -0.000000 +vt 0.765625 0.000000 +vt 0.765625 1.000000 +vt 0.843750 0.507812 +vt 0.703125 0.507812 +vt 0.703125 0.093750 +vt 0.843750 0.093750 +vt 0.015625 0.507812 +vt 0.015625 0.093750 +vt 0.156250 0.093750 +vt 0.156250 0.507812 +vt 0.453125 0.640625 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.312500 0.640625 +vt 0.234375 0.593750 +vt 0.234375 0.640625 +vt 0.093750 0.640625 +vt 0.093750 0.593750 +vt 0.312500 0.640625 +vt 0.312500 0.921875 +vt 0.453125 0.921875 +vt 0.453125 0.640625 +vt 0.703125 0.664062 +vt 0.703125 0.992188 +vt 0.781250 0.992188 +vt 0.781250 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.453125 0.640625 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.312500 0.640625 +vt 0.234375 0.593750 +vt 0.234375 0.640625 +vt 0.093750 0.640625 +vt 0.093750 0.593750 +vt 0.703125 0.664062 +vt 0.703125 0.992188 +vt 0.781250 0.992188 +vt 0.781250 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.234375 0.640625 +vt 0.234375 0.921875 +vt 0.093750 0.921875 +vt 0.093750 0.640625 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.093750 0.640625 +vt 0.093750 0.992188 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.921875 +vt 0.093750 0.921875 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.093750 0.992188 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.093750 0.992188 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.234375 0.992188 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.093750 0.992188 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.234375 0.992188 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.703125 0.578125 +vt 0.156250 0.578125 +vt 0.156250 0.031250 +vt 0.703125 0.031250 +vt 0.312500 0.640625 +vt 0.312500 0.921875 +vt 0.453125 0.921875 +vt 0.453125 0.640625 +vt 0.703125 0.703125 +vt 0.562500 0.703125 +vt 0.562500 0.953125 +vt 0.703125 0.953125 +vt 0.703125 0.703125 +vt 0.562500 0.703125 +vt 0.562500 0.953125 +vt 0.703125 0.953125 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +g facedir,_on_pole_Cube.005_front-back +s off +f 8/1/1 3/2/1 2/3/1 5/4/1 +f 7/5/2 6/6/2 4/7/2 1/8/2 +g facedir,_on_pole_Cube.005_edges +f 4/9/3 5/10/3 2/11/3 1/12/3 +f 7/13/4 3/14/4 8/15/4 6/16/4 +f 7/13/5 1/17/5 2/18/5 3/14/5 +f 4/9/6 6/16/6 8/15/6 5/10/6 +g facedir,_on_pole_Cube.005_pole_mount +f 9/19/6 10/20/6 11/21/6 39/22/6 +f 12/23/5 38/24/5 36/25/5 37/26/5 +f 20/27/5 45/28/5 43/29/5 22/30/5 +f 44/31/6 47/32/6 46/33/6 42/34/6 +f 52/35/5 10/36/5 56/37/5 18/38/5 +f 46/39/3 22/40/3 43/41/3 42/42/3 +f 44/43/4 45/44/4 20/45/4 47/46/4 +f 42/42/2 43/41/2 45/47/2 44/48/2 +f 41/49/5 13/50/5 15/51/5 40/52/5 +f 14/53/6 32/54/6 34/55/6 16/56/6 +f 34/57/3 40/58/3 15/59/3 16/60/3 +f 14/61/4 13/62/4 41/63/4 32/64/4 +f 24/65/6 53/66/6 37/67/6 48/68/6 +f 16/60/2 15/59/2 13/69/2 14/70/2 +f 50/71/3 17/72/3 21/73/3 22/74/3 +f 20/75/4 19/76/4 38/77/4 49/78/4 +f 49/79/6 36/80/6 54/81/6 50/71/6 +f 22/30/5 21/82/5 19/83/5 20/27/5 +f 48/68/3 12/84/3 26/85/3 40/86/3 +f 41/87/4 25/88/4 23/89/4 24/90/4 +f 40/52/5 26/91/5 25/92/5 41/49/5 +f 46/33/3 28/93/3 29/94/3 30/95/3 +f 47/32/6 27/96/6 28/93/6 46/33/6 +f 51/97/4 39/98/4 27/99/4 47/100/4 +f 34/55/3 33/101/3 9/102/3 52/103/3 +f 32/54/6 31/104/6 33/101/6 34/55/6 +f 18/105/4 35/106/4 31/107/4 32/108/4 +f 10/20/2 37/26/2 36/25/2 11/21/2 +f 9/109/3 12/110/3 37/26/3 10/20/3 +f 11/21/4 36/25/4 38/111/4 39/112/4 +f 30/113/5 55/114/5 11/115/5 51/116/5 +f 52/117/1 18/118/1 24/119/1 48/120/1 +f 30/121/1 51/122/1 49/123/1 50/124/1 diff --git a/signs_lib/models/signs_lib_standard_wall_sign_facedir.obj b/signs_lib/models/signs_lib_standard_facedir_sign_wall.obj similarity index 100% rename from signs_lib/models/signs_lib_standard_wall_sign_facedir.obj rename to signs_lib/models/signs_lib_standard_facedir_sign_wall.obj diff --git a/signs_lib/models/signs_lib_standard_wall_sign_entity_hanging.obj b/signs_lib/models/signs_lib_standard_sign_entity_hanging.obj similarity index 100% rename from signs_lib/models/signs_lib_standard_wall_sign_entity_hanging.obj rename to signs_lib/models/signs_lib_standard_sign_entity_hanging.obj diff --git a/signs_lib/models/signs_lib_standard_wall_sign_entity_onpole.obj b/signs_lib/models/signs_lib_standard_sign_entity_onpole.obj similarity index 100% rename from signs_lib/models/signs_lib_standard_wall_sign_entity_onpole.obj rename to signs_lib/models/signs_lib_standard_sign_entity_onpole.obj diff --git a/signs_lib/models/signs_lib_standard_wall_sign_entity.obj b/signs_lib/models/signs_lib_standard_sign_entity_wall.obj similarity index 100% rename from signs_lib/models/signs_lib_standard_wall_sign_entity.obj rename to signs_lib/models/signs_lib_standard_sign_entity_wall.obj diff --git a/basic_signs/models/basic_signs_yard_sign_entity.obj b/signs_lib/models/signs_lib_standard_sign_entity_yard.obj similarity index 100% rename from basic_signs/models/basic_signs_yard_sign_entity.obj rename to signs_lib/models/signs_lib_standard_sign_entity_yard.obj diff --git a/signs_lib/models/signs_lib_standard_wall_sign_hanging.obj b/signs_lib/models/signs_lib_standard_sign_hanging.obj similarity index 100% rename from signs_lib/models/signs_lib_standard_wall_sign_hanging.obj rename to signs_lib/models/signs_lib_standard_sign_hanging.obj diff --git a/signs_lib/models/signs_lib_standard_sign_onpole.obj b/signs_lib/models/signs_lib_standard_sign_onpole.obj new file mode 100644 index 00000000..b3275d00 --- /dev/null +++ b/signs_lib/models/signs_lib_standard_sign_onpole.obj @@ -0,0 +1,232 @@ +# Blender v2.79 (sub 0) OBJ File: 'standard wooden sign.blend' +# www.blender.org +o wallmounted,_on_pole_Cube.002 +v 0.437500 -0.812500 -0.312500 +v 0.437500 -0.750000 -0.312500 +v 0.437500 -0.750000 0.312500 +v -0.437500 -0.812500 -0.312500 +v -0.437500 -0.750000 -0.312500 +v -0.437500 -0.812500 0.312500 +v 0.437500 -0.812500 0.312500 +v -0.437500 -0.750000 0.312500 +v -0.125000 -0.812500 -0.187500 +v -0.125000 -0.875000 -0.187500 +v -0.125000 -0.875000 0.187500 +v 0.125000 -0.812500 -0.187500 +v 0.164062 -1.164063 -0.125000 +v -0.164063 -1.164063 -0.125000 +v 0.164062 -1.164063 -0.187500 +v -0.164063 -1.164063 -0.187500 +v 0.125000 -0.812500 0.125000 +v -0.125000 -1.125000 -0.125000 +v 0.164062 -0.812500 0.187500 +v 0.164062 -1.125000 0.187500 +v 0.164062 -0.812500 0.125000 +v 0.164062 -1.125000 0.125000 +v 0.125000 -0.812500 -0.125000 +v 0.125000 -1.125000 -0.125000 +v 0.164062 -0.812500 -0.125000 +v 0.164062 -0.812500 -0.187500 +v -0.164063 -0.812500 0.187500 +v -0.164063 -0.812500 0.125000 +v -0.125000 -0.812500 0.125000 +v -0.125000 -1.125000 0.125000 +v -0.164063 -0.812500 -0.125000 +v -0.164063 -1.125000 -0.125000 +v -0.164063 -0.812500 -0.187500 +v -0.164063 -1.125000 -0.187500 +v -0.125000 -0.812500 -0.125000 +v 0.125000 -0.875000 0.187500 +v 0.125000 -0.875000 -0.187500 +v 0.125000 -0.812500 0.187500 +v -0.125000 -0.812500 0.187500 +v 0.164062 -1.125000 -0.187500 +v 0.164062 -1.125000 -0.125000 +v -0.164063 -1.164063 0.125000 +v 0.164062 -1.164063 0.125000 +v -0.164063 -1.164063 0.187500 +v 0.164062 -1.164063 0.187500 +v -0.164063 -1.125000 0.125000 +v -0.164063 -1.125000 0.187500 +v 0.125000 -1.125000 -0.187500 +v 0.125000 -1.125000 0.187500 +v 0.125000 -1.125000 0.125000 +v -0.125000 -1.125000 0.187500 +v -0.125000 -1.125000 -0.187500 +v 0.125000 -0.875000 -0.125000 +v 0.125000 -0.875000 0.125000 +v -0.125000 -0.875000 0.125000 +v -0.125000 -0.875000 -0.125000 +vt 0.468750 0.812500 +vt 0.031250 0.812500 +vt 0.031250 0.187500 +vt 0.468750 0.187500 +vt 0.531250 0.812500 +vt 0.968750 0.812500 +vt 0.968750 0.187500 +vt 0.531250 0.187500 +vt 0.234375 0.000000 +vt 0.234375 1.000000 +vt 0.015625 1.000000 +vt 0.015625 -0.000000 +vt 0.609375 -0.000000 +vt 0.609375 1.000000 +vt 0.390625 1.000000 +vt 0.390625 -0.000000 +vt 0.765625 0.000000 +vt 0.765625 1.000000 +vt 0.843750 0.507812 +vt 0.703125 0.507812 +vt 0.703125 0.093750 +vt 0.843750 0.093750 +vt 0.015625 0.507812 +vt 0.015625 0.093750 +vt 0.156250 0.093750 +vt 0.156250 0.507812 +vt 0.453125 0.640625 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.312500 0.640625 +vt 0.234375 0.593750 +vt 0.234375 0.640625 +vt 0.093750 0.640625 +vt 0.093750 0.593750 +vt 0.312500 0.640625 +vt 0.312500 0.921875 +vt 0.453125 0.921875 +vt 0.453125 0.640625 +vt 0.703125 0.664062 +vt 0.703125 0.992188 +vt 0.781250 0.992188 +vt 0.781250 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.453125 0.640625 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.312500 0.640625 +vt 0.234375 0.593750 +vt 0.234375 0.640625 +vt 0.093750 0.640625 +vt 0.093750 0.593750 +vt 0.703125 0.664062 +vt 0.703125 0.992188 +vt 0.781250 0.992188 +vt 0.781250 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.234375 0.640625 +vt 0.234375 0.921875 +vt 0.093750 0.921875 +vt 0.093750 0.640625 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.093750 0.640625 +vt 0.093750 0.992188 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.921875 +vt 0.093750 0.921875 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.093750 0.992188 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.093750 0.992188 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.234375 0.992188 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.093750 0.992188 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.234375 0.992188 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.703125 0.578125 +vt 0.156250 0.578125 +vt 0.156250 0.031250 +vt 0.703125 0.031250 +vt 0.312500 0.640625 +vt 0.312500 0.921875 +vt 0.453125 0.921875 +vt 0.453125 0.640625 +vt 0.703125 0.703125 +vt 0.562500 0.703125 +vt 0.562500 0.953125 +vt 0.703125 0.953125 +vt 0.703125 0.703125 +vt 0.562500 0.703125 +vt 0.562500 0.953125 +vt 0.703125 0.953125 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +g wallmounted,_on_pole_Cube.002_front-back +s off +f 8/1/1 3/2/1 2/3/1 5/4/1 +f 7/5/2 6/6/2 4/7/2 1/8/2 +g wallmounted,_on_pole_Cube.002_edges +f 4/9/3 5/10/3 2/11/3 1/12/3 +f 7/13/4 3/14/4 8/15/4 6/16/4 +f 7/13/5 1/17/5 2/18/5 3/14/5 +f 4/9/6 6/16/6 8/15/6 5/10/6 +g wallmounted,_on_pole_Cube.002_pole_mount +f 9/19/6 10/20/6 11/21/6 39/22/6 +f 12/23/5 38/24/5 36/25/5 37/26/5 +f 20/27/5 45/28/5 43/29/5 22/30/5 +f 44/31/6 47/32/6 46/33/6 42/34/6 +f 52/35/5 10/36/5 56/37/5 18/38/5 +f 46/39/3 22/40/3 43/41/3 42/42/3 +f 44/43/4 45/44/4 20/45/4 47/46/4 +f 42/42/2 43/41/2 45/47/2 44/48/2 +f 41/49/5 13/50/5 15/51/5 40/52/5 +f 14/53/6 32/54/6 34/55/6 16/56/6 +f 34/57/3 40/58/3 15/59/3 16/60/3 +f 14/61/4 13/62/4 41/63/4 32/64/4 +f 24/65/6 53/66/6 37/67/6 48/68/6 +f 16/60/2 15/59/2 13/69/2 14/70/2 +f 50/71/3 17/72/3 21/73/3 22/74/3 +f 20/75/4 19/76/4 38/77/4 49/78/4 +f 49/79/6 36/80/6 54/81/6 50/71/6 +f 22/30/5 21/82/5 19/83/5 20/27/5 +f 48/68/3 12/84/3 26/85/3 40/86/3 +f 41/87/4 25/88/4 23/89/4 24/90/4 +f 40/52/5 26/91/5 25/92/5 41/49/5 +f 46/33/3 28/93/3 29/94/3 30/95/3 +f 47/32/6 27/96/6 28/93/6 46/33/6 +f 51/97/4 39/98/4 27/99/4 47/100/4 +f 34/55/3 33/101/3 9/102/3 52/103/3 +f 32/54/6 31/104/6 33/101/6 34/55/6 +f 18/105/4 35/106/4 31/107/4 32/108/4 +f 10/20/2 37/26/2 36/25/2 11/21/2 +f 9/109/3 12/110/3 37/26/3 10/20/3 +f 11/21/4 36/25/4 38/111/4 39/112/4 +f 30/113/5 55/114/5 11/115/5 51/116/5 +f 52/117/1 18/118/1 24/119/1 48/120/1 +f 30/121/1 51/122/1 49/123/1 50/124/1 diff --git a/signs_lib/models/signs_lib_standard_wall_sign.obj b/signs_lib/models/signs_lib_standard_sign_wall.obj similarity index 100% rename from signs_lib/models/signs_lib_standard_wall_sign.obj rename to signs_lib/models/signs_lib_standard_sign_wall.obj diff --git a/basic_signs/models/basic_signs_yard_sign.obj b/signs_lib/models/signs_lib_standard_sign_yard.obj similarity index 100% rename from basic_signs/models/basic_signs_yard_sign.obj rename to signs_lib/models/signs_lib_standard_sign_yard.obj diff --git a/signs_lib/models/signs_lib_standard_sign_yard_two_sticks.obj b/signs_lib/models/signs_lib_standard_sign_yard_two_sticks.obj new file mode 100644 index 00000000..92a7e36c --- /dev/null +++ b/signs_lib/models/signs_lib_standard_sign_yard_two_sticks.obj @@ -0,0 +1,110 @@ +# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden yard sign two sticks.blend' +# www.blender.org +o Cube +v 0.437500 -0.250000 -0.000000 +v 0.437500 -0.250000 -0.062500 +v 0.437500 0.375000 0.000000 +v -0.437500 0.375000 0.000000 +v -0.437500 0.375000 -0.062500 +v 0.437500 0.375000 -0.062500 +v -0.437500 -0.250000 -0.000000 +v -0.437500 -0.250000 -0.062500 +v 0.421875 -0.500000 0.000000 +v 0.421875 0.250000 0.000000 +v 0.421875 -0.500000 0.031250 +v 0.390625 -0.500000 0.000000 +v 0.390625 0.250000 0.000000 +v 0.390625 -0.500000 0.031250 +v -0.390625 -0.500000 0.000000 +v -0.390625 -0.500000 0.031250 +v -0.421875 -0.500000 0.000000 +v -0.421875 0.250000 0.000000 +v -0.421875 -0.500000 0.031250 +v 0.421875 0.218750 0.031250 +v 0.390625 0.218750 0.031250 +v -0.390625 0.250000 0.000000 +v -0.390625 0.218750 0.031250 +v -0.421875 0.218750 0.031250 +vt 0.468750 0.812500 +vt 0.031250 0.812500 +vt 0.031250 0.187500 +vt 0.468750 0.187500 +vt 0.531250 0.812500 +vt 0.968750 0.812500 +vt 0.968750 0.187500 +vt 0.531250 0.187500 +vt 0.234375 0.000000 +vt 0.234375 1.000000 +vt 0.015625 1.000000 +vt 0.015625 -0.000000 +vt 0.609375 -0.000000 +vt 0.609375 1.000000 +vt 0.390625 1.000000 +vt 0.390625 -0.000000 +vt 0.765625 0.000000 +vt 0.765625 1.000000 +vt 0.000000 0.375000 +vt 1.437500 0.375000 +vt 1.437500 0.437500 +vt 0.000000 0.437500 +vt 1.500000 0.500000 +vt 0.000000 0.500000 +vt 1.500000 0.562500 +vt 0.000000 0.562500 +vt 0.750000 0.875000 +vt 0.625000 0.875000 +vt 0.625000 1.000000 +vt 0.750000 1.000000 +vt 1.437500 0.625000 +vt 0.000000 0.625000 +vt 0.000000 0.375000 +vt 1.437500 0.375000 +vt 1.437500 0.437500 +vt 0.000000 0.437500 +vt 1.500000 0.500000 +vt 0.000000 0.500000 +vt 1.500000 0.562500 +vt 0.000000 0.562500 +vt 0.750000 0.875000 +vt 0.625000 0.875000 +vt 0.625000 1.000000 +vt 0.750000 1.000000 +vt 1.437500 0.625000 +vt 0.000000 0.625000 +vt 0.312500 1.000000 +vt 0.187500 1.000000 +vt 0.187500 0.875000 +vt 0.312500 0.875000 +vt 0.312500 1.000000 +vt 0.187500 1.000000 +vt 0.187500 0.875000 +vt 0.312500 0.875000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 -0.0000 0.0000 +vn -1.0000 -0.0000 0.0000 +vn 0.0000 0.7071 0.7071 +g Cube_Cube_front-back +s off +f 5/1/1 6/2/1 2/3/1 8/4/1 +f 3/5/2 4/6/2 7/7/2 1/8/2 +g Cube_Cube_edges +f 7/9/3 8/10/3 2/11/3 1/12/3 +f 3/13/4 6/14/4 5/15/4 4/16/4 +f 3/13/5 1/17/5 2/18/5 6/14/5 +f 7/9/6 4/16/6 5/15/6 8/10/6 +g Cube_Cube_sticks +f 11/19/2 20/20/2 21/21/2 14/22/2 +f 14/22/6 21/21/6 13/23/6 12/24/6 +f 12/24/1 13/23/1 10/25/1 9/26/1 +f 11/27/3 14/28/3 12/29/3 9/30/3 +f 9/26/5 10/25/5 20/31/5 11/32/5 +f 16/33/2 23/34/2 24/35/2 19/36/2 +f 19/36/6 24/35/6 18/37/6 17/38/6 +f 17/38/1 18/37/1 22/39/1 15/40/1 +f 16/41/3 19/42/3 17/43/3 15/44/3 +f 15/40/5 22/39/5 23/45/5 16/46/5 +f 10/47/7 13/48/7 21/49/7 20/50/7 +f 22/51/7 18/52/7 24/53/7 23/54/7 diff --git a/signs_lib/models/signs_lib_standard_wall_sign_facedir_onpole.obj b/signs_lib/models/signs_lib_standard_wall_sign_facedir_onpole.obj deleted file mode 100644 index 23d54a7d..00000000 --- a/signs_lib/models/signs_lib_standard_wall_sign_facedir_onpole.obj +++ /dev/null @@ -1,440 +0,0 @@ -# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden sign.blend' -# www.blender.org -o sign_on_pole.001_Cube.002 -v 0.437500 -0.312500 0.812500 -v 0.437500 -0.312500 0.750000 -v 0.437500 0.312500 0.812500 -v 0.437500 0.312500 0.750000 -v -0.437500 -0.312500 0.812500 -v -0.437500 -0.312500 0.750000 -v -0.437500 0.312500 0.812500 -v -0.437500 0.312500 0.750000 -v 0.437500 -0.312500 0.812500 -v 0.437500 -0.312500 0.750000 -v 0.437500 0.312500 0.812500 -v 0.437500 0.312500 0.750000 -v -0.437500 -0.312500 0.812500 -v -0.437500 -0.312500 0.750000 -v -0.437500 0.312500 0.812500 -v -0.437500 0.312500 0.750000 -v -0.125000 -0.187500 0.812500 -v -0.125000 -0.187500 0.875000 -v -0.125000 0.187500 0.812500 -v -0.125000 0.187500 0.875000 -v 0.125000 0.187500 0.812500 -v 0.125000 -0.187500 0.812500 -v 0.125000 -0.187500 0.875000 -v 0.125000 0.187500 0.875000 -v -0.125000 -0.187500 1.125000 -v -0.125000 -0.187500 0.812500 -v -0.125000 -0.125000 1.125000 -v -0.125000 -0.125000 0.812500 -v -0.164063 -0.187500 1.125000 -v -0.164063 -0.187500 0.812500 -v -0.164063 -0.125000 1.125000 -v -0.164063 -0.125000 0.812500 -v -0.125000 0.125000 1.125000 -v -0.125000 0.125000 0.812500 -v -0.125000 0.187500 1.125000 -v -0.125000 0.187500 0.812500 -v -0.164063 0.125000 1.125000 -v -0.164063 0.125000 0.812500 -v -0.164063 0.187500 1.125000 -v -0.164063 0.187500 0.812500 -v 0.164062 -0.187500 1.125000 -v 0.164062 -0.187500 0.812500 -v 0.164062 -0.125000 1.125000 -v 0.164062 -0.125000 0.812500 -v 0.125000 -0.187500 1.125000 -v 0.125000 -0.187500 0.812500 -v 0.125000 -0.125000 1.125000 -v 0.125000 -0.125000 0.812500 -v 0.164062 0.125000 1.125000 -v 0.164062 0.125000 0.812500 -v 0.164062 0.187500 1.125000 -v 0.164062 0.187500 0.812500 -v 0.125000 0.125000 1.125000 -v 0.125000 0.125000 0.812500 -v 0.125000 0.187500 1.125000 -v 0.125000 0.187500 0.812500 -v -0.164063 -0.187500 1.164063 -v 0.164062 -0.187500 1.164063 -v -0.164063 -0.125000 1.164063 -v 0.164062 -0.125000 1.164063 -v -0.164063 -0.187500 1.125000 -v 0.164062 -0.187500 1.125000 -v -0.164063 -0.125000 1.125000 -v 0.164062 -0.125000 1.125000 -v -0.164063 0.125000 1.164063 -v 0.164062 0.125000 1.164063 -v -0.164063 0.187500 1.164063 -v 0.164062 0.187500 1.164063 -v -0.164063 0.125000 1.125000 -v 0.164062 0.125000 1.125000 -v -0.164063 0.187500 1.125000 -v 0.164062 0.187500 1.125000 -v 0.187500 -0.125000 0.812500 -v 0.187500 -0.125000 0.875000 -v -0.187500 -0.125000 0.812500 -v -0.187500 -0.125000 0.875000 -v -0.187500 0.125000 0.812500 -v 0.187500 0.125000 0.812500 -v 0.187500 0.125000 0.875000 -v -0.187500 0.125000 0.875000 -v 0.187500 -0.125000 1.125000 -v 0.187500 -0.125000 0.812500 -v 0.125000 -0.125000 1.125000 -v 0.125000 -0.125000 0.812500 -v 0.187500 -0.164063 1.125000 -v 0.187500 -0.164063 0.812500 -v 0.125000 -0.164063 1.125000 -v 0.125000 -0.164063 0.812500 -v -0.125000 -0.125000 1.125000 -v -0.125000 -0.125000 0.812500 -v -0.187500 -0.125000 1.125000 -v -0.187500 -0.125000 0.812500 -v -0.125000 -0.164063 1.125000 -v -0.125000 -0.164063 0.812500 -v -0.187500 -0.164063 1.125000 -v -0.187500 -0.164063 0.812500 -v 0.187500 0.164062 1.125000 -v 0.187500 0.164062 0.812500 -v 0.125000 0.164062 1.125000 -v 0.125000 0.164062 0.812500 -v 0.187500 0.125000 1.125000 -v 0.187500 0.125000 0.812500 -v 0.125000 0.125000 1.125000 -v 0.125000 0.125000 0.812500 -v -0.125000 0.164062 1.125000 -v -0.125000 0.164062 0.812500 -v -0.187500 0.164062 1.125000 -v -0.187500 0.164062 0.812500 -v -0.125000 0.125000 1.125000 -v -0.125000 0.125000 0.812500 -v -0.187500 0.125000 1.125000 -v -0.187500 0.125000 0.812500 -v 0.187500 -0.164063 1.164063 -v 0.187500 0.164062 1.164063 -v 0.125000 -0.164063 1.164063 -v 0.125000 0.164062 1.164063 -v 0.187500 -0.164063 1.125000 -v 0.187500 0.164062 1.125000 -v 0.125000 -0.164063 1.125000 -v 0.125000 0.164062 1.125000 -v -0.125000 -0.164063 1.164063 -v -0.125000 0.164062 1.164063 -v -0.187500 -0.164063 1.164063 -v -0.187500 0.164062 1.164063 -v -0.125000 -0.164063 1.125000 -v -0.125000 0.164062 1.125000 -v -0.187500 -0.164063 1.125000 -v -0.187500 0.164062 1.125000 -vt 0.468750 0.812500 -vt 0.031250 0.812500 -vt 0.031250 0.187500 -vt 0.468750 0.187500 -vt 0.531250 0.812500 -vt 0.968750 0.812500 -vt 0.968750 0.187500 -vt 0.531250 0.187500 -vt 0.234375 0.000000 -vt 0.234375 1.000000 -vt 0.015625 1.000000 -vt 0.015625 -0.000000 -vt 0.609375 -0.000000 -vt 0.609375 1.000000 -vt 0.390625 1.000000 -vt 0.390625 -0.000000 -vt 0.765625 0.000000 -vt 0.765625 1.000000 -vt 0.843750 0.507812 -vt 0.703125 0.507812 -vt 0.703125 0.093750 -vt 0.843750 0.093750 -vt 0.015625 0.507812 -vt 0.015625 0.093750 -vt 0.156250 0.093750 -vt 0.156250 0.507812 -vt 0.156250 0.031250 -vt 0.703125 0.031250 -vt 0.703125 0.578125 -vt 0.156250 0.578125 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.781250 0.664062 -vt 0.781250 0.992188 -vt 0.921875 0.992188 -vt 0.921875 0.664062 -vt 0.484375 0.664062 -vt 0.484375 0.992188 -vt 0.562500 0.992188 -vt 0.562500 0.664062 -vt 0.703125 0.992188 -vt 0.703125 0.664062 -vt 0.234375 0.593750 -vt 0.234375 0.640625 -vt 0.093750 0.640625 -vt 0.093750 0.593750 -vt 0.453125 0.640625 -vt 0.453125 0.593750 -vt 0.312500 0.593750 -vt 0.312500 0.640625 -vt 0.781250 0.664062 -vt 0.781250 0.992188 -vt 0.921875 0.992188 -vt 0.921875 0.664062 -vt 0.484375 0.664062 -vt 0.484375 0.992188 -vt 0.562500 0.992188 -vt 0.562500 0.664062 -vt 0.703125 0.992188 -vt 0.703125 0.664062 -vt 0.234375 0.593750 -vt 0.234375 0.640625 -vt 0.093750 0.640625 -vt 0.093750 0.593750 -vt 0.453125 0.640625 -vt 0.453125 0.593750 -vt 0.312500 0.593750 -vt 0.312500 0.640625 -vt 0.843750 0.507812 -vt 0.703125 0.507812 -vt 0.703125 0.093750 -vt 0.843750 0.093750 -vt 0.015625 0.507812 -vt 0.015625 0.093750 -vt 0.156250 0.093750 -vt 0.156250 0.507812 -vt 0.156250 0.031250 -vt 0.703125 0.031250 -vt 0.703125 0.578125 -vt 0.156250 0.578125 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.781250 0.664062 -vt 0.781250 0.992188 -vt 0.921875 0.992188 -vt 0.921875 0.664062 -vt 0.484375 0.664062 -vt 0.484375 0.992188 -vt 0.562500 0.992188 -vt 0.562500 0.664062 -vt 0.703125 0.992188 -vt 0.703125 0.664062 -vt 0.234375 0.593750 -vt 0.234375 0.640625 -vt 0.093750 0.640625 -vt 0.093750 0.593750 -vt 0.453125 0.640625 -vt 0.453125 0.593750 -vt 0.312500 0.593750 -vt 0.312500 0.640625 -vt 0.781250 0.664062 -vt 0.781250 0.992188 -vt 0.921875 0.992188 -vt 0.921875 0.664062 -vt 0.484375 0.664062 -vt 0.484375 0.992188 -vt 0.562500 0.992188 -vt 0.562500 0.664062 -vt 0.703125 0.992188 -vt 0.703125 0.664062 -vt 0.234375 0.593750 -vt 0.234375 0.640625 -vt 0.093750 0.640625 -vt 0.093750 0.593750 -vt 0.453125 0.640625 -vt 0.453125 0.593750 -vt 0.312500 0.593750 -vt 0.312500 0.640625 -vn 0.0000 0.0000 -1.0000 -vn 0.0000 0.0000 1.0000 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 1.0000 0.0000 -vn 1.0000 0.0000 0.0000 -vn -1.0000 0.0000 0.0000 -g sign_on_pole.001_Cube.002_front-back -s off -f 8/1/1 4/2/1 2/3/1 6/4/1 -f 3/5/2 7/6/2 5/7/2 1/8/2 -g sign_on_pole.001_Cube.002_edges -f 13/9/3 14/10/3 10/11/3 9/12/3 -f 11/13/4 12/14/4 16/15/4 15/16/4 -f 11/13/5 9/17/5 10/18/5 12/14/5 -f 13/9/6 15/16/6 16/15/6 14/10/6 -g sign_on_pole.001_Cube.002_pole_mount -f 17/19/6 18/20/6 20/21/6 19/22/6 -f 22/23/5 21/24/5 24/25/5 23/26/5 -f 20/21/4 24/25/4 21/27/4 19/28/4 -f 17/29/3 22/30/3 23/26/3 18/20/3 -f 18/20/2 23/26/2 24/25/2 20/21/2 -f 25/31/5 26/32/5 28/33/5 27/34/5 -f 27/35/4 28/36/4 32/37/4 31/38/4 -f 31/39/6 32/40/6 30/41/6 29/42/6 -f 29/42/3 30/41/3 26/43/3 25/44/3 -f 33/45/5 34/46/5 36/47/5 35/48/5 -f 35/49/4 36/50/4 40/51/4 39/52/4 -f 39/53/6 40/54/6 38/55/6 37/56/6 -f 37/56/3 38/55/3 34/57/3 33/58/3 -f 41/59/5 42/60/5 44/61/5 43/62/5 -f 43/63/4 44/64/4 48/65/4 47/66/4 -f 47/67/6 48/68/6 46/69/6 45/70/6 -f 45/70/3 46/69/3 42/71/3 41/72/3 -f 49/73/5 50/74/5 52/75/5 51/76/5 -f 51/77/4 52/78/4 56/79/4 55/80/4 -f 55/81/6 56/82/6 54/83/6 53/84/6 -f 53/84/3 54/83/3 50/85/3 49/86/3 -f 57/87/2 58/88/2 60/89/2 59/90/2 -f 59/91/4 60/92/4 64/93/4 63/94/4 -f 63/94/1 64/93/1 62/95/1 61/96/1 -f 61/96/3 62/95/3 58/88/3 57/87/3 -f 59/97/6 63/98/6 61/99/6 57/100/6 -f 64/101/5 60/102/5 58/103/5 62/104/5 -f 65/105/2 66/106/2 68/107/2 67/108/2 -f 67/109/4 68/110/4 72/111/4 71/112/4 -f 71/112/1 72/111/1 70/113/1 69/114/1 -f 69/114/3 70/113/3 66/106/3 65/105/3 -f 67/115/6 71/116/6 69/117/6 65/118/6 -f 72/119/5 68/120/5 66/121/5 70/122/5 -g sign_on_pole.001_Cube.002_pole_mount_horizontal -f 73/123/3 74/124/3 76/125/3 75/126/3 -f 78/127/4 77/128/4 80/129/4 79/130/4 -f 76/125/6 80/129/6 77/131/6 75/132/6 -f 73/133/5 78/134/5 79/130/5 74/124/5 -f 74/124/2 79/130/2 80/129/2 76/125/2 -f 81/135/4 82/136/4 84/137/4 83/138/4 -f 83/139/6 84/140/6 88/141/6 87/142/6 -f 87/143/3 88/144/3 86/145/3 85/146/3 -f 85/146/5 86/145/5 82/147/5 81/148/5 -f 89/149/4 90/150/4 92/151/4 91/152/4 -f 91/153/6 92/154/6 96/155/6 95/156/6 -f 95/157/3 96/158/3 94/159/3 93/160/3 -f 93/160/5 94/159/5 90/161/5 89/162/5 -f 97/163/4 98/164/4 100/165/4 99/166/4 -f 99/167/6 100/168/6 104/169/6 103/170/6 -f 103/171/3 104/172/3 102/173/3 101/174/3 -f 101/174/5 102/173/5 98/175/5 97/176/5 -f 105/177/4 106/178/4 108/179/4 107/180/4 -f 107/181/6 108/182/6 112/183/6 111/184/6 -f 111/185/3 112/186/3 110/187/3 109/188/3 -f 109/188/5 110/187/5 106/189/5 105/190/5 -f 113/191/2 114/192/2 116/193/2 115/194/2 -f 115/195/6 116/196/6 120/197/6 119/198/6 -f 119/198/1 120/197/1 118/199/1 117/200/1 -f 117/200/5 118/199/5 114/192/5 113/191/5 -f 115/201/3 119/202/3 117/203/3 113/204/3 -f 120/205/4 116/206/4 114/207/4 118/208/4 -f 121/209/2 122/210/2 124/211/2 123/212/2 -f 123/213/6 124/214/6 128/215/6 127/216/6 -f 127/216/1 128/215/1 126/217/1 125/218/1 -f 125/218/5 126/217/5 122/210/5 121/209/5 -f 123/219/3 127/220/3 125/221/3 121/222/3 -f 128/223/4 124/224/4 122/225/4 126/226/4 diff --git a/signs_lib/models/signs_lib_standard_wall_sign_onpole.obj b/signs_lib/models/signs_lib_standard_wall_sign_onpole.obj deleted file mode 100644 index 714c00a9..00000000 --- a/signs_lib/models/signs_lib_standard_wall_sign_onpole.obj +++ /dev/null @@ -1,440 +0,0 @@ -# Blender v2.79 (sub 0) OBJ File: 'basic_signs wooden sign.blend' -# www.blender.org -o sign_on_pole_Cube.002 -v 0.437500 -0.812500 -0.312500 -v 0.437500 -0.750000 -0.312500 -v 0.437500 -0.812500 0.312500 -v 0.437500 -0.750000 0.312500 -v -0.437500 -0.812500 -0.312500 -v -0.437500 -0.750000 -0.312500 -v -0.437500 -0.812500 0.312500 -v -0.437500 -0.750000 0.312500 -v 0.437500 -0.812500 -0.312500 -v 0.437500 -0.750000 -0.312500 -v 0.437500 -0.812500 0.312500 -v 0.437500 -0.750000 0.312500 -v -0.437500 -0.812500 -0.312500 -v -0.437500 -0.750000 -0.312500 -v -0.437500 -0.812500 0.312500 -v -0.437500 -0.750000 0.312500 -v -0.125000 -0.812500 -0.187500 -v -0.125000 -0.875000 -0.187500 -v -0.125000 -0.812500 0.187500 -v -0.125000 -0.875000 0.187500 -v 0.125000 -0.812500 0.187500 -v 0.125000 -0.812500 -0.187500 -v 0.125000 -0.875000 -0.187500 -v 0.125000 -0.875000 0.187500 -v -0.125000 -1.125000 -0.187500 -v -0.125000 -0.812500 -0.187500 -v -0.125000 -1.125000 -0.125000 -v -0.125000 -0.812500 -0.125000 -v -0.164063 -1.125000 -0.187500 -v -0.164063 -0.812500 -0.187500 -v -0.164063 -1.125000 -0.125000 -v -0.164063 -0.812500 -0.125000 -v -0.125000 -1.125000 0.125000 -v -0.125000 -0.812500 0.125000 -v -0.125000 -1.125000 0.187500 -v -0.125000 -0.812500 0.187500 -v -0.164063 -1.125000 0.125000 -v -0.164063 -0.812500 0.125000 -v -0.164063 -1.125000 0.187500 -v -0.164063 -0.812500 0.187500 -v 0.164062 -1.125000 -0.187500 -v 0.164062 -0.812500 -0.187500 -v 0.164062 -1.125000 -0.125000 -v 0.164062 -0.812500 -0.125000 -v 0.125000 -1.125000 -0.187500 -v 0.125000 -0.812500 -0.187500 -v 0.125000 -1.125000 -0.125000 -v 0.125000 -0.812500 -0.125000 -v 0.164062 -1.125000 0.125000 -v 0.164062 -0.812500 0.125000 -v 0.164062 -1.125000 0.187500 -v 0.164062 -0.812500 0.187500 -v 0.125000 -1.125000 0.125000 -v 0.125000 -0.812500 0.125000 -v 0.125000 -1.125000 0.187500 -v 0.125000 -0.812500 0.187500 -v -0.164063 -1.164063 -0.187500 -v 0.164062 -1.164063 -0.187500 -v -0.164063 -1.164063 -0.125000 -v 0.164062 -1.164063 -0.125000 -v -0.164063 -1.125000 -0.187500 -v 0.164062 -1.125000 -0.187500 -v -0.164063 -1.125000 -0.125000 -v 0.164062 -1.125000 -0.125000 -v -0.164063 -1.164063 0.125000 -v 0.164062 -1.164063 0.125000 -v -0.164063 -1.164063 0.187500 -v 0.164062 -1.164063 0.187500 -v -0.164063 -1.125000 0.125000 -v 0.164062 -1.125000 0.125000 -v -0.164063 -1.125000 0.187500 -v 0.164062 -1.125000 0.187500 -v 0.187500 -0.812500 -0.125000 -v 0.187500 -0.875000 -0.125000 -v -0.187500 -0.812500 -0.125000 -v -0.187500 -0.875000 -0.125000 -v -0.187500 -0.812500 0.125000 -v 0.187500 -0.812500 0.125000 -v 0.187500 -0.875000 0.125000 -v -0.187500 -0.875000 0.125000 -v 0.187500 -1.125000 -0.125000 -v 0.187500 -0.812500 -0.125000 -v 0.125000 -1.125000 -0.125000 -v 0.125000 -0.812500 -0.125000 -v 0.187500 -1.125000 -0.164063 -v 0.187500 -0.812500 -0.164063 -v 0.125000 -1.125000 -0.164063 -v 0.125000 -0.812500 -0.164063 -v -0.125000 -1.125000 -0.125000 -v -0.125000 -0.812500 -0.125000 -v -0.187500 -1.125000 -0.125000 -v -0.187500 -0.812500 -0.125000 -v -0.125000 -1.125000 -0.164063 -v -0.125000 -0.812500 -0.164063 -v -0.187500 -1.125000 -0.164063 -v -0.187500 -0.812500 -0.164063 -v 0.187500 -1.125000 0.164062 -v 0.187500 -0.812500 0.164062 -v 0.125000 -1.125000 0.164062 -v 0.125000 -0.812500 0.164062 -v 0.187500 -1.125000 0.125000 -v 0.187500 -0.812500 0.125000 -v 0.125000 -1.125000 0.125000 -v 0.125000 -0.812500 0.125000 -v -0.125000 -1.125000 0.164062 -v -0.125000 -0.812500 0.164062 -v -0.187500 -1.125000 0.164062 -v -0.187500 -0.812500 0.164062 -v -0.125000 -1.125000 0.125000 -v -0.125000 -0.812500 0.125000 -v -0.187500 -1.125000 0.125000 -v -0.187500 -0.812500 0.125000 -v 0.187500 -1.164063 -0.164063 -v 0.187500 -1.164063 0.164062 -v 0.125000 -1.164063 -0.164063 -v 0.125000 -1.164063 0.164062 -v 0.187500 -1.125000 -0.164063 -v 0.187500 -1.125000 0.164062 -v 0.125000 -1.125000 -0.164063 -v 0.125000 -1.125000 0.164062 -v -0.125000 -1.164063 -0.164063 -v -0.125000 -1.164063 0.164062 -v -0.187500 -1.164063 -0.164063 -v -0.187500 -1.164063 0.164062 -v -0.125000 -1.125000 -0.164063 -v -0.125000 -1.125000 0.164062 -v -0.187500 -1.125000 -0.164063 -v -0.187500 -1.125000 0.164062 -vt 0.468750 0.812500 -vt 0.031250 0.812500 -vt 0.031250 0.187500 -vt 0.468750 0.187500 -vt 0.531250 0.812500 -vt 0.968750 0.812500 -vt 0.968750 0.187500 -vt 0.531250 0.187500 -vt 0.234375 0.000000 -vt 0.234375 1.000000 -vt 0.015625 1.000000 -vt 0.015625 -0.000000 -vt 0.609375 -0.000000 -vt 0.609375 1.000000 -vt 0.390625 1.000000 -vt 0.390625 -0.000000 -vt 0.765625 0.000000 -vt 0.765625 1.000000 -vt 0.843750 0.507812 -vt 0.703125 0.507812 -vt 0.703125 0.093750 -vt 0.843750 0.093750 -vt 0.015625 0.507812 -vt 0.015625 0.093750 -vt 0.156250 0.093750 -vt 0.156250 0.507812 -vt 0.156250 0.031250 -vt 0.703125 0.031250 -vt 0.703125 0.578125 -vt 0.156250 0.578125 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.781250 0.664062 -vt 0.781250 0.992188 -vt 0.921875 0.992188 -vt 0.921875 0.664062 -vt 0.484375 0.664062 -vt 0.484375 0.992188 -vt 0.562500 0.992188 -vt 0.562500 0.664062 -vt 0.703125 0.992188 -vt 0.703125 0.664062 -vt 0.234375 0.593750 -vt 0.234375 0.640625 -vt 0.093750 0.640625 -vt 0.093750 0.593750 -vt 0.453125 0.640625 -vt 0.453125 0.593750 -vt 0.312500 0.593750 -vt 0.312500 0.640625 -vt 0.781250 0.664062 -vt 0.781250 0.992188 -vt 0.921875 0.992188 -vt 0.921875 0.664062 -vt 0.484375 0.664062 -vt 0.484375 0.992188 -vt 0.562500 0.992188 -vt 0.562500 0.664062 -vt 0.703125 0.992188 -vt 0.703125 0.664062 -vt 0.234375 0.593750 -vt 0.234375 0.640625 -vt 0.093750 0.640625 -vt 0.093750 0.593750 -vt 0.453125 0.640625 -vt 0.453125 0.593750 -vt 0.312500 0.593750 -vt 0.312500 0.640625 -vt 0.843750 0.507812 -vt 0.703125 0.507812 -vt 0.703125 0.093750 -vt 0.843750 0.093750 -vt 0.015625 0.507812 -vt 0.015625 0.093750 -vt 0.156250 0.093750 -vt 0.156250 0.507812 -vt 0.156250 0.031250 -vt 0.703125 0.031250 -vt 0.703125 0.578125 -vt 0.156250 0.578125 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.312500 0.640625 -vt 0.312500 0.992188 -vt 0.453125 0.992188 -vt 0.453125 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.312500 0.992188 -vt 0.312500 0.640625 -vt 0.234375 0.640625 -vt 0.234375 0.992188 -vt 0.093750 0.992188 -vt 0.093750 0.640625 -vt 0.015625 0.992188 -vt 0.015625 0.640625 -vt 0.781250 0.664062 -vt 0.781250 0.992188 -vt 0.921875 0.992188 -vt 0.921875 0.664062 -vt 0.484375 0.664062 -vt 0.484375 0.992188 -vt 0.562500 0.992188 -vt 0.562500 0.664062 -vt 0.703125 0.992188 -vt 0.703125 0.664062 -vt 0.234375 0.593750 -vt 0.234375 0.640625 -vt 0.093750 0.640625 -vt 0.093750 0.593750 -vt 0.453125 0.640625 -vt 0.453125 0.593750 -vt 0.312500 0.593750 -vt 0.312500 0.640625 -vt 0.781250 0.664062 -vt 0.781250 0.992188 -vt 0.921875 0.992188 -vt 0.921875 0.664062 -vt 0.484375 0.664062 -vt 0.484375 0.992188 -vt 0.562500 0.992188 -vt 0.562500 0.664062 -vt 0.703125 0.992188 -vt 0.703125 0.664062 -vt 0.234375 0.593750 -vt 0.234375 0.640625 -vt 0.093750 0.640625 -vt 0.093750 0.593750 -vt 0.453125 0.640625 -vt 0.453125 0.593750 -vt 0.312500 0.593750 -vt 0.312500 0.640625 -vn 0.0000 1.0000 0.0000 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn 0.0000 0.0000 1.0000 -vn 1.0000 0.0000 0.0000 -vn -1.0000 0.0000 0.0000 -g sign_on_pole_Cube.002_front-back -s off -f 8/1/1 4/2/1 2/3/1 6/4/1 -f 3/5/2 7/6/2 5/7/2 1/8/2 -g sign_on_pole_Cube.002_edges -f 13/9/3 14/10/3 10/11/3 9/12/3 -f 11/13/4 12/14/4 16/15/4 15/16/4 -f 11/13/5 9/17/5 10/18/5 12/14/5 -f 13/9/6 15/16/6 16/15/6 14/10/6 -g sign_on_pole_Cube.002_pole_mount -f 17/19/6 18/20/6 20/21/6 19/22/6 -f 22/23/5 21/24/5 24/25/5 23/26/5 -f 20/21/4 24/25/4 21/27/4 19/28/4 -f 17/29/3 22/30/3 23/26/3 18/20/3 -f 18/20/2 23/26/2 24/25/2 20/21/2 -f 25/31/5 26/32/5 28/33/5 27/34/5 -f 27/35/4 28/36/4 32/37/4 31/38/4 -f 31/39/6 32/40/6 30/41/6 29/42/6 -f 29/42/3 30/41/3 26/43/3 25/44/3 -f 33/45/5 34/46/5 36/47/5 35/48/5 -f 35/49/4 36/50/4 40/51/4 39/52/4 -f 39/53/6 40/54/6 38/55/6 37/56/6 -f 37/56/3 38/55/3 34/57/3 33/58/3 -f 41/59/5 42/60/5 44/61/5 43/62/5 -f 43/63/4 44/64/4 48/65/4 47/66/4 -f 47/67/6 48/68/6 46/69/6 45/70/6 -f 45/70/3 46/69/3 42/71/3 41/72/3 -f 49/73/5 50/74/5 52/75/5 51/76/5 -f 51/77/4 52/78/4 56/79/4 55/80/4 -f 55/81/6 56/82/6 54/83/6 53/84/6 -f 53/84/3 54/83/3 50/85/3 49/86/3 -f 57/87/2 58/88/2 60/89/2 59/90/2 -f 59/91/4 60/92/4 64/93/4 63/94/4 -f 63/94/1 64/93/1 62/95/1 61/96/1 -f 61/96/3 62/95/3 58/88/3 57/87/3 -f 59/97/6 63/98/6 61/99/6 57/100/6 -f 64/101/5 60/102/5 58/103/5 62/104/5 -f 65/105/2 66/106/2 68/107/2 67/108/2 -f 67/109/4 68/110/4 72/111/4 71/112/4 -f 71/112/1 72/111/1 70/113/1 69/114/1 -f 69/114/3 70/113/3 66/106/3 65/105/3 -f 67/115/6 71/116/6 69/117/6 65/118/6 -f 72/119/5 68/120/5 66/121/5 70/122/5 -g sign_on_pole_Cube.002_pole_mount_horizontal -f 73/123/3 74/124/3 76/125/3 75/126/3 -f 78/127/4 77/128/4 80/129/4 79/130/4 -f 76/125/6 80/129/6 77/131/6 75/132/6 -f 73/133/5 78/134/5 79/130/5 74/124/5 -f 74/124/2 79/130/2 80/129/2 76/125/2 -f 81/135/4 82/136/4 84/137/4 83/138/4 -f 83/139/6 84/140/6 88/141/6 87/142/6 -f 87/143/3 88/144/3 86/145/3 85/146/3 -f 85/146/5 86/145/5 82/147/5 81/148/5 -f 89/149/4 90/150/4 92/151/4 91/152/4 -f 91/153/6 92/154/6 96/155/6 95/156/6 -f 95/157/3 96/158/3 94/159/3 93/160/3 -f 93/160/5 94/159/5 90/161/5 89/162/5 -f 97/163/4 98/164/4 100/165/4 99/166/4 -f 99/167/6 100/168/6 104/169/6 103/170/6 -f 103/171/3 104/172/3 102/173/3 101/174/3 -f 101/174/5 102/173/5 98/175/5 97/176/5 -f 105/177/4 106/178/4 108/179/4 107/180/4 -f 107/181/6 108/182/6 112/183/6 111/184/6 -f 111/185/3 112/186/3 110/187/3 109/188/3 -f 109/188/5 110/187/5 106/189/5 105/190/5 -f 113/191/2 114/192/2 116/193/2 115/194/2 -f 115/195/6 116/196/6 120/197/6 119/198/6 -f 119/198/1 120/197/1 118/199/1 117/200/1 -f 117/200/5 118/199/5 114/192/5 113/191/5 -f 115/201/3 119/202/3 117/203/3 113/204/3 -f 120/205/4 116/206/4 114/207/4 118/208/4 -f 121/209/2 122/210/2 124/211/2 123/212/2 -f 123/213/6 124/214/6 128/215/6 127/216/6 -f 127/216/1 128/215/1 126/217/1 125/218/1 -f 125/218/5 126/217/5 122/210/5 121/209/5 -f 123/219/3 127/220/3 125/221/3 121/222/3 -f 128/223/4 124/224/4 122/225/4 126/226/4 diff --git a/signs_lib/models/street_signs OM3.blend b/signs_lib/models/slim pole mount already positioned.blend similarity index 60% rename from signs_lib/models/street_signs OM3.blend rename to signs_lib/models/slim pole mount already positioned.blend index 7039be8e..5157c32e 100644 Binary files a/signs_lib/models/street_signs OM3.blend and b/signs_lib/models/slim pole mount already positioned.blend differ diff --git a/signs_lib/models/standard pole mount already positioned.blend b/signs_lib/models/standard pole mount already positioned.blend new file mode 100644 index 00000000..2c99acfe Binary files /dev/null and b/signs_lib/models/standard pole mount already positioned.blend differ diff --git a/signs_lib/models/standard pole mount already positioned.blend1 b/signs_lib/models/standard pole mount already positioned.blend1 new file mode 100644 index 00000000..8e2ac23c Binary files /dev/null and b/signs_lib/models/standard pole mount already positioned.blend1 differ diff --git a/signs_lib/models/standard wooden sign.blend b/signs_lib/models/standard wooden sign.blend new file mode 100644 index 00000000..134af20b Binary files /dev/null and b/signs_lib/models/standard wooden sign.blend differ diff --git a/signs_lib/models/basic_signs wooden sign.blend b/signs_lib/models/standard wooden sign.blend1 similarity index 75% rename from signs_lib/models/basic_signs wooden sign.blend rename to signs_lib/models/standard wooden sign.blend1 index 35015122..2b5129f0 100644 Binary files a/signs_lib/models/basic_signs wooden sign.blend and b/signs_lib/models/standard wooden sign.blend1 differ diff --git a/signs_lib/models/standard wooden yard sign.blend b/signs_lib/models/standard wooden yard sign.blend new file mode 100644 index 00000000..cac58d90 Binary files /dev/null and b/signs_lib/models/standard wooden yard sign.blend differ diff --git a/signs_lib/standard_signs.lua b/signs_lib/standard_signs.lua index dbfbb54a..1277c917 100644 --- a/signs_lib/standard_signs.lua +++ b/signs_lib/standard_signs.lua @@ -6,12 +6,15 @@ signs_lib.register_sign("default:sign_wall_wood", { tiles = { "signs_lib_sign_wall_wooden.png", "signs_lib_sign_wall_wooden_edges.png", + -- items 3 - 5 are not set, so signs_lib will use its standard pole + -- mount, hanging, and yard sign stick textures. }, entity_info = "standard", allow_hanging = true, allow_widefont = true, allow_onpole = true, - allow_onpole_horizontal = true + allow_onpole_horizontal = true, + allow_yard = true }) signs_lib.register_sign("default:sign_wall_steel", { @@ -20,6 +23,9 @@ signs_lib.register_sign("default:sign_wall_steel", { tiles = { "signs_lib_sign_wall_steel.png", "signs_lib_sign_wall_steel_edges.png", + nil, -- not set, so it'll use the standard pole mount texture + nil, -- not set, so it'll use the standard hanging chains texture + "default_steel_block.png" -- for the yard sign's stick }, groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, @@ -28,14 +34,27 @@ signs_lib.register_sign("default:sign_wall_steel", { allow_hanging = true, allow_widefont = true, allow_onpole = true, - allow_onpole_horizontal = true + allow_onpole_horizontal = true, + allow_yard = true }) -minetest.register_alias("signs:sign_hanging", "default:sign_wall_wood_hanging") -minetest.register_alias("basic_signs:hanging_sign", "default:sign_wall_wood_hanging") + +minetest.register_alias("default:sign_wall_wood_onpole", "default:sign_wood_onpole") + +minetest.register_alias("default:sign_wall_wood_hanging", "default:sign_wood_hanging") +minetest.register_alias("signs:sign_hanging", "default:sign_wood_hanging") +minetest.register_alias("basic_signs:hanging_sign", "default:sign_wood_hanging") + +minetest.register_alias("default:sign_wall_wood_yard", "default:sign_wood_yard") +minetest.register_alias("signs:sign_yard", "default:sign_wood_yard") +minetest.register_alias("basic_signs:yard_sign", "default:sign_wood_yard") table.insert(signs_lib.lbm_restore_nodes, "signs:sign_hanging") table.insert(signs_lib.lbm_restore_nodes, "basic_signs:hanging_sign") +table.insert(signs_lib.lbm_restore_nodes, "signs:sign_yard") +table.insert(signs_lib.lbm_restore_nodes, "basic_signs:yard_sign") +table.insert(signs_lib.lbm_restore_nodes, "default:sign_wood_yard") +table.insert(signs_lib.lbm_restore_nodes, "default:sign_wall_wood_yard") -- insert the old wood sign-on-fencepost into signs_lib's conversion LBM diff --git a/street_signs/models/street_signs_basic.obj b/street_signs/models/street_signs_basic.obj index a5529c8a..915145bb 100644 --- a/street_signs/models/street_signs_basic.obj +++ b/street_signs/models/street_signs_basic.obj @@ -41,6 +41,22 @@ v 0.031250 1.500000 -0.031250 v 0.031250 1.500000 0.031250 v -0.031250 1.500000 0.031250 v -0.031250 1.500000 -0.031250 +vt 0.562500 0.000000 +vt 0.562500 0.625000 +vt 0.437500 0.625000 +vt 0.437500 0.000000 +vt 0.562500 0.000000 +vt 0.562500 0.625000 +vt 0.437500 0.625000 +vt 0.437500 0.000000 +vt 0.562500 0.625000 +vt 0.562500 0.000000 +vt 0.437500 0.000000 +vt 0.437500 0.625000 +vt 0.156250 0.593750 +vt 0.281250 0.593750 +vt 0.281250 0.531250 +vt 0.156250 0.531250 vt 0.281250 0.593750 vt 0.156250 0.593750 vt 0.156250 0.531250 @@ -135,62 +151,41 @@ vt 0.468750 1.000000 vt 0.468750 0.968750 vt 0.531250 0.968750 vt 0.531250 1.000000 -vt 0.156250 0.593750 -vt 0.281250 0.593750 -vt 0.281250 0.531250 -vt 0.156250 0.531250 -vt 0.437500 0.000000 -vt 0.437500 0.625000 -vt 0.562500 0.625000 -vt 0.562500 0.000000 -vt 0.562500 0.000000 -vt 0.562500 0.625000 -vt 0.437500 0.625000 -vt 0.437500 0.000000 -vt 0.562500 0.000000 -vt 0.562500 0.625000 -vt 0.437500 0.000000 -vt 0.437500 0.625000 -vn 0.0000 1.0000 0.0000 -vn 0.0000 -1.0000 0.0000 -vn -1.0000 0.0000 0.0000 vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 vn 0.0000 0.0000 1.0000 -g Cube_Cube_top +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +g Cube_Cube_None s off -f 8/1/1 4/2/1 2/3/1 6/4/1 -f 12/5/1 10/6/1 9/7/1 11/8/1 -f 15/9/2 16/10/2 13/11/2 14/12/2 -f 11/13/3 16/14/3 15/15/3 12/16/3 -f 10/17/4 14/18/4 13/19/4 9/20/4 -f 9/21/5 13/22/5 16/23/5 11/24/5 -f 12/25/6 15/26/6 14/27/6 10/28/6 -f 19/29/1 18/30/1 17/31/1 20/32/1 -f 23/33/2 24/34/2 21/35/2 22/36/2 -f 17/37/5 21/38/5 24/39/5 20/40/5 -f 19/41/6 23/42/6 22/43/6 18/44/6 -f 20/45/3 24/46/3 23/47/3 19/48/3 -f 18/49/4 22/50/4 21/51/4 17/52/4 -f 28/53/2 27/54/2 25/55/2 26/56/2 -f 31/57/1 30/58/1 29/59/1 32/60/1 -f 27/61/3 28/62/3 31/63/3 32/64/3 -f 26/65/4 25/66/4 29/67/4 30/68/4 -f 25/66/5 27/69/5 32/70/5 29/67/5 -f 28/62/6 26/71/6 30/72/6 31/63/6 -f 36/73/2 35/74/2 33/75/2 34/76/2 -f 39/77/1 38/78/1 37/79/1 40/80/1 -f 35/81/3 36/82/3 39/83/3 40/84/3 -f 34/85/4 33/86/4 37/87/4 38/88/4 -f 33/89/5 35/90/5 40/91/5 37/87/5 -f 36/92/6 34/93/6 38/94/6 39/83/6 -g Cube_Cube_bottom -f 3/95/2 7/96/2 5/97/2 1/98/2 -g Cube_Cube_right -f 7/99/3 8/100/3 6/101/3 5/102/3 -g Cube_Cube_left -f 1/103/4 2/104/4 4/105/4 3/106/4 -g Cube_Cube_back -f 3/107/6 4/108/6 8/100/6 7/99/6 -g Cube_Cube_front -f 5/109/5 6/110/5 2/104/5 1/103/5 +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/5/2 4/6/2 8/7/2 7/8/2 +f 7/8/3 8/7/3 6/9/3 5/10/3 +f 5/11/4 6/12/4 2/2/4 1/1/4 +f 3/13/5 7/14/5 5/15/5 1/16/5 +f 8/17/6 4/18/6 2/19/6 6/20/6 +f 12/21/6 10/22/6 9/23/6 11/24/6 +f 15/25/5 16/26/5 13/27/5 14/28/5 +f 11/29/3 16/30/3 15/31/3 12/32/3 +f 10/33/1 14/34/1 13/35/1 9/36/1 +f 9/37/4 13/38/4 16/39/4 11/40/4 +f 12/41/2 15/42/2 14/43/2 10/44/2 +f 19/45/6 18/46/6 17/47/6 20/48/6 +f 23/49/5 24/50/5 21/51/5 22/52/5 +f 17/53/4 21/54/4 24/55/4 20/56/4 +f 19/57/2 23/58/2 22/59/2 18/60/2 +f 20/61/3 24/62/3 23/63/3 19/64/3 +f 18/65/1 22/66/1 21/67/1 17/68/1 +f 28/69/5 27/70/5 25/71/5 26/72/5 +f 31/73/6 30/74/6 29/75/6 32/76/6 +f 27/77/3 28/78/3 31/79/3 32/80/3 +f 26/81/1 25/82/1 29/83/1 30/84/1 +f 25/82/4 27/85/4 32/86/4 29/83/4 +f 28/78/2 26/87/2 30/88/2 31/79/2 +f 36/89/5 35/90/5 33/91/5 34/92/5 +f 39/93/6 38/94/6 37/95/6 40/96/6 +f 35/97/3 36/98/3 39/99/3 40/100/3 +f 34/101/1 33/102/1 37/103/1 38/104/1 +f 33/105/4 35/106/4 40/107/4 37/103/4 +f 36/108/2 34/109/2 38/110/2 39/99/2 diff --git a/street_signs/models/street_signs_basic_top_only.obj b/street_signs/models/street_signs_basic_top_only.obj index 73db1bab..8cea99db 100644 --- a/street_signs/models/street_signs_basic_top_only.obj +++ b/street_signs/models/street_signs_basic_top_only.obj @@ -1,4 +1,4 @@ -# Blender v2.79 (sub 0) OBJ File: 'street signs basic.blend' +# Blender v2.79 (sub 0) OBJ File: 'street signs basic top only.blend' # www.blender.org o Cube v 0.062500 -0.250000 -0.062500 @@ -135,10 +135,6 @@ vt 0.468750 1.000000 vt 0.468750 0.968750 vt 0.531250 0.968750 vt 0.531250 1.000000 -vt 0.000000 0.000000 -vt 0.000000 0.000000 -vt 0.000000 0.000000 -vt 0.000000 0.000000 vt 0.562500 0.500000 vt 0.437500 0.500000 vt 0.437500 0.625000 @@ -151,13 +147,17 @@ vt 0.562500 0.500000 vt 0.562500 0.625000 vt 0.437500 0.500000 vt 0.437500 0.625000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 vn 0.0000 1.0000 0.0000 vn 0.0000 -1.0000 0.0000 vn -1.0000 0.0000 0.0000 vn 1.0000 0.0000 0.0000 vn 0.0000 0.0000 -1.0000 vn 0.0000 0.0000 1.0000 -g Cube_Cube_top +g Cube_Cube_None s off f 4/1/1 2/2/1 1/3/1 3/4/1 f 8/5/1 6/6/1 5/7/1 7/8/1 @@ -184,13 +184,8 @@ f 31/81/3 32/82/3 35/83/3 36/84/3 f 30/85/4 29/86/4 33/87/4 34/88/4 f 29/89/5 31/90/5 36/91/5 33/87/5 f 32/92/6 30/93/6 34/94/6 35/83/6 -g Cube_Cube_top_NONE -f 37/95/2 39/96/2 40/97/2 38/98/2 -g Cube_Cube_right -f 39/99/3 37/100/3 4/101/3 3/102/3 -g Cube_Cube_left -f 38/103/4 40/104/4 1/105/4 2/106/4 -g Cube_Cube_back -f 37/100/6 38/107/6 2/108/6 4/101/6 -g Cube_Cube_front -f 40/104/5 39/109/5 3/110/5 1/105/5 +f 40/95/5 39/96/5 3/97/5 1/98/5 +f 37/99/6 38/100/6 2/101/6 4/102/6 +f 39/103/3 37/99/3 4/102/3 3/104/3 +f 38/105/4 40/95/4 1/98/4 2/106/4 +f 37/107/2 39/108/2 40/109/2 38/110/2 diff --git a/street_signs/models/street_signs_generic_highway_large_entity.obj b/street_signs/models/street_signs_generic_highway_large_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_highway_large_entity.obj rename to street_signs/models/street_signs_generic_highway_large_entity_wall.obj diff --git a/street_signs/models/street_signs_generic_highway_large_onpole.obj b/street_signs/models/street_signs_generic_highway_large_onpole.obj index 515d67b5..51e1aa20 100644 --- a/street_signs/models/street_signs_generic_highway_large_onpole.obj +++ b/street_signs/models/street_signs_generic_highway_large_onpole.obj @@ -1,94 +1,94 @@ # Blender v2.79 (sub 0) OBJ File: 'generic highway sign, large.blend' # www.blender.org o Cube -v -0.125000 -0.875000 0.312500 -v -0.125000 -0.875000 0.687500 -v 0.125000 -0.812500 0.687500 -v 0.125000 -0.812500 0.312500 -v 0.125000 -0.875000 0.312500 -v 0.125000 -0.875000 0.687500 -v -0.125000 -1.125000 0.312500 -v -0.125000 -0.812500 0.312500 -v -0.125000 -1.125000 0.375000 -v -0.125000 -0.812500 0.375000 -v -0.164063 -1.125000 0.312500 -v -0.164063 -0.812500 0.312500 -v -0.164063 -0.812500 0.375000 -v -0.125000 -1.125000 0.625000 -v -0.125000 -0.812500 0.625000 -v -0.125000 -1.125000 0.687500 -v -0.125000 -0.812500 0.687500 -v -0.164063 -0.812500 0.625000 -v -0.164063 -0.812500 0.687500 -v 0.164062 -0.812500 0.312500 -v 0.164062 -0.812500 0.375000 -v 0.125000 -1.125000 0.312500 -v 0.125000 -1.125000 0.375000 -v 0.125000 -0.812500 0.375000 -v 0.164062 -0.812500 0.625000 -v 0.164062 -0.812500 0.687500 -v 0.125000 -1.125000 0.625000 -v 0.125000 -0.812500 0.625000 -v 0.125000 -1.125000 0.687500 -v -0.164063 -1.164063 0.312500 -v 0.164062 -1.164063 0.312500 -v -0.164063 -1.164063 0.375000 -v 0.164062 -1.164063 0.375000 -v 0.164062 -1.125000 0.312500 -v -0.164063 -1.125000 0.375000 -v 0.164062 -1.125000 0.375000 -v -0.164063 -1.164063 0.625000 -v 0.164062 -1.164063 0.625000 -v -0.164063 -1.164063 0.687500 -v 0.164062 -1.164063 0.687500 -v -0.164063 -1.125000 0.625000 -v 0.164062 -1.125000 0.625000 -v -0.164063 -1.125000 0.687500 -v 0.164062 -1.125000 0.687500 -v -2.125000 -0.812500 0.312500 -v -2.125000 -0.875000 0.312500 -v -2.125000 -0.812500 0.687500 -v -2.125000 -0.875000 0.687500 -v -1.875000 -0.812500 0.312500 -v -1.875000 -0.875000 0.312500 -v -1.875000 -0.875000 0.687500 -v -2.125000 -1.125000 0.312500 -v -2.125000 -1.125000 0.375000 -v -2.125000 -0.812500 0.375000 -v -2.164062 -0.812500 0.312500 -v -2.164062 -0.812500 0.375000 -v -2.125000 -1.125000 0.625000 -v -2.125000 -0.812500 0.625000 -v -2.125000 -1.125000 0.687500 -v -2.164062 -0.812500 0.625000 -v -2.164062 -0.812500 0.687500 -v -1.835938 -0.812500 0.312500 -v -1.835938 -0.812500 0.375000 -v -1.875000 -1.125000 0.312500 -v -1.875000 -1.125000 0.375000 -v -1.875000 -0.812500 0.375000 -v -1.835938 -0.812500 0.625000 -v -1.835938 -0.812500 0.687500 -v -1.875000 -1.125000 0.625000 -v -1.875000 -0.812500 0.625000 -v -1.875000 -1.125000 0.687500 -v -1.875000 -0.812500 0.687500 -v -2.164062 -1.164063 0.312500 -v -1.835938 -1.164063 0.312500 -v -2.164063 -1.164063 0.375000 -v -1.835938 -1.164063 0.375000 -v -2.164062 -1.125000 0.312500 -v -1.835938 -1.125000 0.312500 -v -2.164063 -1.125000 0.375000 -v -1.835938 -1.125000 0.375000 -v -2.164062 -1.164063 0.625000 -v -1.835938 -1.164063 0.625000 -v -2.164063 -1.164063 0.687500 -v -1.835938 -1.164063 0.687500 -v -2.164062 -1.125000 0.625000 -v -1.835938 -1.125000 0.625000 -v -2.164063 -1.125000 0.687500 -v -1.835938 -1.125000 0.687500 +v -0.125000 -0.875000 0.812500 +v -0.125000 -0.875000 1.187500 +v 0.125000 -0.812500 1.187500 +v 0.125000 -0.812500 0.812500 +v 0.125000 -0.875000 0.812500 +v 0.125000 -0.875000 1.187500 +v -0.125000 -1.125000 0.812500 +v -0.125000 -0.812500 0.812500 +v -0.125000 -1.125000 0.875000 +v -0.125000 -0.812500 0.875000 +v -0.164063 -1.125000 0.812500 +v -0.164063 -0.812500 0.812500 +v -0.164063 -0.812500 0.875000 +v -0.125000 -1.125000 1.125000 +v -0.125000 -0.812500 1.125000 +v -0.125000 -1.125000 1.187500 +v -0.125000 -0.812500 1.187500 +v -0.164063 -0.812500 1.125000 +v -0.164063 -0.812500 1.187500 +v 0.164062 -0.812500 0.812500 +v 0.164062 -0.812500 0.875000 +v 0.125000 -1.125000 0.812500 +v 0.125000 -1.125000 0.875000 +v 0.125000 -0.812500 0.875000 +v 0.164062 -0.812500 1.125000 +v 0.164062 -0.812500 1.187500 +v 0.125000 -1.125000 1.125000 +v 0.125000 -0.812500 1.125000 +v 0.125000 -1.125000 1.187500 +v -0.164063 -1.164063 0.812500 +v 0.164062 -1.164063 0.812500 +v -0.164063 -1.164063 0.875000 +v 0.164062 -1.164063 0.875000 +v 0.164062 -1.125000 0.812500 +v -0.164063 -1.125000 0.875000 +v 0.164062 -1.125000 0.875000 +v -0.164063 -1.164063 1.125000 +v 0.164062 -1.164063 1.125000 +v -0.164063 -1.164063 1.187500 +v 0.164062 -1.164063 1.187500 +v -0.164063 -1.125000 1.125000 +v 0.164062 -1.125000 1.125000 +v -0.164063 -1.125000 1.187500 +v 0.164062 -1.125000 1.187500 +v -2.125000 -0.812500 0.812500 +v -2.125000 -0.875000 0.812500 +v -2.125000 -0.812500 1.187500 +v -2.125000 -0.875000 1.187500 +v -1.875000 -0.812500 0.812500 +v -1.875000 -0.875000 0.812500 +v -1.875000 -0.875000 1.187500 +v -2.125000 -1.125000 0.812500 +v -2.125000 -1.125000 0.875000 +v -2.125000 -0.812500 0.875000 +v -2.164062 -0.812500 0.812500 +v -2.164062 -0.812500 0.875000 +v -2.125000 -1.125000 1.125000 +v -2.125000 -0.812500 1.125000 +v -2.125000 -1.125000 1.187500 +v -2.164062 -0.812500 1.125000 +v -2.164062 -0.812500 1.187500 +v -1.835938 -0.812500 0.812500 +v -1.835938 -0.812500 0.875000 +v -1.875000 -1.125000 0.812500 +v -1.875000 -1.125000 0.875000 +v -1.875000 -0.812500 0.875000 +v -1.835938 -0.812500 1.125000 +v -1.835938 -0.812500 1.187500 +v -1.875000 -1.125000 1.125000 +v -1.875000 -0.812500 1.125000 +v -1.875000 -1.125000 1.187500 +v -1.875000 -0.812500 1.187500 +v -2.164062 -1.164063 0.812500 +v -1.835938 -1.164063 0.812500 +v -2.164063 -1.164063 0.875000 +v -1.835938 -1.164063 0.875000 +v -2.164062 -1.125000 0.812500 +v -1.835938 -1.125000 0.812500 +v -2.164063 -1.125000 0.875000 +v -1.835938 -1.125000 0.875000 +v -2.164062 -1.164063 1.125000 +v -1.835938 -1.164063 1.125000 +v -2.164063 -1.164063 1.187500 +v -1.835938 -1.164063 1.187500 +v -2.164062 -1.125000 1.125000 +v -1.835938 -1.125000 1.125000 +v -2.164063 -1.125000 1.187500 +v -1.835938 -1.125000 1.187500 v 0.500000 -0.712500 -0.500000 v 0.500000 -0.812500 1.500000 v 0.500000 -0.712500 1.500000 @@ -97,6 +97,94 @@ v -2.500000 -0.712500 1.500000 v 0.500000 -0.812500 -0.500000 v -2.500000 -0.712500 -0.500000 v -2.500000 -0.812500 1.500000 +v -0.125000 -0.875000 -0.187500 +v -0.125000 -0.875000 0.187500 +v 0.125000 -0.812500 0.187500 +v 0.125000 -0.812500 -0.187500 +v 0.125000 -0.875000 -0.187500 +v 0.125000 -0.875000 0.187500 +v -0.125000 -1.125000 -0.187500 +v -0.125000 -0.812500 -0.187500 +v -0.125000 -1.125000 -0.125000 +v -0.125000 -0.812500 -0.125000 +v -0.164063 -1.125000 -0.187500 +v -0.164063 -0.812500 -0.187500 +v -0.164063 -0.812500 -0.125000 +v -0.125000 -1.125000 0.125000 +v -0.125000 -0.812500 0.125000 +v -0.125000 -1.125000 0.187500 +v -0.125000 -0.812500 0.187500 +v -0.164063 -0.812500 0.125000 +v -0.164063 -0.812500 0.187500 +v 0.164062 -0.812500 -0.187500 +v 0.164062 -0.812500 -0.125000 +v 0.125000 -1.125000 -0.187500 +v 0.125000 -1.125000 -0.125000 +v 0.125000 -0.812500 -0.125000 +v 0.164062 -0.812500 0.125000 +v 0.164062 -0.812500 0.187500 +v 0.125000 -1.125000 0.125000 +v 0.125000 -0.812500 0.125000 +v 0.125000 -1.125000 0.187500 +v -0.164063 -1.164063 -0.187500 +v 0.164062 -1.164063 -0.187500 +v -0.164063 -1.164063 -0.125000 +v 0.164062 -1.164063 -0.125000 +v 0.164062 -1.125000 -0.187500 +v -0.164063 -1.125000 -0.125000 +v 0.164062 -1.125000 -0.125000 +v -0.164063 -1.164063 0.125000 +v 0.164062 -1.164063 0.125000 +v -0.164063 -1.164063 0.187500 +v 0.164062 -1.164063 0.187500 +v -0.164063 -1.125000 0.125000 +v 0.164062 -1.125000 0.125000 +v -0.164063 -1.125000 0.187500 +v 0.164062 -1.125000 0.187500 +v -2.125000 -0.812500 -0.187500 +v -2.125000 -0.875000 -0.187500 +v -2.125000 -0.812500 0.187500 +v -2.125000 -0.875000 0.187500 +v -1.875000 -0.812500 -0.187500 +v -1.875000 -0.875000 -0.187500 +v -1.875000 -0.875000 0.187500 +v -2.125000 -1.125000 -0.187500 +v -2.125000 -1.125000 -0.125000 +v -2.125000 -0.812500 -0.125000 +v -2.164062 -0.812500 -0.187500 +v -2.164062 -0.812500 -0.125000 +v -2.125000 -1.125000 0.125000 +v -2.125000 -0.812500 0.125000 +v -2.125000 -1.125000 0.187500 +v -2.164062 -0.812500 0.125000 +v -2.164062 -0.812500 0.187500 +v -1.835938 -0.812500 -0.187500 +v -1.835938 -0.812500 -0.125000 +v -1.875000 -1.125000 -0.187500 +v -1.875000 -1.125000 -0.125000 +v -1.875000 -0.812500 -0.125000 +v -1.835938 -0.812500 0.125000 +v -1.835938 -0.812500 0.187500 +v -1.875000 -1.125000 0.125000 +v -1.875000 -0.812500 0.125000 +v -1.875000 -1.125000 0.187500 +v -1.875000 -0.812500 0.187500 +v -2.164062 -1.164063 -0.187500 +v -1.835938 -1.164063 -0.187500 +v -2.164063 -1.164063 -0.125000 +v -1.835938 -1.164063 -0.125000 +v -2.164062 -1.125000 -0.187500 +v -1.835938 -1.125000 -0.187500 +v -2.164063 -1.125000 -0.125000 +v -1.835938 -1.125000 -0.125000 +v -2.164062 -1.164063 0.125000 +v -1.835938 -1.164063 0.125000 +v -2.164063 -1.164063 0.187500 +v -1.835938 -1.164063 0.187500 +v -2.164062 -1.125000 0.125000 +v -1.835938 -1.125000 0.125000 +v -2.164063 -1.125000 0.187500 +v -1.835938 -1.125000 0.187500 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.000000 0.500000 @@ -307,6 +395,198 @@ vt 0.234375 0.593750 vt 0.093750 0.593750 vt 0.453125 0.593750 vt 0.312500 0.593750 +vt 0.843750 0.507812 +vt 0.703125 0.507812 +vt 0.703125 0.093750 +vt 0.843750 0.093750 +vt 0.015625 0.507812 +vt 0.015625 0.093750 +vt 0.156250 0.093750 +vt 0.156250 0.507812 +vt 0.156250 0.031250 +vt 0.703125 0.031250 +vt 0.703125 0.578125 +vt 0.156250 0.578125 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.781250 0.664062 +vt 0.781250 0.992188 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.703125 0.992188 +vt 0.703125 0.664062 +vt 0.234375 0.593750 +vt 0.093750 0.593750 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.781250 0.664062 +vt 0.781250 0.992188 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.703125 0.992188 +vt 0.703125 0.664062 +vt 0.234375 0.593750 +vt 0.093750 0.593750 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.843750 0.507812 +vt 0.703125 0.507812 +vt 0.703125 0.093750 +vt 0.843750 0.093750 +vt 0.015625 0.507812 +vt 0.015625 0.093750 +vt 0.156250 0.093750 +vt 0.156250 0.507812 +vt 0.156250 0.031250 +vt 0.703125 0.031250 +vt 0.703125 0.578125 +vt 0.156250 0.578125 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.781250 0.664062 +vt 0.781250 0.992188 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.703125 0.992188 +vt 0.703125 0.664062 +vt 0.234375 0.593750 +vt 0.093750 0.593750 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.781250 0.664062 +vt 0.781250 0.992188 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.703125 0.992188 +vt 0.703125 0.664062 +vt 0.234375 0.593750 +vt 0.093750 0.593750 +vt 0.453125 0.593750 +vt 0.312500 0.593750 vn 0.0000 1.0000 0.0000 vn 0.0000 -1.0000 0.0000 vn 0.0000 0.0000 -1.0000 @@ -389,3 +669,69 @@ f 87/204/1 88/203/1 86/205/1 85/206/1 f 85/206/3 86/205/3 82/198/3 81/197/3 f 83/207/6 87/149/6 85/152/6 81/208/6 f 88/172/5 84/209/5 82/210/5 86/169/5 +f 104/211/6 97/212/6 98/213/6 113/214/6 +f 100/215/5 99/216/5 102/217/5 101/218/5 +f 98/213/4 102/217/4 99/219/4 113/220/4 +f 104/221/3 100/222/3 101/218/3 97/212/3 +f 97/212/2 101/218/2 102/217/2 98/213/2 +f 103/223/5 104/224/5 106/225/5 105/226/5 +f 105/227/4 106/228/4 109/229/4 131/230/4 +f 131/231/6 109/232/6 108/233/6 107/234/6 +f 107/234/3 108/233/3 104/235/3 103/236/3 +f 110/237/5 111/238/5 113/239/5 112/240/5 +f 112/241/4 113/242/4 115/243/4 139/244/4 +f 139/245/6 115/246/6 114/247/6 137/248/6 +f 137/248/3 114/247/3 111/249/3 110/250/3 +f 130/251/5 116/252/5 117/253/5 132/254/5 +f 132/255/4 117/256/4 120/257/4 119/258/4 +f 119/259/6 120/260/6 100/261/6 118/262/6 +f 118/262/3 100/261/3 116/263/3 130/264/3 +f 138/265/5 121/266/5 122/267/5 140/268/5 +f 140/269/4 122/270/4 99/271/4 125/272/4 +f 125/273/6 99/274/6 124/275/6 123/276/6 +f 123/276/3 124/275/3 121/277/3 138/278/3 +f 126/279/2 127/280/2 129/281/2 128/282/2 +f 128/283/4 129/284/4 132/285/4 131/286/4 +f 131/286/1 132/285/1 130/287/1 107/288/1 +f 107/288/3 130/287/3 127/280/3 126/279/3 +f 128/289/6 131/231/6 107/234/6 126/290/6 +f 132/254/5 129/291/5 127/292/5 130/251/5 +f 133/293/2 134/294/2 136/295/2 135/296/2 +f 135/297/4 136/298/4 140/299/4 139/300/4 +f 139/300/1 140/299/1 138/301/1 137/302/1 +f 137/302/3 138/301/3 134/294/3 133/293/3 +f 135/303/6 139/245/6 137/248/6 133/304/6 +f 140/268/5 136/305/5 134/306/5 138/265/5 +f 141/307/6 142/308/6 144/309/6 143/310/6 +f 145/311/5 168/312/5 147/313/5 146/314/5 +f 144/309/4 147/313/4 168/315/4 143/316/4 +f 141/317/3 145/318/3 146/314/3 142/308/3 +f 142/308/2 146/314/2 147/313/2 144/309/2 +f 148/319/5 141/320/5 150/321/5 149/322/5 +f 149/323/4 150/324/4 152/325/4 175/326/4 +f 175/327/6 152/328/6 151/329/6 173/330/6 +f 173/330/3 151/329/3 141/331/3 148/332/3 +f 153/333/5 154/334/5 143/335/5 155/336/5 +f 155/337/4 143/338/4 157/339/4 183/340/4 +f 183/341/6 157/342/6 156/343/6 181/344/6 +f 181/344/3 156/343/3 154/345/3 153/346/3 +f 174/347/5 158/348/5 159/349/5 176/350/5 +f 176/351/4 159/352/4 162/353/4 161/354/4 +f 161/355/6 162/356/6 145/357/6 160/358/6 +f 160/358/3 145/357/3 158/359/3 174/360/3 +f 182/361/5 163/362/5 164/363/5 184/364/5 +f 184/365/4 164/366/4 168/367/4 167/368/4 +f 167/369/6 168/370/6 166/371/6 165/372/6 +f 165/372/3 166/371/3 163/373/3 182/374/3 +f 169/375/2 170/376/2 172/377/2 171/378/2 +f 171/379/4 172/380/4 176/381/4 175/382/4 +f 175/382/1 176/381/1 174/383/1 173/384/1 +f 173/384/3 174/383/3 170/376/3 169/375/3 +f 171/385/6 175/327/6 173/330/6 169/386/6 +f 176/350/5 172/387/5 170/388/5 174/347/5 +f 177/389/2 178/390/2 180/391/2 179/392/2 +f 179/393/4 180/394/4 184/395/4 183/396/4 +f 183/396/1 184/395/1 182/397/1 181/398/1 +f 181/398/3 182/397/3 178/390/3 177/389/3 +f 179/399/6 183/341/6 181/344/6 177/400/6 +f 184/364/5 180/401/5 178/402/5 182/361/5 diff --git a/street_signs/models/street_signs_generic_highway_large.obj b/street_signs/models/street_signs_generic_highway_large_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_highway_large.obj rename to street_signs/models/street_signs_generic_highway_large_wall.obj diff --git a/street_signs/models/street_signs_generic_highway_medium_entity.obj b/street_signs/models/street_signs_generic_highway_medium_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_highway_medium_entity.obj rename to street_signs/models/street_signs_generic_highway_medium_entity_wall.obj diff --git a/street_signs/models/street_signs_generic_highway_medium_onpole.obj b/street_signs/models/street_signs_generic_highway_medium_onpole.obj index 3746c14a..281c085e 100644 --- a/street_signs/models/street_signs_generic_highway_medium_onpole.obj +++ b/street_signs/models/street_signs_generic_highway_medium_onpole.obj @@ -1,94 +1,94 @@ # Blender v2.79 (sub 0) OBJ File: 'generic highway sign, medium.blend' # www.blender.org o Cube -v -0.125000 -0.875000 0.312500 -v -0.125000 -0.875000 0.687500 -v 0.125000 -0.812500 0.687500 -v 0.125000 -0.812500 0.312500 -v 0.125000 -0.875000 0.312500 -v 0.125000 -0.875000 0.687500 -v -0.125000 -1.125000 0.312500 -v -0.125000 -0.812500 0.312500 -v -0.125000 -1.125000 0.375000 -v -0.125000 -0.812500 0.375000 -v -0.164063 -1.125000 0.312500 -v -0.164063 -0.812500 0.312500 -v -0.164063 -0.812500 0.375000 -v -0.125000 -1.125000 0.625000 -v -0.125000 -0.812500 0.625000 -v -0.125000 -1.125000 0.687500 -v -0.125000 -0.812500 0.687500 -v -0.164063 -0.812500 0.625000 -v -0.164063 -0.812500 0.687500 -v 0.164063 -0.812500 0.312500 -v 0.164063 -0.812500 0.375000 -v 0.125000 -1.125000 0.312500 -v 0.125000 -1.125000 0.375000 -v 0.125000 -0.812500 0.375000 -v 0.164063 -0.812500 0.625000 -v 0.164063 -0.812500 0.687500 -v 0.125000 -1.125000 0.625000 -v 0.125000 -0.812500 0.625000 -v 0.125000 -1.125000 0.687500 -v -0.164063 -1.164063 0.312500 -v 0.164063 -1.164063 0.312500 -v -0.164063 -1.164063 0.375000 -v 0.164062 -1.164063 0.375000 -v 0.164063 -1.125000 0.312500 -v -0.164063 -1.125000 0.375000 -v 0.164062 -1.125000 0.375000 -v -0.164063 -1.164063 0.625000 -v 0.164063 -1.164063 0.625000 -v -0.164063 -1.164063 0.687500 -v 0.164062 -1.164063 0.687500 -v -0.164063 -1.125000 0.625000 -v 0.164063 -1.125000 0.625000 -v -0.164063 -1.125000 0.687500 -v 0.164062 -1.125000 0.687500 -v -1.125000 -0.812500 0.312500 -v -1.125000 -0.875000 0.312500 -v -1.125000 -0.812500 0.687500 -v -1.125000 -0.875000 0.687500 -v -0.875000 -0.812500 0.312500 -v -0.875000 -0.875000 0.312500 -v -0.875000 -0.875000 0.687500 -v -1.125000 -1.125000 0.312500 -v -1.125000 -1.125000 0.375000 -v -1.125000 -0.812500 0.375000 -v -1.164062 -0.812500 0.312500 -v -1.164062 -0.812500 0.375000 -v -1.125000 -1.125000 0.625000 -v -1.125000 -0.812500 0.625000 -v -1.125000 -1.125000 0.687500 -v -1.164062 -0.812500 0.625000 -v -1.164062 -0.812500 0.687500 -v -0.835938 -0.812500 0.312500 -v -0.835938 -0.812500 0.375000 -v -0.875000 -1.125000 0.312500 -v -0.875000 -1.125000 0.375000 -v -0.875000 -0.812500 0.375000 -v -0.835938 -0.812500 0.625000 -v -0.835938 -0.812500 0.687500 -v -0.875000 -1.125000 0.625000 -v -0.875000 -0.812500 0.625000 -v -0.875000 -1.125000 0.687500 -v -0.875000 -0.812500 0.687500 -v -1.164062 -1.164063 0.312500 -v -0.835938 -1.164063 0.312500 -v -1.164063 -1.164063 0.375000 -v -0.835938 -1.164063 0.375000 -v -1.164062 -1.125000 0.312500 -v -0.835938 -1.125000 0.312500 -v -1.164063 -1.125000 0.375000 -v -0.835938 -1.125000 0.375000 -v -1.164062 -1.164063 0.625000 -v -0.835938 -1.164063 0.625000 -v -1.164063 -1.164063 0.687500 -v -0.835938 -1.164063 0.687500 -v -1.164062 -1.125000 0.625000 -v -0.835938 -1.125000 0.625000 -v -1.164063 -1.125000 0.687500 -v -0.835938 -1.125000 0.687500 +v -0.125000 -0.875000 0.812500 +v -0.125000 -0.875000 1.187500 +v 0.125000 -0.812500 1.187500 +v 0.125000 -0.812500 0.812500 +v 0.125000 -0.875000 0.812500 +v 0.125000 -0.875000 1.187500 +v -0.125000 -1.125000 0.812500 +v -0.125000 -0.812500 0.812500 +v -0.125000 -1.125000 0.875000 +v -0.125000 -0.812500 0.875000 +v -0.164063 -1.125000 0.812500 +v -0.164063 -0.812500 0.812500 +v -0.164063 -0.812500 0.875000 +v -0.125000 -1.125000 1.125000 +v -0.125000 -0.812500 1.125000 +v -0.125000 -1.125000 1.187500 +v -0.125000 -0.812500 1.187500 +v -0.164063 -0.812500 1.125000 +v -0.164063 -0.812500 1.187500 +v 0.164063 -0.812500 0.812500 +v 0.164063 -0.812500 0.875000 +v 0.125000 -1.125000 0.812500 +v 0.125000 -1.125000 0.875000 +v 0.125000 -0.812500 0.875000 +v 0.164063 -0.812500 1.125000 +v 0.164063 -0.812500 1.187500 +v 0.125000 -1.125000 1.125000 +v 0.125000 -0.812500 1.125000 +v 0.125000 -1.125000 1.187500 +v -0.164063 -1.164063 0.812500 +v 0.164063 -1.164063 0.812500 +v -0.164063 -1.164063 0.875000 +v 0.164062 -1.164063 0.875000 +v 0.164063 -1.125000 0.812500 +v -0.164063 -1.125000 0.875000 +v 0.164062 -1.125000 0.875000 +v -0.164063 -1.164063 1.125000 +v 0.164063 -1.164063 1.125000 +v -0.164063 -1.164063 1.187500 +v 0.164062 -1.164063 1.187500 +v -0.164063 -1.125000 1.125000 +v 0.164063 -1.125000 1.125000 +v -0.164063 -1.125000 1.187500 +v 0.164062 -1.125000 1.187500 +v -1.125000 -0.812500 0.812500 +v -1.125000 -0.875000 0.812500 +v -1.125000 -0.812500 1.187500 +v -1.125000 -0.875000 1.187500 +v -0.875000 -0.812500 0.812500 +v -0.875000 -0.875000 0.812500 +v -0.875000 -0.875000 1.187500 +v -1.125000 -1.125000 0.812500 +v -1.125000 -1.125000 0.875000 +v -1.125000 -0.812500 0.875000 +v -1.164062 -0.812500 0.812500 +v -1.164062 -0.812500 0.875000 +v -1.125000 -1.125000 1.125000 +v -1.125000 -0.812500 1.125000 +v -1.125000 -1.125000 1.187500 +v -1.164062 -0.812500 1.125000 +v -1.164062 -0.812500 1.187500 +v -0.835938 -0.812500 0.812500 +v -0.835938 -0.812500 0.875000 +v -0.875000 -1.125000 0.812500 +v -0.875000 -1.125000 0.875000 +v -0.875000 -0.812500 0.875000 +v -0.835938 -0.812500 1.125000 +v -0.835938 -0.812500 1.187500 +v -0.875000 -1.125000 1.125000 +v -0.875000 -0.812500 1.125000 +v -0.875000 -1.125000 1.187500 +v -0.875000 -0.812500 1.187500 +v -1.164062 -1.164063 0.812500 +v -0.835938 -1.164063 0.812500 +v -1.164063 -1.164063 0.875000 +v -0.835938 -1.164063 0.875000 +v -1.164062 -1.125000 0.812500 +v -0.835938 -1.125000 0.812500 +v -1.164063 -1.125000 0.875000 +v -0.835938 -1.125000 0.875000 +v -1.164062 -1.164063 1.125000 +v -0.835938 -1.164063 1.125000 +v -1.164063 -1.164063 1.187500 +v -0.835938 -1.164063 1.187500 +v -1.164062 -1.125000 1.125000 +v -0.835938 -1.125000 1.125000 +v -1.164063 -1.125000 1.187500 +v -0.835938 -1.125000 1.187500 v 0.500000 -0.712500 -0.500000 v 0.500000 -0.812500 1.500000 v 0.500000 -0.712500 1.500000 @@ -97,6 +97,94 @@ v -1.500000 -0.712500 1.500000 v 0.500000 -0.812500 -0.500000 v -1.500000 -0.712500 -0.500000 v -1.500000 -0.812500 1.500000 +v -0.125000 -0.875000 -0.187500 +v -0.125000 -0.875000 0.187500 +v 0.125000 -0.812500 0.187500 +v 0.125000 -0.812500 -0.187500 +v 0.125000 -0.875000 -0.187500 +v 0.125000 -0.875000 0.187500 +v -0.125000 -1.125000 -0.187500 +v -0.125000 -0.812500 -0.187500 +v -0.125000 -1.125000 -0.125000 +v -0.125000 -0.812500 -0.125000 +v -0.164063 -1.125000 -0.187500 +v -0.164063 -0.812500 -0.187500 +v -0.164063 -0.812500 -0.125000 +v -0.125000 -1.125000 0.125000 +v -0.125000 -0.812500 0.125000 +v -0.125000 -1.125000 0.187500 +v -0.125000 -0.812500 0.187500 +v -0.164063 -0.812500 0.125000 +v -0.164063 -0.812500 0.187500 +v 0.164063 -0.812500 -0.187500 +v 0.164063 -0.812500 -0.125000 +v 0.125000 -1.125000 -0.187500 +v 0.125000 -1.125000 -0.125000 +v 0.125000 -0.812500 -0.125000 +v 0.164063 -0.812500 0.125000 +v 0.164063 -0.812500 0.187500 +v 0.125000 -1.125000 0.125000 +v 0.125000 -0.812500 0.125000 +v 0.125000 -1.125000 0.187500 +v -0.164063 -1.164063 -0.187500 +v 0.164063 -1.164063 -0.187500 +v -0.164063 -1.164063 -0.125000 +v 0.164062 -1.164063 -0.125000 +v 0.164063 -1.125000 -0.187500 +v -0.164063 -1.125000 -0.125000 +v 0.164062 -1.125000 -0.125000 +v -0.164063 -1.164063 0.125000 +v 0.164063 -1.164063 0.125000 +v -0.164063 -1.164063 0.187500 +v 0.164062 -1.164063 0.187500 +v -0.164063 -1.125000 0.125000 +v 0.164063 -1.125000 0.125000 +v -0.164063 -1.125000 0.187500 +v 0.164062 -1.125000 0.187500 +v -1.125000 -0.812500 -0.187500 +v -1.125000 -0.875000 -0.187500 +v -1.125000 -0.812500 0.187500 +v -1.125000 -0.875000 0.187500 +v -0.875000 -0.812500 -0.187500 +v -0.875000 -0.875000 -0.187500 +v -0.875000 -0.875000 0.187500 +v -1.125000 -1.125000 -0.187500 +v -1.125000 -1.125000 -0.125000 +v -1.125000 -0.812500 -0.125000 +v -1.164062 -0.812500 -0.187500 +v -1.164062 -0.812500 -0.125000 +v -1.125000 -1.125000 0.125000 +v -1.125000 -0.812500 0.125000 +v -1.125000 -1.125000 0.187500 +v -1.164062 -0.812500 0.125000 +v -1.164062 -0.812500 0.187500 +v -0.835938 -0.812500 -0.187500 +v -0.835938 -0.812500 -0.125000 +v -0.875000 -1.125000 -0.187500 +v -0.875000 -1.125000 -0.125000 +v -0.875000 -0.812500 -0.125000 +v -0.835938 -0.812500 0.125000 +v -0.835938 -0.812500 0.187500 +v -0.875000 -1.125000 0.125000 +v -0.875000 -0.812500 0.125000 +v -0.875000 -1.125000 0.187500 +v -0.875000 -0.812500 0.187500 +v -1.164062 -1.164063 -0.187500 +v -0.835938 -1.164063 -0.187500 +v -1.164063 -1.164063 -0.125000 +v -0.835938 -1.164063 -0.125000 +v -1.164062 -1.125000 -0.187500 +v -0.835938 -1.125000 -0.187500 +v -1.164063 -1.125000 -0.125000 +v -0.835938 -1.125000 -0.125000 +v -1.164062 -1.164063 0.125000 +v -0.835938 -1.164063 0.125000 +v -1.164063 -1.164063 0.187500 +v -0.835938 -1.164063 0.187500 +v -1.164062 -1.125000 0.125000 +v -0.835938 -1.125000 0.125000 +v -1.164063 -1.125000 0.187500 +v -0.835938 -1.125000 0.187500 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.000000 0.500000 @@ -307,6 +395,198 @@ vt 0.234375 0.593750 vt 0.093750 0.593750 vt 0.453125 0.593750 vt 0.312500 0.593750 +vt 0.843750 0.507812 +vt 0.703125 0.507812 +vt 0.703125 0.093750 +vt 0.843750 0.093750 +vt 0.015625 0.507812 +vt 0.015625 0.093750 +vt 0.156250 0.093750 +vt 0.156250 0.507812 +vt 0.156250 0.031250 +vt 0.703125 0.031250 +vt 0.703125 0.578125 +vt 0.156250 0.578125 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.781250 0.664062 +vt 0.781250 0.992188 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.703125 0.992188 +vt 0.703125 0.664062 +vt 0.234375 0.593750 +vt 0.093750 0.593750 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.781250 0.664062 +vt 0.781250 0.992188 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.703125 0.992188 +vt 0.703125 0.664062 +vt 0.234375 0.593750 +vt 0.093750 0.593750 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.843750 0.507812 +vt 0.703125 0.507812 +vt 0.703125 0.093750 +vt 0.843750 0.093750 +vt 0.015625 0.507812 +vt 0.015625 0.093750 +vt 0.156250 0.093750 +vt 0.156250 0.507812 +vt 0.156250 0.031250 +vt 0.703125 0.031250 +vt 0.703125 0.578125 +vt 0.156250 0.578125 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.312500 0.640625 +vt 0.312500 0.992188 +vt 0.453125 0.992188 +vt 0.453125 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.312500 0.992188 +vt 0.312500 0.640625 +vt 0.234375 0.640625 +vt 0.234375 0.992188 +vt 0.093750 0.992188 +vt 0.093750 0.640625 +vt 0.015625 0.992188 +vt 0.015625 0.640625 +vt 0.781250 0.664062 +vt 0.781250 0.992188 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.703125 0.992188 +vt 0.703125 0.664062 +vt 0.234375 0.593750 +vt 0.093750 0.593750 +vt 0.453125 0.593750 +vt 0.312500 0.593750 +vt 0.781250 0.664062 +vt 0.781250 0.992188 +vt 0.921875 0.992188 +vt 0.921875 0.664062 +vt 0.484375 0.664062 +vt 0.484375 0.992188 +vt 0.562500 0.992188 +vt 0.562500 0.664062 +vt 0.703125 0.992188 +vt 0.703125 0.664062 +vt 0.234375 0.593750 +vt 0.093750 0.593750 +vt 0.453125 0.593750 +vt 0.312500 0.593750 vn 0.0000 1.0000 0.0000 vn 0.0000 -1.0000 0.0000 vn 0.0000 0.0000 -1.0000 @@ -389,3 +669,69 @@ f 87/204/1 88/203/1 86/205/1 85/206/1 f 85/206/3 86/205/3 82/198/3 81/197/3 f 83/207/6 87/149/6 85/152/6 81/208/6 f 88/172/5 84/209/5 82/210/5 86/169/5 +f 104/211/6 97/212/6 98/213/6 113/214/6 +f 100/215/5 99/216/5 102/217/5 101/218/5 +f 98/213/4 102/217/4 99/219/4 113/220/4 +f 104/221/3 100/222/3 101/218/3 97/212/3 +f 97/212/2 101/218/2 102/217/2 98/213/2 +f 103/223/5 104/224/5 106/225/5 105/226/5 +f 105/227/4 106/228/4 109/229/4 131/230/4 +f 131/231/6 109/232/6 108/233/6 107/234/6 +f 107/234/3 108/233/3 104/235/3 103/236/3 +f 110/237/5 111/238/5 113/239/5 112/240/5 +f 112/241/4 113/242/4 115/243/4 139/244/4 +f 139/245/6 115/246/6 114/247/6 137/248/6 +f 137/248/3 114/247/3 111/249/3 110/250/3 +f 130/251/5 116/252/5 117/253/5 132/254/5 +f 132/255/4 117/256/4 120/257/4 119/258/4 +f 119/259/6 120/260/6 100/261/6 118/262/6 +f 118/262/3 100/261/3 116/263/3 130/264/3 +f 138/265/5 121/266/5 122/267/5 140/268/5 +f 140/269/4 122/270/4 99/271/4 125/272/4 +f 125/273/6 99/274/6 124/275/6 123/276/6 +f 123/276/3 124/275/3 121/277/3 138/278/3 +f 126/279/2 127/280/2 129/281/2 128/282/2 +f 128/283/4 129/284/4 132/285/4 131/286/4 +f 131/286/1 132/285/1 130/287/1 107/288/1 +f 107/288/3 130/287/3 127/280/3 126/279/3 +f 128/289/6 131/231/6 107/234/6 126/290/6 +f 132/254/5 129/291/5 127/292/5 130/251/5 +f 133/293/2 134/294/2 136/295/2 135/296/2 +f 135/297/4 136/298/4 140/299/4 139/300/4 +f 139/300/1 140/299/1 138/301/1 137/302/1 +f 137/302/3 138/301/3 134/294/3 133/293/3 +f 135/303/6 139/245/6 137/248/6 133/304/6 +f 140/268/5 136/305/5 134/306/5 138/265/5 +f 141/307/6 142/308/6 144/309/6 143/310/6 +f 145/311/5 168/312/5 147/313/5 146/314/5 +f 144/309/4 147/313/4 168/315/4 143/316/4 +f 141/317/3 145/318/3 146/314/3 142/308/3 +f 142/308/2 146/314/2 147/313/2 144/309/2 +f 148/319/5 141/320/5 150/321/5 149/322/5 +f 149/323/4 150/324/4 152/325/4 175/326/4 +f 175/327/6 152/328/6 151/329/6 173/330/6 +f 173/330/3 151/329/3 141/331/3 148/332/3 +f 153/333/5 154/334/5 143/335/5 155/336/5 +f 155/337/4 143/338/4 157/339/4 183/340/4 +f 183/341/6 157/342/6 156/343/6 181/344/6 +f 181/344/3 156/343/3 154/345/3 153/346/3 +f 174/347/5 158/348/5 159/349/5 176/350/5 +f 176/351/4 159/352/4 162/353/4 161/354/4 +f 161/355/6 162/356/6 145/357/6 160/358/6 +f 160/358/3 145/357/3 158/359/3 174/360/3 +f 182/361/5 163/362/5 164/363/5 184/364/5 +f 184/365/4 164/366/4 168/367/4 167/368/4 +f 167/369/6 168/370/6 166/371/6 165/372/6 +f 165/372/3 166/371/3 163/373/3 182/374/3 +f 169/375/2 170/376/2 172/377/2 171/378/2 +f 171/379/4 172/380/4 176/381/4 175/382/4 +f 175/382/1 176/381/1 174/383/1 173/384/1 +f 173/384/3 174/383/3 170/376/3 169/375/3 +f 171/385/6 175/327/6 173/330/6 169/386/6 +f 176/350/5 172/387/5 170/388/5 174/347/5 +f 177/389/2 178/390/2 180/391/2 179/392/2 +f 179/393/4 180/394/4 184/395/4 183/396/4 +f 183/396/1 184/395/1 182/397/1 181/398/1 +f 181/398/3 182/397/3 178/390/3 177/389/3 +f 179/399/6 183/341/6 181/344/6 177/400/6 +f 184/364/5 180/401/5 178/402/5 182/361/5 diff --git a/street_signs/models/street_signs_generic_highway_medium.obj b/street_signs/models/street_signs_generic_highway_medium_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_highway_medium.obj rename to street_signs/models/street_signs_generic_highway_medium_wall.obj diff --git a/street_signs/models/street_signs_generic_highway_small_entity.obj b/street_signs/models/street_signs_generic_highway_small_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_highway_small_entity.obj rename to street_signs/models/street_signs_generic_highway_small_entity_wall.obj diff --git a/street_signs/models/street_signs_generic_highway_small.obj b/street_signs/models/street_signs_generic_highway_small_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_highway_small.obj rename to street_signs/models/street_signs_generic_highway_small_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_18x18_top_entity.obj b/street_signs/models/street_signs_generic_sign_18x18_top_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_18x18_top_entity.obj rename to street_signs/models/street_signs_generic_sign_18x18_top_entity_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_18x18_top.obj b/street_signs/models/street_signs_generic_sign_18x18_top_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_18x18_top.obj rename to street_signs/models/street_signs_generic_sign_18x18_top_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_24x12_top.obj b/street_signs/models/street_signs_generic_sign_24x12_top_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_24x12_top.obj rename to street_signs/models/street_signs_generic_sign_24x12_top_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_24x18_entity.obj b/street_signs/models/street_signs_generic_sign_24x18_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_24x18_entity.obj rename to street_signs/models/street_signs_generic_sign_24x18_entity_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_24x18_top_entity.obj b/street_signs/models/street_signs_generic_sign_24x18_top_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_24x18_top_entity.obj rename to street_signs/models/street_signs_generic_sign_24x18_top_entity_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_24x18_top.obj b/street_signs/models/street_signs_generic_sign_24x18_top_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_24x18_top.obj rename to street_signs/models/street_signs_generic_sign_24x18_top_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_24x18.obj b/street_signs/models/street_signs_generic_sign_24x18_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_24x18.obj rename to street_signs/models/street_signs_generic_sign_24x18_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_24x24.obj b/street_signs/models/street_signs_generic_sign_24x24_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_24x24.obj rename to street_signs/models/street_signs_generic_sign_24x24_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_24x30.obj b/street_signs/models/street_signs_generic_sign_24x30_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_24x30.obj rename to street_signs/models/street_signs_generic_sign_24x30_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_24x36.obj b/street_signs/models/street_signs_generic_sign_24x36_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_24x36.obj rename to street_signs/models/street_signs_generic_sign_24x36_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_30dia.obj b/street_signs/models/street_signs_generic_sign_30dia_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_30dia.obj rename to street_signs/models/street_signs_generic_sign_30dia_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_30x24.obj b/street_signs/models/street_signs_generic_sign_30x24_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_30x24.obj rename to street_signs/models/street_signs_generic_sign_30x24_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_30x30.obj b/street_signs/models/street_signs_generic_sign_30x30_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_30x30.obj rename to street_signs/models/street_signs_generic_sign_30x30_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_30x36_entity.obj b/street_signs/models/street_signs_generic_sign_30x36_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_30x36_entity.obj rename to street_signs/models/street_signs_generic_sign_30x36_entity_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_30x36.obj b/street_signs/models/street_signs_generic_sign_30x36_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_30x36.obj rename to street_signs/models/street_signs_generic_sign_30x36_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_36x36_entity.obj b/street_signs/models/street_signs_generic_sign_36x36_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_36x36_entity.obj rename to street_signs/models/street_signs_generic_sign_36x36_entity_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_36x36.obj b/street_signs/models/street_signs_generic_sign_36x36_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_36x36.obj rename to street_signs/models/street_signs_generic_sign_36x36_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_36x42.obj b/street_signs/models/street_signs_generic_sign_36x42_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_36x42.obj rename to street_signs/models/street_signs_generic_sign_36x42_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_36x48.obj b/street_signs/models/street_signs_generic_sign_36x48_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_36x48.obj rename to street_signs/models/street_signs_generic_sign_36x48_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_42x30.obj b/street_signs/models/street_signs_generic_sign_42x30_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_42x30.obj rename to street_signs/models/street_signs_generic_sign_42x30_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_48x18.obj b/street_signs/models/street_signs_generic_sign_48x18_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_48x18.obj rename to street_signs/models/street_signs_generic_sign_48x18_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_48x24.obj b/street_signs/models/street_signs_generic_sign_48x24_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_48x24.obj rename to street_signs/models/street_signs_generic_sign_48x24_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_54x18.obj b/street_signs/models/street_signs_generic_sign_54x18_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_54x18.obj rename to street_signs/models/street_signs_generic_sign_54x18_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_60x24.obj b/street_signs/models/street_signs_generic_sign_60x24_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_60x24.obj rename to street_signs/models/street_signs_generic_sign_60x24_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_9x12.obj b/street_signs/models/street_signs_generic_sign_9x12_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_9x12.obj rename to street_signs/models/street_signs_generic_sign_9x12_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_9x15_entity.obj b/street_signs/models/street_signs_generic_sign_9x15_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_9x15_entity.obj rename to street_signs/models/street_signs_generic_sign_9x15_entity_wall.obj diff --git a/street_signs/models/street_signs_generic_sign_9x15.obj b/street_signs/models/street_signs_generic_sign_9x15_wall.obj similarity index 100% rename from street_signs/models/street_signs_generic_sign_9x15.obj rename to street_signs/models/street_signs_generic_sign_9x15_wall.obj diff --git a/street_signs/models/street_signs_interstate_shield_entity.obj b/street_signs/models/street_signs_interstate_shield_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_interstate_shield_entity.obj rename to street_signs/models/street_signs_interstate_shield_entity_wall.obj diff --git a/street_signs/models/street_signs_interstate_shield.obj b/street_signs/models/street_signs_interstate_shield_wall.obj similarity index 100% rename from street_signs/models/street_signs_interstate_shield.obj rename to street_signs/models/street_signs_interstate_shield_wall.obj diff --git a/street_signs/models/street_signs_object_marker_type_3.obj b/street_signs/models/street_signs_object_marker_type_3_wall.obj similarity index 100% rename from street_signs/models/street_signs_object_marker_type_3.obj rename to street_signs/models/street_signs_object_marker_type_3_wall.obj diff --git a/street_signs/models/street_signs_rr_grade_crossbuck.obj b/street_signs/models/street_signs_rr_grade_crossbuck_wall.obj similarity index 100% rename from street_signs/models/street_signs_rr_grade_crossbuck.obj rename to street_signs/models/street_signs_rr_grade_crossbuck_wall.obj diff --git a/street_signs/models/street_signs_stop_all_way.obj b/street_signs/models/street_signs_stop_all_way_wall.obj similarity index 100% rename from street_signs/models/street_signs_stop_all_way.obj rename to street_signs/models/street_signs_stop_all_way_wall.obj diff --git a/street_signs/models/street_signs_stop.obj b/street_signs/models/street_signs_stop_wall.obj similarity index 100% rename from street_signs/models/street_signs_stop.obj rename to street_signs/models/street_signs_stop_wall.obj diff --git a/street_signs/models/street_signs_warning_36x36_entity.obj b/street_signs/models/street_signs_warning_36x36_entity_wall.obj similarity index 100% rename from street_signs/models/street_signs_warning_36x36_entity.obj rename to street_signs/models/street_signs_warning_36x36_entity_wall.obj diff --git a/street_signs/models/street_signs_warning_36x36.obj b/street_signs/models/street_signs_warning_36x36_wall.obj similarity index 100% rename from street_signs/models/street_signs_warning_36x36.obj rename to street_signs/models/street_signs_warning_36x36_wall.obj diff --git a/street_signs/models/street_signs_yield.obj b/street_signs/models/street_signs_yield_wall.obj similarity index 100% rename from street_signs/models/street_signs_yield.obj rename to street_signs/models/street_signs_yield_wall.obj diff --git a/street_signs/signs_class_d.lua b/street_signs/signs_class_d.lua index 8bc8bebb..5accca64 100644 --- a/street_signs/signs_class_d.lua +++ b/street_signs/signs_class_d.lua @@ -104,7 +104,7 @@ cbox = signs_lib.make_selection_boxes(24, 24) signs_lib.register_sign("street_signs:sign_service_hospital", { description = "D9-2: General service: hospital", selection_box = cbox, - mesh = "street_signs_generic_sign_24x24.obj", + mesh = "street_signs_generic_sign_24x24_wall.obj", tiles = { "street_signs_service_hospital.png", "street_signs_sign_edge.png", }, @@ -118,7 +118,7 @@ signs_lib.register_sign("street_signs:sign_service_hospital", { signs_lib.register_sign("street_signs:sign_service_handicapped", { description = "D9-6: General service: handicapped", selection_box = cbox, - mesh = "street_signs_generic_sign_24x24.obj", + mesh = "street_signs_generic_sign_24x24_wall.obj", tiles = { "street_signs_service_handicapped.png", "street_signs_sign_edge.png", }, @@ -132,7 +132,7 @@ signs_lib.register_sign("street_signs:sign_service_handicapped", { signs_lib.register_sign("street_signs:sign_service_fuel", { description = "D9-7: General service: fuel/gas", selection_box = cbox, - mesh = "street_signs_generic_sign_24x24.obj", + mesh = "street_signs_generic_sign_24x24_wall.obj", tiles = { "street_signs_service_fuel.png", "street_signs_sign_edge.png", }, @@ -146,7 +146,7 @@ signs_lib.register_sign("street_signs:sign_service_fuel", { signs_lib.register_sign("street_signs:sign_service_food", { description = "D9-8: General service: food", selection_box = cbox, - mesh = "street_signs_generic_sign_24x24.obj", + mesh = "street_signs_generic_sign_24x24_wall.obj", tiles = { "street_signs_service_food.png", "street_signs_sign_edge.png", }, @@ -160,7 +160,7 @@ signs_lib.register_sign("street_signs:sign_service_food", { signs_lib.register_sign("street_signs:sign_service_lodging", { description = "D9-9: General service: lodging", selection_box = cbox, - mesh = "street_signs_generic_sign_24x24.obj", + mesh = "street_signs_generic_sign_24x24_wall.obj", tiles = { "street_signs_service_lodging.png", "street_signs_sign_edge.png", }, @@ -174,7 +174,7 @@ signs_lib.register_sign("street_signs:sign_service_lodging", { signs_lib.register_sign("street_signs:sign_service_ev_charging", { description = "D9-11b: General service: EV charging", selection_box = cbox, - mesh = "street_signs_generic_sign_24x24.obj", + mesh = "street_signs_generic_sign_24x24_wall.obj", tiles = { "street_signs_service_ev_charging.png", "street_signs_sign_edge.png", }, diff --git a/street_signs/signs_class_m.lua b/street_signs/signs_class_m.lua index 2a0e1aea..a4532930 100644 --- a/street_signs/signs_class_m.lua +++ b/street_signs/signs_class_m.lua @@ -8,7 +8,7 @@ sgroups.not_in_creative_inventory = 1 signs_lib.register_sign("street_signs:sign_us_route", { description = "M1-4: Generic \"US Route\" sign", selection_box = cbox, - mesh = "street_signs_generic_sign_36x36.obj", + mesh = "street_signs_generic_sign_36x36_wall.obj", tiles = { "street_signs_us_route.png", "street_signs_sign_edge.png", @@ -25,7 +25,7 @@ signs_lib.register_sign("street_signs:sign_us_route", { y_offset = 11, chars_per_line = 3, entity_info = { - mesh = "street_signs_generic_sign_36x36_entity.obj", + mesh = "street_signs_generic_sign_36x36_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, @@ -36,7 +36,7 @@ signs_lib.register_sign("street_signs:sign_us_route", { signs_lib.register_sign("street_signs:sign_us_interstate", { description = "M1-1: Generic US Interstate sign", selection_box = cbox, - mesh = "street_signs_interstate_shield.obj", + mesh = "street_signs_interstate_shield_wall.obj", tiles = { "street_signs_us_interstate.png", "street_signs_sign_edge.png", @@ -54,7 +54,7 @@ signs_lib.register_sign("street_signs:sign_us_interstate", { y_offset = 14, chars_per_line = 3, entity_info = { - mesh = "street_signs_interstate_shield_entity.obj", + mesh = "street_signs_interstate_shield_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, @@ -67,7 +67,7 @@ cbox = signs_lib.make_selection_boxes(48, 18) signs_lib.register_sign("street_signs:sign_detour_right_m4_10", { description = "M4-10: Detour sign (to right)", selection_box = cbox, - mesh = "street_signs_generic_sign_48x18.obj", + mesh = "street_signs_generic_sign_48x18_wall.obj", tiles = { "street_signs_detour_right_m4_10.png", "street_signs_sign_edge.png", @@ -82,7 +82,7 @@ signs_lib.register_sign("street_signs:sign_detour_right_m4_10", { signs_lib.register_sign("street_signs:sign_detour_left_m4_10", { description = "M4-10: Detour sign (to left)", selection_box = cbox, - mesh = "street_signs_generic_sign_48x18.obj", + mesh = "street_signs_generic_sign_48x18_wall.obj", tiles = { "street_signs_detour_left_m4_10.png", "street_signs_sign_edge.png", diff --git a/street_signs/signs_class_om.lua b/street_signs/signs_class_om.lua index f2805f5b..352ba17c 100644 --- a/street_signs/signs_class_om.lua +++ b/street_signs/signs_class_om.lua @@ -7,7 +7,7 @@ for _, d in ipairs({"l", "c", "r"}) do signs_lib.register_sign("street_signs:sign_object_marker_type3_"..d, { description = "OM3-"..string.upper(d)..": Type 3 object marker", selection_box = cbox, - mesh = "street_signs_object_marker_type_3.obj", + mesh = "street_signs_object_marker_type_3_wall.obj", tiles = { "street_signs_object_marker_type3_"..d..".png", "street_signs_sign_edge.png" diff --git a/street_signs/signs_class_r.lua b/street_signs/signs_class_r.lua index fa875aff..3fb252b7 100644 --- a/street_signs/signs_class_r.lua +++ b/street_signs/signs_class_r.lua @@ -3,17 +3,16 @@ local S = signs_lib.gettext local cbox = signs_lib.make_selection_boxes(36, 36) - signs_lib.register_sign("street_signs:sign_stop", { description = "R1-1: Stop sign", selection_box = cbox, - mesh = "street_signs_stop.obj", + mesh = "street_signs_stop_wall.obj", tiles = { "street_signs_stop.png", "street_signs_sign_edge.png" }, inventory_image = "street_signs_stop_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -24,13 +23,13 @@ cbox = signs_lib.make_selection_boxes(36, 43.1, nil, 0, -3.55, 0) signs_lib.register_sign("street_signs:sign_stop_all_way", { description = "R1-1 + R1-3P: Stop sign with \"all way\" plaque", selection_box = cbox, - mesh = "street_signs_stop_all_way.obj", + mesh = "street_signs_stop_all_way_wall.obj", tiles = { "street_signs_stop.png", "street_signs_sign_edge.png" }, inventory_image = "street_signs_stop_all_way_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -41,13 +40,13 @@ cbox = signs_lib.make_selection_boxes(48, 48) signs_lib.register_sign("street_signs:sign_yield", { description = "R1-2: Yield sign", selection_box = cbox, - mesh = "street_signs_yield.obj", + mesh = "street_signs_yield_wall.obj", tiles = { "street_signs_yield.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_yield_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -58,13 +57,13 @@ cbox = signs_lib.make_selection_boxes(30, 36) signs_lib.register_sign("street_signs:sign_speed_limit", { description = "R2-1: Generic speed limit sign", selection_box = cbox, - mesh = "street_signs_generic_sign_30x36.obj", + mesh = "street_signs_generic_sign_30x36_wall.obj", tiles = { "street_signs_speed_limit.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_speed_limit_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, number_of_lines = 1, horiz_scaling = 2.65, @@ -75,7 +74,7 @@ signs_lib.register_sign("street_signs:sign_speed_limit", { y_offset = 37, chars_per_line = 4, entity_info = { - mesh = "street_signs_generic_sign_30x36_entity.obj", + mesh = "street_signs_generic_sign_30x36_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, @@ -88,13 +87,13 @@ cbox = signs_lib.make_selection_boxes(36, 36) signs_lib.register_sign("street_signs:sign_no_right_turn", { description = "R3-1: No right turn", selection_box = cbox, - mesh = "street_signs_generic_sign_36x36.obj", + mesh = "street_signs_generic_sign_36x36_wall.obj", tiles = { "street_signs_no_right_turn.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_no_right_turn_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -103,13 +102,13 @@ signs_lib.register_sign("street_signs:sign_no_right_turn", { signs_lib.register_sign("street_signs:sign_no_left_turn", { description = "R3-2: No left turn", selection_box = cbox, - mesh = "street_signs_generic_sign_36x36.obj", + mesh = "street_signs_generic_sign_36x36_wall.obj", tiles = { "street_signs_no_left_turn.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_no_left_turn_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -118,13 +117,13 @@ signs_lib.register_sign("street_signs:sign_no_left_turn", { signs_lib.register_sign("street_signs:sign_no_u_turn", { description = "R3-4: No U-turn", selection_box = cbox, - mesh = "street_signs_generic_sign_36x36.obj", + mesh = "street_signs_generic_sign_36x36_wall.obj", tiles = { "street_signs_no_u_turn.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_no_u_turn_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -133,13 +132,13 @@ signs_lib.register_sign("street_signs:sign_no_u_turn", { signs_lib.register_sign("street_signs:sign_u_turn_here", { description = "U-turn here", selection_box = cbox, - mesh = "street_signs_generic_sign_36x36.obj", + mesh = "street_signs_generic_sign_36x36_wall.obj", tiles = { "street_signs_u_turn_here.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_u_turn_here_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -150,13 +149,13 @@ cbox = signs_lib.make_selection_boxes(30, 36) signs_lib.register_sign("street_signs:sign_left_turn_only", { description = "R3-5: Left turn only", selection_box = cbox, - mesh = "street_signs_generic_sign_30x36.obj", + mesh = "street_signs_generic_sign_30x36_wall.obj", tiles = { "street_signs_left_turn_only.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_left_turn_only_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -165,13 +164,13 @@ signs_lib.register_sign("street_signs:sign_left_turn_only", { signs_lib.register_sign("street_signs:sign_right_turn_only", { description = "R3-5: Right turn only", selection_box = cbox, - mesh = "street_signs_generic_sign_30x36.obj", + mesh = "street_signs_generic_sign_30x36_wall.obj", tiles = { "street_signs_right_turn_only.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_right_turn_only_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -180,13 +179,13 @@ signs_lib.register_sign("street_signs:sign_right_turn_only", { signs_lib.register_sign("street_signs:sign_straight_through_only", { description = "R3-5a: Straight through only", selection_box = cbox, - mesh = "street_signs_generic_sign_30x36.obj", + mesh = "street_signs_generic_sign_30x36_wall.obj", tiles = { "street_signs_straight_through_only.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_straight_through_only_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -195,13 +194,13 @@ signs_lib.register_sign("street_signs:sign_straight_through_only", { signs_lib.register_sign("street_signs:sign_left_turn_or_straight", { description = "R3-6: Left turn or straight through", selection_box = cbox, - mesh = "street_signs_generic_sign_30x36.obj", + mesh = "street_signs_generic_sign_30x36_wall.obj", tiles = { "street_signs_left_turn_or_straight.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_left_turn_or_straight_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -210,13 +209,13 @@ signs_lib.register_sign("street_signs:sign_left_turn_or_straight", { signs_lib.register_sign("street_signs:sign_right_turn_or_straight", { description = "R3-6: Right turn or straight through", selection_box = cbox, - mesh = "street_signs_generic_sign_30x36.obj", + mesh = "street_signs_generic_sign_30x36_wall.obj", tiles = { "street_signs_right_turn_or_straight.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_right_turn_or_straight_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -227,13 +226,13 @@ cbox = signs_lib.make_selection_boxes(36, 36) signs_lib.register_sign("street_signs:sign_left_lane_must_turn_left", { description = "R3-7: Left lane must turn left", selection_box = cbox, - mesh = "street_signs_generic_sign_36x36.obj", + mesh = "street_signs_generic_sign_36x36_wall.obj", tiles = { "street_signs_left_lane_must_turn_left.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_left_lane_must_turn_left_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -242,13 +241,13 @@ signs_lib.register_sign("street_signs:sign_left_lane_must_turn_left", { signs_lib.register_sign("street_signs:sign_right_lane_must_turn_right", { description = "R3-7: Right lane must turn right", selection_box = cbox, - mesh = "street_signs_generic_sign_36x36.obj", + mesh = "street_signs_generic_sign_36x36_wall.obj", tiles = { "street_signs_right_lane_must_turn_right.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_right_lane_must_turn_right_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -257,13 +256,13 @@ signs_lib.register_sign("street_signs:sign_right_lane_must_turn_right", { signs_lib.register_sign("street_signs:sign_no_straight_through", { description = "R3-27: No straight through", selection_box = cbox, - mesh = "street_signs_generic_sign_36x36.obj", + mesh = "street_signs_generic_sign_36x36_wall.obj", tiles = { "street_signs_no_straight_through.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_no_straight_through_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -274,13 +273,13 @@ cbox = signs_lib.make_selection_boxes(36, 48) signs_lib.register_sign("street_signs:sign_keep_right", { description = "R4-7: Keep right sign", selection_box = cbox, - mesh = "street_signs_generic_sign_36x48.obj", + mesh = "street_signs_generic_sign_36x48_wall.obj", tiles = { "street_signs_keep_right.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_keep_right_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -289,13 +288,13 @@ signs_lib.register_sign("street_signs:sign_keep_right", { signs_lib.register_sign("street_signs:sign_keep_left", { description = "R4-8: Keep left sign", selection_box = cbox, - mesh = "street_signs_generic_sign_36x48.obj", + mesh = "street_signs_generic_sign_36x48_wall.obj", tiles = { "street_signs_keep_left.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_keep_left_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -306,13 +305,13 @@ cbox = signs_lib.make_selection_boxes(36, 36) signs_lib.register_sign("street_signs:sign_do_not_enter", { description = "R5-1: Do not enter sign", selection_box = cbox, - mesh = "street_signs_generic_sign_36x36.obj", + mesh = "street_signs_generic_sign_36x36_wall.obj", tiles = { "street_signs_do_not_enter.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_do_not_enter_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -323,13 +322,13 @@ cbox = signs_lib.make_selection_boxes(42, 30) signs_lib.register_sign("street_signs:sign_wrong_way", { description = "R5-1a: Wrong way sign", selection_box = cbox, - mesh = "street_signs_generic_sign_42x30.obj", + mesh = "street_signs_generic_sign_42x30_wall.obj", tiles = { "street_signs_wrong_way.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_wrong_way_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -340,13 +339,13 @@ cbox = signs_lib.make_selection_boxes(54, 18) signs_lib.register_sign("street_signs:sign_one_way_left", { description = "R6-1: One way (left)", selection_box = cbox, - mesh = "street_signs_generic_sign_54x18.obj", + mesh = "street_signs_generic_sign_54x18_wall.obj", tiles = { "street_signs_one_way_left.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_one_way_left_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -355,13 +354,13 @@ signs_lib.register_sign("street_signs:sign_one_way_left", { signs_lib.register_sign("street_signs:sign_one_way_right", { description = "R6-1: One way (right)", selection_box = cbox, - mesh = "street_signs_generic_sign_54x18.obj", + mesh = "street_signs_generic_sign_54x18_wall.obj", tiles = { "street_signs_one_way_right.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_one_way_right_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -372,13 +371,13 @@ cbox = signs_lib.make_selection_boxes(30, 24) signs_lib.register_sign("street_signs:sign_divided_highway_with_cross_road", { description = "R6-3: divided highway with cross road", selection_box = cbox, - mesh = "street_signs_generic_sign_30x24.obj", + mesh = "street_signs_generic_sign_30x24_wall.obj", tiles = { "street_signs_divided_highway_with_cross_road.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_divided_highway_with_cross_road_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -389,13 +388,13 @@ cbox = signs_lib.make_selection_boxes(60, 24) signs_lib.register_sign("street_signs:sign_roundabout_directional", { description = "R6-4b: Roundabout direction (4 chevrons)", selection_box = cbox, - mesh = "street_signs_generic_sign_60x24.obj", + mesh = "street_signs_generic_sign_60x24_wall.obj", tiles = { "street_signs_roundabout_directional.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_roundabout_directional_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -404,13 +403,13 @@ signs_lib.register_sign("street_signs:sign_roundabout_directional", { signs_lib.register_sign("street_signs:sign_roundabout_directional_left", { description = "R6-4b: Roundabout direction (4 chevrons, pointing left)", selection_box = cbox, - mesh = "street_signs_generic_sign_60x24.obj", + mesh = "street_signs_generic_sign_60x24_wall.obj", tiles = { "street_signs_roundabout_directional_left.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_roundabout_directional_left_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -421,13 +420,13 @@ cbox = signs_lib.make_selection_boxes(30, 30) signs_lib.register_sign("street_signs:sign_roundabout_counter_clockwise", { description = "R6-5P: Roundabout plaque (to the left/counter-clockwise)", selection_box = cbox, - mesh = "street_signs_generic_sign_30x30.obj", + mesh = "street_signs_generic_sign_30x30_wall.obj", tiles = { "street_signs_roundabout_counter_clockwise.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_roundabout_counter_clockwise_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -436,13 +435,13 @@ signs_lib.register_sign("street_signs:sign_roundabout_counter_clockwise", { signs_lib.register_sign("street_signs:sign_roundabout_clockwise", { description = "R6-5P: Roundabout plaque (to the right/clockwise)", selection_box = cbox, - mesh = "street_signs_generic_sign_30x30.obj", + mesh = "street_signs_generic_sign_30x30_wall.obj", tiles = { "street_signs_roundabout_clockwise.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_roundabout_clockwise_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -453,13 +452,13 @@ cbox = signs_lib.make_selection_boxes(24, 30) signs_lib.register_sign("street_signs:sign_do_not_stop_on_tracks", { description = "R8-8: Do not stop on tracks", selection_box = cbox, - mesh = "street_signs_generic_sign_24x30.obj", + mesh = "street_signs_generic_sign_24x30_wall.obj", tiles = { "street_signs_do_not_stop_on_tracks.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_do_not_stop_on_tracks_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -470,13 +469,13 @@ cbox = signs_lib.make_selection_boxes(9, 15, nil, 0, 0, -1.25) signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3a", { description = "R10-3a: Pedestrians, push button to cross (pointing left)", selection_box = cbox, - mesh = "street_signs_generic_sign_9x15.obj", + mesh = "street_signs_generic_sign_9x15_wall.obj", tiles = { "street_signs_ped_push_button_to_cross_r10_3a.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3a_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, uses_slim_pole_mount = true, @@ -485,13 +484,13 @@ signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3a", { signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3a_right", { description = "R10-3a: Pedestrians, push button to cross (pointing right)", selection_box = cbox, - mesh = "street_signs_generic_sign_9x15.obj", + mesh = "street_signs_generic_sign_9x15_wall.obj", tiles = { "street_signs_ped_push_button_to_cross_r10_3a_right.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3a_right_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, uses_slim_pole_mount = true, @@ -500,13 +499,13 @@ signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3a_right signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3a_both_ways", { description = "R10-3a: Pedestrians, push button to cross (pointing both ways)", selection_box = cbox, - mesh = "street_signs_generic_sign_9x15.obj", + mesh = "street_signs_generic_sign_9x15_wall.obj", tiles = { "street_signs_ped_push_button_to_cross_r10_3a_both_ways.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3a_both_ways_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, uses_slim_pole_mount = true, @@ -515,13 +514,13 @@ signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3a_both_ signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3e", { description = "R10-3e: Pedestrians, push button to cross (pointing right)", selection_box = cbox, - mesh = "street_signs_generic_sign_9x15.obj", + mesh = "street_signs_generic_sign_9x15_wall.obj", tiles = { "street_signs_ped_push_button_to_cross_r10_3e.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3e_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, uses_slim_pole_mount = true, @@ -530,13 +529,13 @@ signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3e", { signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3e_left", { description = "R10-3e: Pedestrians, push button to cross (pointing left)", selection_box = cbox, - mesh = "street_signs_generic_sign_9x15.obj", + mesh = "street_signs_generic_sign_9x15_wall.obj", tiles = { "street_signs_ped_push_button_to_cross_r10_3e_left.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3e_left_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, uses_slim_pole_mount = true, @@ -545,13 +544,13 @@ signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3e_left" signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3i", { description = "R10-3i: Pedestrians, push button to cross (pointing right, with street name)", selection_box = cbox, - mesh = "street_signs_generic_sign_9x15.obj", + mesh = "street_signs_generic_sign_9x15_wall.obj", tiles = { "street_signs_ped_push_button_to_cross_r10_3i.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3i_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, number_of_lines = 1, horiz_scaling = 3, @@ -562,7 +561,7 @@ signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3i", { y_offset = 333, chars_per_line = 25, entity_info = { - mesh = "street_signs_generic_sign_9x15_entity.obj", + mesh = "street_signs_generic_sign_9x15_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_onpole = true, @@ -573,13 +572,13 @@ signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3i", { signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3i_left", { description = "R10-3i: Pedestrians, push button to cross (pointing left, with street name)", selection_box = cbox, - mesh = "street_signs_generic_sign_9x15.obj", + mesh = "street_signs_generic_sign_9x15_wall.obj", tiles = { "street_signs_ped_push_button_to_cross_r10_3i_left.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_ped_push_button_to_cross_r10_3i_left_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, number_of_lines = 1, horiz_scaling = 3, @@ -590,7 +589,7 @@ signs_lib.register_sign("street_signs:sign_ped_push_button_to_cross_r10_3i_left" y_offset = 333, chars_per_line = 25, entity_info = { - mesh = "street_signs_generic_sign_9x15_entity.obj", + mesh = "street_signs_generic_sign_9x15_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_onpole = true, @@ -603,13 +602,13 @@ cbox = signs_lib.make_selection_boxes(30, 36) signs_lib.register_sign("street_signs:sign_left_on_green_arrow_only", { description = "R10-5: Left on green arrow only sign", selection_box = cbox, - mesh = "street_signs_generic_sign_30x36.obj", + mesh = "street_signs_generic_sign_30x36_wall.obj", tiles = { "street_signs_left_on_green_arrow_only.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_left_on_green_arrow_only_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -620,13 +619,13 @@ cbox = signs_lib.make_selection_boxes(24, 36) signs_lib.register_sign("street_signs:sign_stop_here_on_red", { description = "R10-6: Stop here on red sign", selection_box = cbox, - mesh = "street_signs_generic_sign_24x36.obj", + mesh = "street_signs_generic_sign_24x36_wall.obj", tiles = { "street_signs_stop_here_on_red.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_stop_here_on_red_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -637,13 +636,13 @@ cbox = signs_lib.make_selection_boxes(36, 42) signs_lib.register_sign("street_signs:sign_use_lane_with_green_arrow", { description = "R10-8: Use lane with green arrow", selection_box = cbox, - mesh = "street_signs_generic_sign_36x42.obj", + mesh = "street_signs_generic_sign_36x42_wall.obj", tiles = { "street_signs_use_lane_with_green_arrow.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_use_lane_with_green_arrow_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -654,13 +653,13 @@ cbox = signs_lib.make_selection_boxes(36, 48) signs_lib.register_sign("street_signs:sign_no_turn_on_red_light", { description = "R10-11: No turn on red light", selection_box = cbox, - mesh = "street_signs_generic_sign_36x48.obj", + mesh = "street_signs_generic_sign_36x48_wall.obj", tiles = { "street_signs_no_turn_on_red_light.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_no_turn_on_red_light_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -671,13 +670,13 @@ cbox = signs_lib.make_selection_boxes(30, 36) signs_lib.register_sign("street_signs:sign_left_turn_yield_on_green_light", { description = "R10-12: Left turn yield on green light", selection_box = cbox, - mesh = "street_signs_generic_sign_30x36.obj", + mesh = "street_signs_generic_sign_30x36_wall.obj", tiles = { "street_signs_left_turn_yield_on_green_light.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_left_turn_yield_on_green_light_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -688,13 +687,13 @@ cbox = signs_lib.make_selection_boxes(24, 30) signs_lib.register_sign("street_signs:sign_crosswalk_stop_on_red_light", { description = "R10-23: Crosswalk: stop on red light", selection_box = cbox, - mesh = "street_signs_generic_sign_24x30.obj", + mesh = "street_signs_generic_sign_24x30_wall.obj", tiles = { "street_signs_crosswalk_stop_on_red_light.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_crosswalk_stop_on_red_light_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -705,13 +704,13 @@ cbox = signs_lib.make_selection_boxes(9, 12, nil, 0, 0, -1.25) signs_lib.register_sign("street_signs:sign_ped_push_button_to_turn_on_warning_lights", { description = "R10-25: Pedestrians, push button to turn on warning lights", selection_box = cbox, - mesh = "street_signs_generic_sign_9x12.obj", + mesh = "street_signs_generic_sign_9x12_wall.obj", tiles = { "street_signs_ped_push_button_to_turn_on_warning_lights.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_ped_push_button_to_turn_on_warning_lights_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, uses_slim_pole_mount = true, @@ -722,13 +721,13 @@ cbox = signs_lib.make_selection_boxes(41, 41) signs_lib.register_sign("street_signs:sign_rr_grade_crossbuck", { description = "R15-1: Railroad grade crossing (crossbuck)", selection_box = cbox, - mesh = "street_signs_rr_grade_crossbuck.obj", + mesh = "street_signs_rr_grade_crossbuck_wall.obj", tiles = { "street_signs_rr_grade_crossbuck.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_rr_grade_crossbuck_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, allow_onpole_horizontal = true, @@ -739,13 +738,13 @@ cbox = signs_lib.make_selection_boxes(24, 12, nil, 0, 12, 0) signs_lib.register_sign("street_signs:sign_rr_exempt_r15_3p", { description = "R15-3P: Railroad \"EXEMPT\" sign (white)", selection_box = cbox, - mesh = "street_signs_generic_sign_24x12_top.obj", + mesh = "street_signs_generic_sign_24x12_top_wall.obj", tiles = { "street_signs_rr_exempt_r15_3p.png", "street_signs_sign_edge.png", }, inventory_image = "street_signs_rr_exempt_r15_3p_inv.png", - groups = groups, + groups = signs_lib.standard_steel_groups, sounds = signs_lib.standard_steel_sign_sounds, allow_onpole = true, }) diff --git a/street_signs/signs_class_w.lua b/street_signs/signs_class_w.lua index aeeaa7ae..929bb467 100644 --- a/street_signs/signs_class_w.lua +++ b/street_signs/signs_class_w.lua @@ -1,11 +1,11 @@ -- Class-W signs local S = signs_lib.gettext -local cbox = signs_lib.make_selection_boxes(36, 36, onpole) +local cbox = signs_lib.make_selection_boxes(36, 36) signs_lib.register_sign("street_signs:sign_road_turns_sharp_left", { description = "W1-1: Road turns, sharp left ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_sharp_left.png", "street_signs_sign_edge.png", @@ -20,7 +20,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_sharp_left", { signs_lib.register_sign("street_signs:sign_road_turns_sharp_right", { description = "W1-1: Road turns, sharp right ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_sharp_right.png", "street_signs_sign_edge.png", @@ -35,7 +35,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_sharp_right", { signs_lib.register_sign("street_signs:sign_road_turns_left", { description = "W1-2: Road turns left ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_left.png", "street_signs_sign_edge.png", @@ -50,7 +50,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_left", { signs_lib.register_sign("street_signs:sign_road_turns_right", { description = "W1-2: Road turns right ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_right.png", "street_signs_sign_edge.png", @@ -65,7 +65,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_right", { signs_lib.register_sign("street_signs:sign_road_turns_dog_leg_left", { description = "W1-3: Road turns, sharp dog-leg to the left ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_dog_leg_left.png", "street_signs_sign_edge.png", @@ -80,7 +80,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_dog_leg_left", { signs_lib.register_sign("street_signs:sign_road_turns_dog_leg_right", { description = "W1-3: Road turns, sharp dog-leg to the right ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_dog_leg_right.png", "street_signs_sign_edge.png", @@ -95,7 +95,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_dog_leg_right", { signs_lib.register_sign("street_signs:sign_road_turns_dog_leg_curve_left", { description = "W1-4: Road turns, dog-leg curve to the left ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_dog_leg_curve_left.png", "street_signs_sign_edge.png", @@ -110,7 +110,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_dog_leg_curve_left", { signs_lib.register_sign("street_signs:sign_road_turns_dog_leg_curve_right", { description = "W1-4: Road turns, dog-leg curve to the right ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_dog_leg_curve_right.png", "street_signs_sign_edge.png", @@ -125,7 +125,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_dog_leg_curve_right", { signs_lib.register_sign("street_signs:sign_road_winding", { description = "W1-5: Winding road ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_winding.png", "street_signs_sign_edge.png", @@ -140,7 +140,7 @@ signs_lib.register_sign("street_signs:sign_road_winding", { signs_lib.register_sign("street_signs:sign_road_turns_hairpin_left", { description = "W1-11: Road turns, hairpin curve to the left ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_hairpin_left.png", "street_signs_sign_edge.png", @@ -155,7 +155,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_hairpin_left", { signs_lib.register_sign("street_signs:sign_road_turns_hairpin_right", { description = "W1-11: Road turns, hairpin curve to the right ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_hairpin_right.png", "street_signs_sign_edge.png", @@ -170,7 +170,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_hairpin_right", { signs_lib.register_sign("street_signs:sign_road_turns_270_left", { description = "W1-15: Road turns, 270 degree loop to the left ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_270_left.png", "street_signs_sign_edge.png", @@ -185,7 +185,7 @@ signs_lib.register_sign("street_signs:sign_road_turns_270_left", { signs_lib.register_sign("street_signs:sign_road_turns_270_right", { description = "W1-15: Road turns, 270 degree loop to the right ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_road_turns_270_right.png", "street_signs_sign_edge.png", @@ -196,12 +196,13 @@ signs_lib.register_sign("street_signs:sign_road_turns_270_right", { allow_onpole = true, allow_onpole_horizontal = true, }) -cbox = signs_lib.make_selection_boxes(48, 24, onpole) + +cbox = signs_lib.make_selection_boxes(48, 24) signs_lib.register_sign("street_signs:sign_large_arrow_left", { description = "W1-6: Large arrow pointing left", selection_box = cbox, - mesh = "street_signs_generic_sign_48x24.obj", + mesh = "street_signs_generic_sign_48x24_wall.obj", tiles = { "street_signs_large_arrow_left.png", "street_signs_sign_edge.png", @@ -216,7 +217,7 @@ signs_lib.register_sign("street_signs:sign_large_arrow_left", { signs_lib.register_sign("street_signs:sign_large_arrow_right", { description = "W1-6: Large arrow pointing right", selection_box = cbox, - mesh = "street_signs_generic_sign_48x24.obj", + mesh = "street_signs_generic_sign_48x24_wall.obj", tiles = { "street_signs_large_arrow_right.png", "street_signs_sign_edge.png", @@ -231,7 +232,7 @@ signs_lib.register_sign("street_signs:sign_large_arrow_right", { signs_lib.register_sign("street_signs:sign_two_direction_large_arrow", { description = "W1-7: Two direction large arrow", selection_box = cbox, - mesh = "street_signs_generic_sign_48x24.obj", + mesh = "street_signs_generic_sign_48x24_wall.obj", tiles = { "street_signs_two_direction_large_arrow.png", "street_signs_sign_edge.png", @@ -242,12 +243,12 @@ signs_lib.register_sign("street_signs:sign_two_direction_large_arrow", { allow_onpole = true, allow_onpole_horizontal = true, }) -cbox = signs_lib.make_selection_boxes(36, 36, onpole) +cbox = signs_lib.make_selection_boxes(36, 36) signs_lib.register_sign("street_signs:sign_cross_road_ahead", { description = "W2-1: Cross-road ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_cross_road_ahead.png", "street_signs_sign_edge.png", @@ -262,7 +263,7 @@ signs_lib.register_sign("street_signs:sign_cross_road_ahead", { signs_lib.register_sign("street_signs:sign_side_road_right_ahead", { description = "W2-2: Side road ahead (right)", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_side_road_right_ahead.png", "street_signs_sign_edge.png", @@ -277,7 +278,7 @@ signs_lib.register_sign("street_signs:sign_side_road_right_ahead", { signs_lib.register_sign("street_signs:sign_side_road_left_ahead", { description = "W2-2: Side road ahead (left)", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_side_road_left_ahead.png", "street_signs_sign_edge.png", @@ -292,7 +293,7 @@ signs_lib.register_sign("street_signs:sign_side_road_left_ahead", { signs_lib.register_sign("street_signs:sign_t_junction_ahead", { description = "W2-4: \"T\" junction ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_t_junction_ahead.png", "street_signs_sign_edge.png", @@ -307,7 +308,7 @@ signs_lib.register_sign("street_signs:sign_t_junction_ahead", { signs_lib.register_sign("street_signs:sign_circular_intersection_ahead", { description = "W2-6: Roundabout/traffic circle ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_circular_intersection_ahead.png", "street_signs_sign_edge.png", @@ -322,7 +323,7 @@ signs_lib.register_sign("street_signs:sign_circular_intersection_ahead", { signs_lib.register_sign("street_signs:sign_offset_side_road_left_ahead", { description = "W2-7L: Offset side-roads ahead (left first)", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_offset_side_road_left_ahead.png", "street_signs_sign_edge.png", @@ -337,7 +338,7 @@ signs_lib.register_sign("street_signs:sign_offset_side_road_left_ahead", { signs_lib.register_sign("street_signs:sign_offset_side_road_right_ahead", { description = "W2-7R: Offset side-roads ahead (right first)", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_offset_side_road_right_ahead.png", "street_signs_sign_edge.png", @@ -352,7 +353,7 @@ signs_lib.register_sign("street_signs:sign_offset_side_road_right_ahead", { signs_lib.register_sign("street_signs:sign_stop_ahead", { description = "W3-1: Stop sign ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_stop_ahead.png", "street_signs_sign_edge.png", @@ -367,7 +368,7 @@ signs_lib.register_sign("street_signs:sign_stop_ahead", { signs_lib.register_sign("street_signs:sign_yield_ahead", { description = "W3-2: Yield sign ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_yield_ahead.png", "street_signs_sign_edge.png", @@ -382,7 +383,7 @@ signs_lib.register_sign("street_signs:sign_yield_ahead", { signs_lib.register_sign("street_signs:sign_signal_ahead", { description = "W3-3: Traffic signal ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_signal_ahead.png", "street_signs_sign_edge.png", @@ -397,7 +398,7 @@ signs_lib.register_sign("street_signs:sign_signal_ahead", { signs_lib.register_sign("street_signs:sign_merging_traffic", { description = "W4-1: Traffic merging from right sign", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_merging_traffic.png", "street_signs_sign_edge.png", @@ -412,7 +413,7 @@ signs_lib.register_sign("street_signs:sign_merging_traffic", { signs_lib.register_sign("street_signs:sign_left_lane_ends", { description = "W4-2: Left lane ends sign", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_left_lane_ends.png", "street_signs_sign_edge.png", @@ -427,7 +428,7 @@ signs_lib.register_sign("street_signs:sign_left_lane_ends", { signs_lib.register_sign("street_signs:sign_right_lane_ends", { description = "W4-2: Right lane ends sign", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_right_lane_ends.png", "street_signs_sign_edge.png", @@ -442,7 +443,7 @@ signs_lib.register_sign("street_signs:sign_right_lane_ends", { signs_lib.register_sign("street_signs:sign_divided_highway_begins", { description = "W6-1: Divided highway begins sign", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_divided_highway_begins.png", "street_signs_sign_edge.png", @@ -457,7 +458,7 @@ signs_lib.register_sign("street_signs:sign_divided_highway_begins", { signs_lib.register_sign("street_signs:sign_divided_highway_ends", { description = "W6-2: Divided highway ends sign", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_divided_highway_ends.png", "street_signs_sign_edge.png", @@ -472,7 +473,7 @@ signs_lib.register_sign("street_signs:sign_divided_highway_ends", { signs_lib.register_sign("street_signs:sign_two_way_traffic", { description = "W6-3: Two-way traffic sign", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_two_way_traffic.png", "street_signs_sign_edge.png", @@ -487,7 +488,7 @@ signs_lib.register_sign("street_signs:sign_two_way_traffic", { signs_lib.register_sign("street_signs:sign_hill_with_grade_ahead", { description = "W7-1a: Hill with grade ahead", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_hill_with_grade_ahead.png", "street_signs_sign_edge.png", @@ -504,18 +505,18 @@ signs_lib.register_sign("street_signs:sign_hill_with_grade_ahead", { y_offset = 93, chars_per_line = 15, entity_info = { - mesh = "street_signs_warning_36x36_entity.obj", + mesh = "street_signs_warning_36x36_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_onpole = true, allow_onpole_horizontal = true, }) -cbox = signs_lib.make_selection_boxes(24, 18, onpole, 0, 9.75, 0) +cbox = signs_lib.make_selection_boxes(24, 18, nil, 0, 9.75, 0) signs_lib.register_sign("street_signs:sign_distance_2_lines", { description = "W7-3aP: Blank distance sign (like \"Next X Miles\", 2 lines, yellow)", selection_box = cbox, - mesh = "street_signs_generic_sign_24x18_top.obj", + mesh = "street_signs_generic_sign_24x18_top_wall.obj", tiles = { "street_signs_distance_2_lines.png", "street_signs_sign_edge.png", @@ -532,7 +533,7 @@ signs_lib.register_sign("street_signs:sign_distance_2_lines", { y_offset = 12, chars_per_line = 20, entity_info = { - mesh = "street_signs_generic_sign_24x18_top_entity.obj", + mesh = "street_signs_generic_sign_24x18_top_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, @@ -542,7 +543,7 @@ signs_lib.register_sign("street_signs:sign_distance_2_lines", { signs_lib.register_sign("street_signs:sign_distance_2_lines_orange", { description = "W7-3aP: Blank distance sign (like \"Next X Miles\", 2 lines, orange)", selection_box = cbox, - mesh = "street_signs_generic_sign_24x18_top.obj", + mesh = "street_signs_generic_sign_24x18_top_wall.obj", tiles = { "street_signs_distance_2_lines_orange.png", "street_signs_sign_edge.png", @@ -559,19 +560,19 @@ signs_lib.register_sign("street_signs:sign_distance_2_lines_orange", { y_offset = 12, chars_per_line = 20, entity_info = { - mesh = "street_signs_generic_sign_24x18_top_entity.obj", + mesh = "street_signs_generic_sign_24x18_top_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, allow_onpole = true, }) -cbox = signs_lib.make_selection_boxes(30, 30, onpole) +cbox = signs_lib.make_selection_boxes(30, 30) signs_lib.register_sign("street_signs:sign_rr_grade_crossing_advance", { description = "W10-1: Railroad grade crossing advance warning", selection_box = cbox, - mesh = "street_signs_generic_sign_30dia.obj", + mesh = "street_signs_generic_sign_30dia_wall.obj", tiles = { "street_signs_rr_grade_crossing_advance.png", "street_signs_sign_edge.png", @@ -583,12 +584,12 @@ signs_lib.register_sign("street_signs:sign_rr_grade_crossing_advance", { allow_onpole_horizontal = true, }) -cbox = signs_lib.make_selection_boxes(24, 12, onpole, 0, 12, 0) +cbox = signs_lib.make_selection_boxes(24, 12, nil, 0, 12, 0) signs_lib.register_sign("street_signs:sign_rr_exempt_w10_1ap", { description = "W10-1aP: Railroad \"EXEMPT\" sign (yellow)", selection_box = cbox, - mesh = "street_signs_generic_sign_24x12_top.obj", + mesh = "street_signs_generic_sign_24x12_top_wall.obj", tiles = { "street_signs_rr_exempt_w10_1ap.png", "street_signs_sign_edge.png", @@ -599,12 +600,12 @@ signs_lib.register_sign("street_signs:sign_rr_exempt_w10_1ap", { allow_onpole = true, }) -cbox = signs_lib.make_selection_boxes(36, 36, onpole) +cbox = signs_lib.make_selection_boxes(36, 36) signs_lib.register_sign("street_signs:sign_pedestrian_crossing", { description = "W11-2: Pedestrian crossing sign", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_pedestrian_crossing.png", "street_signs_sign_edge.png", @@ -619,7 +620,7 @@ signs_lib.register_sign("street_signs:sign_pedestrian_crossing", { signs_lib.register_sign("street_signs:sign_low_clearance", { description = "W12-2: Low clearance", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_low_clearance.png", "street_signs_sign_edge.png", @@ -636,7 +637,7 @@ signs_lib.register_sign("street_signs:sign_low_clearance", { y_offset = 36, chars_per_line = 15, entity_info = { - mesh = "street_signs_warning_36x36_entity.obj", + mesh = "street_signs_warning_36x36_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, @@ -644,12 +645,12 @@ signs_lib.register_sign("street_signs:sign_low_clearance", { allow_onpole_horizontal = true, }) -cbox = signs_lib.make_selection_boxes(18, 18, onpole, 0, 10, 0) +cbox = signs_lib.make_selection_boxes(18, 18, nil, 0, 10, 0) signs_lib.register_sign("street_signs:sign_advisory_speed_mph", { description = "W13-1P: Advisory speed (MPH)", selection_box = cbox, - mesh = "street_signs_generic_sign_18x18_top.obj", + mesh = "street_signs_generic_sign_18x18_top_wall.obj", tiles = { "street_signs_advisory_speed_mph.png", "street_signs_sign_edge.png", @@ -666,7 +667,7 @@ signs_lib.register_sign("street_signs:sign_advisory_speed_mph", { y_offset = 5, chars_per_line = 8, entity_info = { - mesh = "street_signs_generic_sign_18x18_top_entity.obj", + mesh = "street_signs_generic_sign_18x18_top_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, @@ -676,7 +677,7 @@ signs_lib.register_sign("street_signs:sign_advisory_speed_mph", { signs_lib.register_sign("street_signs:sign_advisory_speed_kmh", { description = "W13-1P: Advisory speed (km/h)", selection_box = cbox, - mesh = "street_signs_generic_sign_18x18_top.obj", + mesh = "street_signs_generic_sign_18x18_top_wall.obj", tiles = { "street_signs_advisory_speed_kmh.png", "street_signs_sign_edge.png", @@ -693,7 +694,7 @@ signs_lib.register_sign("street_signs:sign_advisory_speed_kmh", { y_offset = 5, chars_per_line = 8, entity_info = { - mesh = "street_signs_generic_sign_18x18_top_entity.obj", + mesh = "street_signs_generic_sign_18x18_top_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, @@ -703,7 +704,7 @@ signs_lib.register_sign("street_signs:sign_advisory_speed_kmh", { signs_lib.register_sign("street_signs:sign_advisory_speed_ms", { description = "W13-1P: Advisory speed (m/s)", selection_box = cbox, - mesh = "street_signs_generic_sign_18x18_top.obj", + mesh = "street_signs_generic_sign_18x18_top_wall.obj", tiles = { "street_signs_advisory_speed_ms.png", "street_signs_sign_edge.png", @@ -720,7 +721,7 @@ signs_lib.register_sign("street_signs:sign_advisory_speed_ms", { y_offset = 5, chars_per_line = 8, entity_info = { - mesh = "street_signs_generic_sign_18x18_top_entity.obj", + mesh = "street_signs_generic_sign_18x18_top_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, diff --git a/street_signs/signs_misc_generic.lua b/street_signs/signs_misc_generic.lua index 1bdb6c2b..04dddd4c 100644 --- a/street_signs/signs_misc_generic.lua +++ b/street_signs/signs_misc_generic.lua @@ -2,13 +2,10 @@ local S = signs_lib.gettext local cbox = signs_lib.make_selection_boxes(36, 36) -local sgroups = table.copy(signs_lib.standard_steel_groups) -sgroups.not_in_creative_inventory = 1 - signs_lib.register_sign("street_signs:sign_warning_3_line", { description = "W3-4: Generic US diamond \"warning\" sign (3-line, yellow)", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_warning.png", "street_signs_sign_edge.png", @@ -25,7 +22,7 @@ signs_lib.register_sign("street_signs:sign_warning_3_line", { y_offset = 19, chars_per_line = 15, entity_info = { - mesh = "street_signs_warning_36x36_entity.obj", + mesh = "street_signs_warning_36x36_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, drop = "street_signs:sign_warning_3_line", @@ -38,7 +35,7 @@ signs_lib.register_sign("street_signs:sign_warning_3_line", { signs_lib.register_sign("street_signs:sign_warning_4_line", { description = "W23-2: Generic US diamond \"warning\" sign (4-line, yellow)", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_warning.png", "street_signs_sign_edge.png", @@ -55,7 +52,7 @@ signs_lib.register_sign("street_signs:sign_warning_4_line", { y_offset = 25, chars_per_line = 15, entity_info = { - mesh = "street_signs_warning_36x36_entity.obj", + mesh = "street_signs_warning_36x36_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, drop = "street_signs:sign_warning_4_line", @@ -67,7 +64,7 @@ signs_lib.register_sign("street_signs:sign_warning_4_line", { signs_lib.register_sign("street_signs:sign_warning_orange_3_line", { description = "W3-4: Generic US diamond \"warning\" sign (3-line, orange)", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_warning_orange.png", "street_signs_sign_edge.png", @@ -84,7 +81,7 @@ signs_lib.register_sign("street_signs:sign_warning_orange_3_line", { y_offset = 19, chars_per_line = 15, entity_info = { - mesh = "street_signs_warning_36x36_entity.obj", + mesh = "street_signs_warning_36x36_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, drop = "street_signs:sign_warning_orange_3_line", @@ -96,7 +93,7 @@ signs_lib.register_sign("street_signs:sign_warning_orange_3_line", { signs_lib.register_sign("street_signs:sign_warning_orange_4_line", { description = "W23-2: Generic US diamond \"warning\" sign (4-line, orange)", selection_box = cbox, - mesh = "street_signs_warning_36x36.obj", + mesh = "street_signs_warning_36x36_wall.obj", tiles = { "street_signs_warning_orange.png", "street_signs_sign_edge.png", @@ -113,7 +110,7 @@ signs_lib.register_sign("street_signs:sign_warning_orange_4_line", { y_offset = 25, chars_per_line = 15, entity_info = { - mesh = "street_signs_warning_36x36_entity.obj", + mesh = "street_signs_warning_36x36_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, drop = "street_signs:sign_warning_orange_4_line", @@ -144,7 +141,7 @@ for _, s in ipairs(street_signs.big_sign_sizes) do description = "Generic highway sign ("..nlines.."-line, "..size..", "..color..")", inventory_image = "street_signs_generic_highway_"..size.."_"..color.."_inv.png", selection_box = cbox, - mesh = "street_signs_generic_highway_"..size..".obj", + mesh = "street_signs_generic_highway_"..size.."_wall.obj", tiles = { "street_signs_generic_highway_"..size.."_"..color..".png", "street_signs_generic_highway_edges.png" @@ -161,7 +158,7 @@ for _, s in ipairs(street_signs.big_sign_sizes) do x_offset = xoffs, y_offset = yoffs, entity_info = { - mesh = "street_signs_generic_highway_"..size.."_entity.obj", + mesh = "street_signs_generic_highway_"..size.."_entity_wall.obj", yaw = signs_lib.wallmounted_yaw }, allow_widefont = true, diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua index d11eb9dc..4e067daa 100644 --- a/worldedit_commands/init.lua +++ b/worldedit_commands/init.lua @@ -37,6 +37,33 @@ function worldedit.player_notify(name, message) minetest.chat_send_player(name, "WorldEdit -!- " .. message, false) end +-- https://github.com/minetest/minetest/blob/53dd7819277c53954d1298dfffa5287c306db8d0/src/util/string.cpp#L777 +local function strip_translation_escapes(input) + local s = function(idx) return input:sub(idx, idx) end + local out = "" + local i = 1 + while i <= #input do + if s(i) == "\027" then -- escape sequence + i = i + 1 + if s(i) == "(" then -- enclosed + i = i + 1 + while i <= #input and s(i) ~= ")" do + if s(i) == "\\" then + i = i + 2 + else + i = i + 1 + end + end + end + else + out = out .. s(i) + end + i = i + 1 + end + --print(("%q -> %q"):format(input, out)) + return out +end + local function string_endswith(full, part) return full:find(part, 1, true) == #full - #part + 1 end @@ -57,7 +84,7 @@ worldedit.normalize_nodename = function(nodename) end nodename = nodename:lower() -- lowercase both for case insensitive comparison for key, value in pairs(minetest.registered_nodes) do - local desc = value.description:lower() + local desc = strip_translation_escapes(value.description):lower() if desc == nodename then -- matches description return key end diff --git a/worldedit_commands/wand.lua b/worldedit_commands/wand.lua index c93fa9c3..fccc8636 100644 --- a/worldedit_commands/wand.lua +++ b/worldedit_commands/wand.lua @@ -6,26 +6,53 @@ local function above_or_under(placer, pointed_thing) end end +local punched_air_time = {} + minetest.register_tool(":worldedit:wand", { - description = "WorldEdit Wand tool, Left-click to set 1st position, right-click to set 2nd", + description = "WorldEdit Wand tool\nLeft-click to set 1st position, right-click to set 2nd", inventory_image = "worldedit_wand.png", stack_max = 1, -- there is no need to have more than one liquids_pointable = true, -- ground with only water on can be selected as well on_use = function(itemstack, placer, pointed_thing) - if placer ~= nil and pointed_thing ~= nil and pointed_thing.type == "node" then - local name = placer:get_player_name() + if placer == nil or pointed_thing == nil then return itemstack end + local name = placer:get_player_name() + if pointed_thing.type == "node" then + -- set and mark pos1 worldedit.pos1[name] = above_or_under(placer, pointed_thing) worldedit.mark_pos1(name) + elseif pointed_thing.type == "nothing" then + local now = minetest.get_us_time() + if now - (punched_air_time[name] or 0) < 1000 * 1000 then + -- reset markers + minetest.registered_chatcommands["/reset"].func(name, "") + end + punched_air_time[name] = now + elseif pointed_thing.type == "object" then + local entity = pointed_thing.ref:get_luaentity() + if entity and entity.name == "worldedit:pos2" then + -- set pos1 = pos2 + worldedit.pos1[name] = worldedit.pos2[name] + worldedit.mark_pos1(name) + end end return itemstack -- nothing consumed, nothing changed end, - on_place = function(itemstack, placer, pointed_thing) -- Left Click - if placer ~= nil and pointed_thing ~= nil and pointed_thing.type == "node" then - local name = placer:get_player_name() + on_place = function(itemstack, placer, pointed_thing) + if placer == nil or pointed_thing == nil then return itemstack end + local name = placer:get_player_name() + if pointed_thing.type == "node" then + -- set and mark pos2 worldedit.pos2[name] = above_or_under(placer, pointed_thing) worldedit.mark_pos2(name) + elseif pointed_thing.type == "object" then + local entity = pointed_thing.ref:get_luaentity() + if entity and entity.name == "worldedit:pos1" then + -- set pos2 = pos1 + worldedit.pos2[name] = worldedit.pos1[name] + worldedit.mark_pos2(name) + end end return itemstack -- nothing consumed, nothing changed end, diff --git a/worldedit_gui/functionality.lua b/worldedit_gui/functionality.lua index 912fd599..7c9d5879 100644 --- a/worldedit_gui/functionality.lua +++ b/worldedit_gui/functionality.lua @@ -52,8 +52,13 @@ end -- display node (or unknown_node image otherwise) at specified pos in formspec local formspec_node = function(pos, nodename) - return nodename and string.format("item_image[%s;1,1;%s]", pos, nodename) - or string.format("image[%s;1,1;worldedit_gui_unknown.png]", pos) + if nodename then + local ndef = minetest.registered_nodes[nodename] or {} + return string.format("item_image[%s;1,1;%s]", pos, nodename) .. + string.format("tooltip[%s;1,1;%s]", pos, minetest.formspec_escape(ndef.description)) + else + return string.format("image[%s;1,1;worldedit_gui_unknown.png]", pos) + end end -- two further priv helpers @@ -173,6 +178,7 @@ worldedit.register_gui_function("worldedit_gui_set", { local nodename = worldedit.normalize_nodename(node) return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_set") .. string.format("field[0.5,1.5;4,0.8;worldedit_gui_set_node;Name;%s]", minetest.formspec_escape(node)) .. + "field_close_on_enter[worldedit_gui_set_node;false]" .. "button[4,1.18;1.5,0.8;worldedit_gui_set_search;Search]" .. formspec_node("5.5,1.1", nodename) .. "button_exit[0,2.5;3,0.8;worldedit_gui_set_submit;Set Nodes]" @@ -180,18 +186,20 @@ worldedit.register_gui_function("worldedit_gui_set", { }) worldedit.register_gui_handler("worldedit_gui_set", function(name, fields) - if fields.worldedit_gui_set_search or fields.worldedit_gui_set_submit then + local ret = false + if fields.worldedit_gui_set_search or fields.key_enter_field == "worldedit_gui_set_node" then gui_nodename1[name] = tostring(fields.worldedit_gui_set_node) worldedit.show_page(name, "worldedit_gui_set") - if fields.worldedit_gui_set_submit then - local n = worldedit.normalize_nodename(gui_nodename1[name]) - if n then - minetest.chatcommands["/set"].func(name, n) - end + ret = true -- fallthrough + end + if fields.worldedit_gui_set_submit then + local n = worldedit.normalize_nodename(gui_nodename1[name]) + if n then + minetest.chatcommands["/set"].func(name, n) end return true end - return false + return ret end) worldedit.register_gui_function("worldedit_gui_replace", { @@ -202,9 +210,11 @@ worldedit.register_gui_function("worldedit_gui_replace", { local search_nodename, replace_nodename = worldedit.normalize_nodename(search), worldedit.normalize_nodename(replace) return "size[6.5,4]" .. worldedit.get_formspec_header("worldedit_gui_replace") .. string.format("field[0.5,1.5;4,0.8;worldedit_gui_replace_search;Name;%s]", minetest.formspec_escape(search)) .. + "field_close_on_enter[worldedit_gui_replace_search;false]" .. "button[4,1.18;1.5,0.8;worldedit_gui_replace_search_search;Search]" .. formspec_node("5.5,1.1", search_nodename) .. string.format("field[0.5,2.5;4,0.8;worldedit_gui_replace_replace;Name;%s]", minetest.formspec_escape(replace)) .. + "field_close_on_enter[worldedit_gui_replace_replace;false]" .. "button[4,2.18;1.5,0.8;worldedit_gui_replace_replace_search;Search]" .. formspec_node("5.5,2.1", replace_nodename) .. "button_exit[0,3.5;3,0.8;worldedit_gui_replace_submit;Replace Nodes]" .. @@ -213,28 +223,28 @@ worldedit.register_gui_function("worldedit_gui_replace", { }) worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields) + local ret = false if fields.worldedit_gui_replace_search_search or fields.worldedit_gui_replace_replace_search - or fields.worldedit_gui_replace_submit or fields.worldedit_gui_replace_submit_inverse then + or table.indexof({"worldedit_gui_replace_search", "worldedit_gui_replace_replace"}, fields.key_enter_field) ~= -1 then gui_nodename1[name] = tostring(fields.worldedit_gui_replace_search) gui_nodename2[name] = tostring(fields.worldedit_gui_replace_replace) worldedit.show_page(name, "worldedit_gui_replace") - local submit = nil - if fields.worldedit_gui_replace_submit then - submit = "replace" - elseif fields.worldedit_gui_replace_submit_inverse then + ret = true -- fallthrough + end + if fields.worldedit_gui_replace_submit or fields.worldedit_gui_replace_submit_inverse then + local submit = "replace" + if fields.worldedit_gui_replace_submit_inverse then submit = "replaceinverse" end - if submit then - local n1 = worldedit.normalize_nodename(gui_nodename1[name]) - local n2 = worldedit.normalize_nodename(gui_nodename2[name]) - if n1 and n2 then - minetest.chatcommands["/"..submit].func(name, string.format("%s %s", n1, n2)) - end + local n1 = worldedit.normalize_nodename(gui_nodename1[name]) + local n2 = worldedit.normalize_nodename(gui_nodename2[name]) + if n1 and n2 then + minetest.chatcommands["/"..submit].func(name, string.format("%s %s", n1, n2)) end return true end - return false + return ret end) worldedit.register_gui_function("worldedit_gui_sphere_dome", {