diff options
Diffstat (limited to 'lrfurn')
| -rw-r--r-- | lrfurn/armchairs.lua | 133 | ||||
| -rw-r--r-- | lrfurn/coffeetable.lua | 12 | ||||
| -rw-r--r-- | lrfurn/depends.txt | 2 | ||||
| -rw-r--r-- | lrfurn/endtable.lua | 7 | ||||
| -rw-r--r-- | lrfurn/init.lua | 44 | ||||
| -rw-r--r-- | lrfurn/longsofas.lua | 179 | ||||
| -rw-r--r-- | lrfurn/models/lrfurn_armchair.obj | 478 | ||||
| -rw-r--r-- | lrfurn/models/lrfurn_sofa_long.obj | 544 | ||||
| -rw-r--r-- | lrfurn/models/lrfurn_sofa_short.obj | 440 | ||||
| -rw-r--r-- | lrfurn/sofas.lua | 178 | ||||
| -rw-r--r-- | lrfurn/textures/lrfurn_armchair_inv.png | bin | 0 -> 6841 bytes | |||
| -rw-r--r-- | lrfurn/textures/lrfurn_longsofa_inv.png | bin | 0 -> 4423 bytes | |||
| -rw-r--r-- | lrfurn/textures/lrfurn_sofa_inv.png | bin | 0 -> 5297 bytes | |||
| -rw-r--r-- | lrfurn/textures/lrfurn_upholstery.png | bin | 0 -> 2309 bytes |
14 files changed, 1089 insertions, 928 deletions
diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua index f3b8225..fc9d096 100644 --- a/lrfurn/armchairs.lua +++ b/lrfurn/armchairs.lua @@ -1,30 +1,36 @@ +local S = homedecor_i18n.gettext local armchair_cbox = { type = "fixed", - fixed = { + fixed = { {-0.5, -0.5, -0.5, 0.5, 0, 0.5 }, {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5 } } } -for i in ipairs(lrfurn.colors) do - local colour = lrfurn.colors[i][1] - local hue = lrfurn.colors[i][2] - - minetest.register_node("lrfurn:armchair_"..colour, { - description = "Armchair ("..colour..")", - drawtype = "mesh", - mesh = "lrfurn_armchair.obj", - tiles = { - "lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png", - "lrfurn_sofa_bottom.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - node_box = armchair_cbox, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) +minetest.register_node("lrfurn:armchair", { + description = S("Armchair"), + drawtype = "mesh", + mesh = "lrfurn_armchair.obj", + tiles = { + "lrfurn_upholstery.png", + { name = "lrfurn_sofa_bottom.png", color = 0xffffffff } + }, + paramtype = "light", + paramtype2 = "colorwallmounted", + palette = "unifieddyes_palette_colorwallmounted.png", + inventory_image = "lrfurn_armchair_inv.png", + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + node_box = armchair_cbox, + after_place_node = lrfurn.fix_rotation, + after_dig_node = unifieddyes.after_dig_node, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + local itemname = itemstack:get_name() + if string.find(itemname, "dye:") or string.find(itemname, "unifieddyes:") then + unifieddyes.on_rightclick(pos, node, clicker, + itemstack, pointed_thing, "lrfurn:armchair", "wallmounted") + else if not clicker:is_player() then return itemstack end @@ -33,28 +39,77 @@ for i in ipairs(lrfurn.colors) do clicker:set_hp(20) return itemstack end - }) - - minetest.register_craft({ - output = "lrfurn:armchair_"..colour, - recipe = { - {"wool:"..colour, "", "", }, - {"stairs:slab_wood", "", "", }, - {"group:stick", "", "", } - } - }) - - minetest.register_craft({ - output = "lrfurn:armchair_"..colour, - recipe = { - {"wool:"..colour, "", "", }, - {"moreblocks:slab_wood", "", "", }, - {"group:stick", "", "", } - } - }) + end +}) +minetest.register_craft({ + output = "lrfurn:armchair", + recipe = { + {"wool:white", "", "", }, + {"stairs:slab_wood", "", "", }, + {"group:stick", "", "", } + } +}) + +minetest.register_craft({ + output = "lrfurn:armchair", + recipe = { + {"wool:white", "", "", }, + {"moreblocks:slab_wood", "", "", }, + {"group:stick", "", "", } + } +}) + +-- convert old static nodes to param2 color + +lrfurn.old_static_armchairs = {} + +for _, color in ipairs(lrfurn.colors) do + table.insert(lrfurn.old_static_armchairs, "lrfurn:armchair_"..color) + print("lrfurn:armchair_"..color) end +minetest.register_lbm({ + name = "lrfurn:convert_armchairs", + label = "Convert lrfurn armchairs to use param2 color", + run_at_every_load = true, + nodenames = lrfurn.old_static_armchairs, + action = function(pos, node) + local name = node.name + local color = string.sub(name, string.find(name, "_")+1) + + if color == "red" then + color = "medium_red" + elseif color == "dark_green" then + color = "medium_green" + elseif color == "magenta" then + color = "medium_magenta" + elseif color == "cyan" then + color = "medium_cyan" + end + + local paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted") + local old_fdir = math.floor(node.param2 % 32) + local new_fdir = 3 + + if old_fdir == 0 then + new_fdir = 3 + elseif old_fdir == 1 then + new_fdir = 4 + elseif old_fdir == 2 then + new_fdir = 2 + elseif old_fdir == 3 then + new_fdir = 5 + end + + local param2 = paletteidx + new_fdir + + minetest.set_node(pos, { name = "lrfurn:armchair", param2 = param2 }) + local meta = minetest.get_meta(pos) + meta:set_string("dye", "unifieddyes:"..color) + end +}) + if minetest.setting_get("log_mods") then - minetest.log("action", "armchairs loaded") + minetest.log("action", "[lrfurn/armchairs] "..S("Loaded!")) end diff --git a/lrfurn/coffeetable.lua b/lrfurn/coffeetable.lua index 7f7afaa..506a5bf 100644 --- a/lrfurn/coffeetable.lua +++ b/lrfurn/coffeetable.lua @@ -1,5 +1,8 @@ + +local S = homedecor_i18n.gettext + minetest.register_node("lrfurn:coffeetable_back", { - description = "Coffee Table", + description = S("Coffee Table"), drawtype = "nodebox", tiles = {"lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png"}, paramtype = "light", @@ -45,7 +48,8 @@ minetest.register_node("lrfurn:coffeetable_back", { end minetest.set_node(pos, node) else - minetest.chat_send_player(placer:get_player_name(), "No room to place the coffee table!") + minetest.chat_send_player(placer:get_player_name(), + S("No room to place the coffee table!")) minetest.set_node(pos, {name = "air"}) return true end @@ -68,7 +72,7 @@ minetest.register_node("lrfurn:coffeetable_back", { if minetest.is_protected(pos, digger:get_player_name()) then return true end - if (minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).name == "lrfurn:coffeetable_front") + if (minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).name == "lrfurn:coffeetable_front") and (minetest.get_node({x=pos.x, y=pos.y, z=pos.z}).param2 == param2) then minetest.remove_node(pos) end @@ -122,5 +126,5 @@ minetest.register_craft({ }) if minetest.setting_get("log_mods") then - minetest.log("action", "coffeetable loaded") + minetest.log("action", "[lrfurn/coffeetable] "..S("Loaded!")) end diff --git a/lrfurn/depends.txt b/lrfurn/depends.txt index 470ec30..973de17 100644 --- a/lrfurn/depends.txt +++ b/lrfurn/depends.txt @@ -1,2 +1,4 @@ default wool +homedecor_i18n +unifieddyes diff --git a/lrfurn/endtable.lua b/lrfurn/endtable.lua index fa3940a..b94da3b 100644 --- a/lrfurn/endtable.lua +++ b/lrfurn/endtable.lua @@ -1,5 +1,8 @@ + +local S = homedecor_i18n.gettext + minetest.register_node("lrfurn:endtable", { - description = "End Table", + description = S("End Table"), drawtype = "nodebox", tiles = {"lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png"}, paramtype = "light", @@ -46,5 +49,5 @@ minetest.register_craft({ }) if minetest.setting_get("log_mods") then - minetest.log("action", "endtable loaded") + minetest.log("action", "[lrfurn/endtable] "..S("Loaded!")) end diff --git a/lrfurn/init.lua b/lrfurn/init.lua index 64e2ab9..6434136 100644 --- a/lrfurn/init.lua +++ b/lrfurn/init.lua @@ -1,3 +1,6 @@ + +local S = homedecor_i18n.gettext + lrfurn = {} screwdriver = screwdriver or {} @@ -8,22 +11,22 @@ lrfurn.fdir_to_fwd = { { -1, 0 }, } -lrfurn.colors = { -- mod changed to use colorize feature of minetest engine (cg72) - { "black", "#000000:230" }, - { "brown", "#251005:225" }, - { "blue", "#0000d0:225" }, - { "cyan", "#009fa7:250" }, - { "dark_grey", "#101010:175" }, - { "dark_green", "#007000:230" }, - { "green", "#00d000:250" }, - { "grey", "#101010:100" }, - { "magenta", "#e0048b:250" }, - { "orange", "#ee9000:240" }, - { "pink", "#ff90b0:250" }, - { "red", "#800000:240" }, - { "violet", "#9000d0:250" }, - { "white", "#000000:000" }, - { "yellow", "#dde000:240" } +lrfurn.colors = { + "black", + "brown", + "blue", + "cyan", + "dark_grey", + "dark_green", + "green", + "grey", + "magenta", + "orange", + "pink", + "red", + "violet", + "white", + "yellow", } function lrfurn.check_forward(pos, fdir, long, placer) @@ -57,6 +60,15 @@ function lrfurn.check_forward(pos, fdir, long, placer) return true end +function lrfurn.fix_rotation(pos, placer, itemstack, pointed_thing) + local node = minetest.get_node(pos) + local yaw = placer:get_look_yaw() + local dir = minetest.yaw_to_dir(yaw) + local fdir = minetest.dir_to_wallmounted(dir) + + minetest.swap_node(pos, { name = node.name, param2 = fdir }) +end + dofile(minetest.get_modpath("lrfurn").."/longsofas.lua") dofile(minetest.get_modpath("lrfurn").."/sofas.lua") dofile(minetest.get_modpath("lrfurn").."/armchairs.lua") diff --git a/lrfurn/longsofas.lua b/lrfurn/longsofas.lua index a1721a9..b741aa9 100644 --- a/lrfurn/longsofas.lua +++ b/lrfurn/longsofas.lua @@ -1,86 +1,129 @@ -local longsofa_sbox = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 2.5} -} +local S = homedecor_i18n.gettext local longsofa_cbox = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0, 2.5 }, - {-0.5, -0.5, 0.5, -0.4, 0.5, 2.5 } - } + type = "wallmounted", + wall_side = {-0.5, -0.5, -0.5, 0.5, 0.5, 2.5}, } -for i in ipairs(lrfurn.colors) do - local colour = lrfurn.colors[i][1] - local hue = lrfurn.colors[i][2] - - minetest.register_node("lrfurn:longsofa_"..colour, { - description = "Long Sofa ("..colour..")", - drawtype = "mesh", - mesh = "lrfurn_sofa_long.obj", - tiles = { - "lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png", - "lrfurn_sofa_bottom.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - selection_box = longsofa_sbox, - node_box = longsofa_cbox, - on_rotate = screwdriver.disallow, - - after_place_node = function(pos, placer, itemstack, pointed_thing) - if minetest.is_protected(pos, placer:get_player_name()) then return true end - - local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) - - if lrfurn.check_forward(pos, fdir, true, placer) then - minetest.set_node(pos, {name = "lrfurn:longsofa_"..colour, param2 = fdir}) - itemstack:take_item() - else - minetest.chat_send_player(placer:get_player_name(), "No room to place the sofa!") - minetest.set_node(pos, { name = "air" }) - end - return itemstack - end, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) +minetest.register_node("lrfurn:longsofa", { + description = S("Long Sofa"), + drawtype = "mesh", + mesh = "lrfurn_sofa_long.obj", + tiles = { + "lrfurn_upholstery.png", + { name = "lrfurn_sofa_bottom.png", color = 0xffffffff } + }, + paramtype = "light", + paramtype2 = "colorwallmounted", + palette = "unifieddyes_palette_colorwallmounted.png", + inventory_image = "lrfurn_longsofa_inv.png", + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = longsofa_cbox, + node_box = longsofa_cbox, + on_rotate = screwdriver.disallow, + after_place_node = function(pos, placer, itemstack, pointed_thing) + lrfurn.fix_rotation(pos, placer, itemstack, pointed_thing) + if minetest.is_protected(pos, placer:get_player_name()) then return true end + + local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) + + if lrfurn.check_forward(pos, fdir, true, placer) then + itemstack:take_item() + else + minetest.chat_send_player(placer:get_player_name(), S("No room to place the sofa!")) + minetest.set_node(pos, { name = "air" }) + end + return itemstack + end, + after_dig_node = unifieddyes.after_dig_node, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + local itemname = itemstack:get_name() + if string.find(itemname, "dye:") or string.find(itemname, "unifieddyes:") then + unifieddyes.on_rightclick(pos, node, clicker, + itemstack, pointed_thing, "lrfurn:longsofa", "wallmounted") + else if not clicker:is_player() then return itemstack end + pos.y = pos.y-0.5 clicker:setpos(pos) clicker:set_hp(20) return itemstack end - }) - - minetest.register_alias("lrfurn:longsofa_left_"..colour, "air") - minetest.register_alias("lrfurn:longsofa_middle_"..colour, "air") - minetest.register_alias("lrfurn:longsofa_right_"..colour, "lrfurn:longsofa_"..colour) - - minetest.register_craft({ - output = "lrfurn:longsofa_"..colour, - recipe = { - {"wool:"..colour, "wool:"..colour, "wool:"..colour, }, - {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood", }, - {"group:stick", "group:stick", "group:stick", } - } - }) - - minetest.register_craft({ - output = "lrfurn:longsofa_"..colour, - recipe = { - {"wool:"..colour, "wool:"..colour, "wool:"..colour, }, - {"moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood", }, - {"group:stick", "group:stick", "group:stick", } - } - }) + end +}) + +minetest.register_craft({ + output = "lrfurn:longsofa", + recipe = { + {"wool:white", "wool:white", "wool:white", }, + {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood", }, + {"group:stick", "group:stick", "group:stick", } + } +}) + +minetest.register_craft({ + output = "lrfurn:longsofa", + recipe = { + {"wool:white", "wool:white", "wool:white", }, + {"moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood", }, + {"group:stick", "group:stick", "group:stick", } + } +}) +-- convert old static nodes to param2 colorization + +lrfurn.old_static_longsofas = {} + +for _, color in ipairs(lrfurn.colors) do + table.insert(lrfurn.old_static_longsofas, "lrfurn:longsofa_"..color) end +minetest.register_lbm({ + name = "lrfurn:convert_longsofas", + label = "Convert lrfurn long sofas to use param2 color", + run_at_every_load = true, + nodenames = lrfurn.old_static_longsofas, + action = function(pos, node) + local name = node.name + local color = string.sub(name, string.find(name, "_")+1) + + if color == "red" then + color = "medium_red" + elseif color == "dark_green" then + color = "medium_green" + elseif color == "magenta" then + color = "medium_magenta" + elseif color == "cyan" then + color = "medium_cyan" + end + + local paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted") + local old_fdir = math.floor(node.param2 % 32) + local new_fdir = 3 + + if old_fdir == 0 then + new_fdir = 3 + elseif old_fdir == 1 then + new_fdir = 4 + elseif old_fdir == 2 then + new_fdir = 2 + elseif old_fdir == 3 then + new_fdir = 5 + end + + local param2 = paletteidx + new_fdir + + minetest.set_node(pos, { name = "lrfurn:longsofa", param2 = param2 }) + local meta = minetest.get_meta(pos) + meta:set_string("dye", "unifieddyes:"..color) + + end +}) + if minetest.setting_get("log_mods") then - minetest.log("action", "long sofas loaded") + minetest.log("action", "[lrfurn/longsofas] "..S("Loaded!")) end diff --git a/lrfurn/models/lrfurn_armchair.obj b/lrfurn/models/lrfurn_armchair.obj index 78a85c2..1ad653e 100644 --- a/lrfurn/models/lrfurn_armchair.obj +++ b/lrfurn/models/lrfurn_armchair.obj @@ -1,153 +1,153 @@ -# Blender v2.73 (sub 0) OBJ File: 'lrfurn-armchair.blend' +# Blender v2.72 (sub 0) OBJ File: 'lrfurn-armchair.blend' # www.blender.org o Cylinder -v 0.464844 0.234375 0.312500 -v -0.500000 0.460938 0.464844 -v -0.312500 0.187500 -0.437500 -v 0.500000 0.421875 0.316406 -v 0.500000 0.421875 0.496094 -v 0.312500 -0.078125 0.312500 -v 0.312500 -0.078125 -0.500000 -v 0.496094 0.187500 -0.500000 -v 0.500000 0.187500 0.312500 -v 0.312500 0.187500 0.312500 -v 0.316406 0.187500 -0.500000 -v -0.500000 0.460938 0.347656 -v -0.500000 0.476562 0.406250 -v -0.312500 -0.062500 0.250000 -v -0.347656 0.234375 0.312500 -v -0.437500 0.437500 0.500000 -v -0.437500 0.437500 0.312500 -v -0.312500 -0.078125 0.312500 -v 0.464844 0.218750 -0.500000 -v 0.347656 0.234375 0.312500 -v 0.347656 0.218750 -0.500000 -v -0.312500 -0.062500 -0.437500 -v 0.406250 0.234375 -0.500000 -v 0.406250 0.250000 0.312500 -v 0.500000 0.476562 0.406250 -v -0.437500 0.500000 0.406250 -v 0.500000 0.460938 0.464844 -v -0.437500 0.484375 0.347656 -v 0.500000 0.460938 0.347656 -v -0.437500 0.484375 0.464844 -v 0.000000 -0.039062 0.312500 -v -0.000000 -0.039062 -0.500000 -v -0.312500 -0.078125 -0.500000 -v -0.347656 0.218750 -0.500000 -v 0.250000 -0.046875 -0.500000 -v 0.250000 -0.046875 0.312500 -v -0.000000 0.000000 -0.437500 -v 0.312500 -0.062500 -0.437500 -v 0.250000 -0.015625 -0.437500 -v 0.000000 0.000000 0.250000 -v 0.312500 -0.062500 0.250000 -v 0.250000 -0.015625 0.250000 -v -2.426160 -0.153004 0.228538 -v 0.500000 0.187500 -0.437500 -v 0.312500 0.187500 -0.437500 -v -0.500000 0.421875 0.316406 -v -0.312500 0.187500 0.312500 -v 0.464844 0.234375 -0.437500 -v -0.500000 0.421875 0.496094 -v 0.347656 0.234375 -0.437500 -v -0.316406 0.187500 -0.500000 -v 0.406250 0.250000 -0.437500 -v -0.312500 -0.078125 0.312500 -v 0.437500 0.437500 0.312500 -v 0.437500 0.437500 0.500000 -v 0.000000 0.437500 0.312500 -v 0.437500 0.500000 0.406250 -v 0.437500 0.484375 0.347656 -v 0.437500 0.484375 0.464844 -v -0.500000 -0.187500 0.500000 -v -0.000000 -0.187500 -0.500000 -v 0.500000 -0.187500 0.500000 -v -0.312500 -0.078125 -0.500000 -v -0.500000 -0.187500 -0.500000 -v 0.500000 -0.187500 -0.500000 -v -0.464844 0.234375 -0.437500 -v -0.347656 0.234375 -0.437500 -v 0.500000 -0.375000 0.500000 -v 0.500000 -0.375000 -0.500000 -v 0.437500 -0.500000 -0.437500 -v 0.437500 -0.500000 -0.375000 -v 0.375000 -0.500000 -0.375000 -v 0.375000 -0.500000 -0.437500 -v 0.437500 -0.375000 -0.437500 -v 0.437500 -0.375000 -0.375000 +v -0.312500 -0.464844 0.234375 +v -0.464844 0.500000 0.460938 +v 0.437500 0.312500 0.187500 +v -0.316406 -0.500000 0.421875 +v -0.496094 -0.500000 0.421875 +v -0.312500 -0.312500 -0.078125 +v 0.500000 -0.312500 -0.078125 +v 0.500000 -0.496094 0.187500 +v -0.312500 -0.500000 0.187500 +v -0.312500 -0.312500 0.187500 +v 0.500000 -0.316406 0.187500 +v -0.347657 0.500000 0.460938 +v -0.406250 0.500000 0.476562 +v -0.250000 0.312500 -0.062500 +v -0.312500 0.347656 0.234375 +v -0.500000 0.437500 0.437500 +v -0.312500 0.437500 0.437500 +v -0.312500 0.312500 -0.078125 +v 0.500000 -0.464844 0.218750 +v -0.312500 -0.347656 0.234375 +v 0.500000 -0.347656 0.218750 +v 0.437500 0.312500 -0.062500 +v 0.500000 -0.406250 0.234375 +v -0.312500 -0.406250 0.250000 +v -0.406250 -0.500000 0.476562 +v -0.406250 0.437500 0.500000 +v -0.464844 -0.500000 0.460938 +v -0.347656 0.437500 0.484375 +v -0.347656 -0.500000 0.460938 +v -0.464844 0.437500 0.484375 +v -0.312500 -0.000000 -0.039062 +v 0.500000 0.000000 -0.039062 +v 0.500000 0.312500 -0.078125 +v 0.500000 0.347656 0.218750 +v 0.500000 -0.250000 -0.046875 +v -0.312500 -0.250000 -0.046875 +v 0.437500 0.000000 0.000000 +v 0.437500 -0.312500 -0.062500 +v 0.437500 -0.250000 -0.015625 +v -0.250000 -0.000000 0.000000 +v -0.250000 -0.312500 -0.062500 +v -0.250000 -0.250000 -0.015625 +v -0.228538 2.426160 -0.153004 +v 0.437500 -0.500000 0.187500 +v 0.437500 -0.312500 0.187500 +v -0.316407 0.500000 0.421875 +v -0.312500 0.312500 0.187500 +v 0.437500 -0.464844 0.234375 +v -0.496094 0.500000 0.421875 +v 0.437500 -0.347656 0.234375 +v 0.500000 0.316406 0.187500 +v 0.437500 -0.406250 0.250000 +v -0.312500 0.312500 -0.078125 +v -0.312500 -0.437500 0.437500 +v -0.500000 -0.437500 0.437500 +v -0.312500 -0.000000 0.437500 +v -0.406250 -0.437500 0.500000 +v -0.347656 -0.437500 0.484375 +v -0.464844 -0.437500 0.484375 +v -0.500000 0.500000 -0.187500 +v 0.500000 0.000000 -0.187500 +v -0.500000 -0.500000 -0.187500 +v 0.500000 0.312500 -0.078125 +v 0.500000 0.500000 -0.187500 +v 0.500000 -0.500000 -0.187500 +v 0.437500 0.464844 0.234375 +v 0.437500 0.347656 0.234375 +v -0.500000 -0.500000 -0.375000 +v 0.500000 -0.500000 -0.375000 +v 0.437500 -0.437500 -0.500000 +v 0.375000 -0.437500 -0.500000 +v 0.375000 -0.375000 -0.500000 +v 0.437500 -0.375000 -0.500000 +v 0.437500 -0.437500 -0.375000 +v 0.375000 -0.437500 -0.375000 v 0.375000 -0.375000 -0.375000 -v 0.375000 -0.375000 -0.437500 -v -0.500000 0.187500 -0.437500 -v -0.500000 0.460938 0.464844 -v -0.500000 0.460938 0.347656 -v -0.500000 0.476562 0.406250 -v -0.406250 0.250000 0.312500 -v -0.406250 0.234375 -0.500000 -v -0.464844 0.234375 0.312500 -v -0.496094 0.187500 -0.500000 -v 0.437500 -0.500000 0.375000 -v 0.437500 -0.500000 0.437500 -v 0.375000 -0.500000 0.437500 -v 0.375000 -0.500000 0.375000 -v 0.437500 -0.375000 0.375000 -v 0.437500 -0.375000 0.437500 -v 0.375000 -0.375000 0.437500 -v 0.375000 -0.375000 0.375000 -v -0.500000 0.187500 0.312500 -v -0.316406 0.187500 -0.500000 -v -0.312500 -0.078125 -0.500000 -v -0.500000 0.421875 0.316406 -v -0.500000 0.421875 0.496094 -v -0.464844 0.218750 -0.500000 -v -0.347656 0.234375 0.312500 -v -0.347656 0.218750 -0.500000 -v -0.500000 -0.375000 0.500000 -v -0.500000 -0.375000 -0.500000 -v -0.500000 -0.187500 0.500000 -v -0.500000 -0.187500 -0.500000 -v -0.500000 -0.375000 -0.500000 -v -0.500000 -0.375000 0.500000 -v -0.375000 -0.500000 -0.437500 -v -0.375000 -0.500000 -0.375000 -v -0.437500 -0.500000 -0.375000 -v -0.437500 -0.500000 -0.437500 -v -0.375000 -0.375000 -0.437500 -v -0.375000 -0.375000 -0.375000 +v 0.437500 -0.375000 -0.375000 +v 0.437500 0.500000 0.187500 +v -0.464844 0.500000 0.460938 +v -0.347657 0.500000 0.460938 +v -0.406250 0.500000 0.476562 +v -0.312500 0.406250 0.250000 +v 0.500000 0.406250 0.234375 +v -0.312500 0.464844 0.234375 +v 0.500000 0.496094 0.187500 +v -0.375000 -0.437500 -0.500000 +v -0.437500 -0.437500 -0.500000 +v -0.437500 -0.375000 -0.500000 +v -0.375000 -0.375000 -0.500000 +v -0.375000 -0.437500 -0.375000 +v -0.437500 -0.437500 -0.375000 v -0.437500 -0.375000 -0.375000 -v -0.437500 -0.375000 -0.437500 -v -0.375000 -0.500000 0.375000 -v -0.375000 -0.500000 0.437500 -v -0.437500 -0.500000 0.437500 -v -0.437500 -0.500000 0.375000 -v -0.375000 -0.375000 0.375000 -v -0.375000 -0.375000 0.437500 -v -0.437500 -0.375000 0.437500 -v -0.437500 -0.375000 0.375000 -v -0.406250 0.250000 -0.437500 -v -0.500000 -0.187500 0.500000 -v -0.500000 -0.187500 -0.500000 -v -0.347656 0.234375 -0.437500 -v -0.437500 0.437500 0.500000 -v -0.437500 0.437500 0.312500 -v -0.437500 0.500000 0.406250 -v -0.437500 0.484375 0.347656 -v -0.437500 0.484375 0.464844 -v 0.000000 -0.039062 0.312500 -v -0.000000 -0.039062 -0.500000 -v -0.250000 -0.046875 -0.500000 -v -0.250000 -0.046875 0.312500 -v -0.000000 0.000000 -0.437500 -v -0.312500 -0.062500 -0.437500 -v -0.250000 -0.015625 -0.437500 -v 0.000000 0.000000 0.250000 -v -0.250000 -0.015625 0.250000 -v -0.312500 -0.062500 0.250000 -v 0.000000 0.437500 0.500000 -v 0.000000 0.500000 0.406250 -v 0.000000 0.484375 0.347656 -v 0.000000 0.484375 0.464844 -v 0.000000 -0.187500 0.500000 +v -0.375000 -0.375000 -0.375000 +v -0.312500 0.500000 0.187500 +v 0.500000 0.316406 0.187500 +v 0.500000 0.312500 -0.078125 +v -0.316407 0.500000 0.421875 +v -0.496094 0.500000 0.421875 +v 0.500000 0.464844 0.218750 +v -0.312500 0.347656 0.234375 +v 0.500000 0.347656 0.218750 +v -0.500000 0.500000 -0.375000 +v 0.500000 0.500000 -0.375000 +v -0.500000 0.500000 -0.187500 +v 0.500000 0.500000 -0.187500 +v 0.500000 0.500000 -0.375000 +v -0.500000 0.500000 -0.375000 +v 0.437500 0.375000 -0.500000 +v 0.375000 0.375000 -0.500000 +v 0.375000 0.437500 -0.500000 +v 0.437500 0.437500 -0.500000 +v 0.437500 0.375000 -0.375000 +v 0.375000 0.375000 -0.375000 +v 0.375000 0.437500 -0.375000 +v 0.437500 0.437500 -0.375000 +v -0.375000 0.375000 -0.500000 +v -0.437500 0.375000 -0.500000 +v -0.437500 0.437500 -0.500000 +v -0.375000 0.437500 -0.500000 +v -0.375000 0.375000 -0.375000 +v -0.437500 0.375000 -0.375000 +v -0.437500 0.437500 -0.375000 +v -0.375000 0.437500 -0.375000 +v 0.437500 0.406250 0.250000 +v -0.500000 0.500000 -0.187500 +v 0.500000 0.500000 -0.187500 +v 0.437500 0.347656 0.234375 +v -0.500000 0.437500 0.437500 +v -0.312500 0.437500 0.437500 +v -0.406250 0.437500 0.500000 +v -0.347656 0.437500 0.484375 +v -0.464844 0.437500 0.484375 +v -0.312500 -0.000000 -0.039062 +v 0.500000 0.000000 -0.039062 +v 0.500000 0.250000 -0.046875 +v -0.312500 0.250000 -0.046875 +v 0.437500 0.000000 0.000000 +v 0.437500 0.312500 -0.062500 +v 0.437500 0.250000 -0.015625 +v -0.250000 -0.000000 0.000000 +v -0.250000 0.250000 -0.015625 +v -0.250000 0.312500 -0.062500 +v -0.500000 -0.000000 0.437500 +v -0.406250 -0.000000 0.500000 +v -0.347656 -0.000000 0.484375 +v -0.464844 -0.000000 0.484375 +v -0.500000 -0.000000 -0.187500 vt 0.140470 0.234971 vt 0.140470 0.272035 vt 0.078047 0.270084 @@ -339,102 +339,102 @@ vt 0.937500 0.875000 vt 0.937500 0.937500 vt 0.875000 0.062500 vt 0.937500 0.062500 -vn -0.000000 0.000000 -1.000000 -vn -0.310300 0.927700 -0.207300 -vn -0.192600 0.560200 -0.805600 -vn -0.505100 0.808100 -0.303000 -vn -0.557500 0.814600 -0.160300 -vn 0.146800 0.831000 0.536500 -vn 0.075700 0.338900 0.937700 -vn 0.689700 0.205200 0.694400 -vn 0.746300 0.537600 0.392500 -vn -0.943400 0.329600 -0.035700 -vn -1.000000 -0.000000 0.000000 -vn -0.586900 0.195600 -0.785700 -vn 0.535500 0.839600 -0.090600 -vn 0.352300 0.517700 -0.779600 -vn 0.981900 0.156900 -0.105900 -vn 0.943000 0.330000 -0.042000 -vn -0.999800 0.004100 -0.017300 -vn -0.701300 0.265500 -0.661600 -vn -0.943000 0.330000 -0.042000 -vn -0.535500 0.839600 -0.090600 -vn -0.386900 0.578400 -0.718100 -vn 0.000000 0.992800 -0.119800 -vn 0.005700 0.640900 -0.767500 -vn -0.344000 0.509500 -0.788700 -vn -0.000000 0.600000 -0.800000 -vn -0.000000 0.828700 -0.559600 -vn -0.000000 0.316200 -0.948700 -vn 0.098200 0.368400 -0.924400 -vn -0.005700 0.640900 -0.767500 -vn -0.030800 -0.005100 -0.999500 -vn -0.817000 -0.001200 -0.576600 -vn 0.687300 0.202400 -0.697500 -vn 0.077600 0.335500 -0.938800 -vn 0.557500 0.814600 0.160300 -vn 0.310300 0.927700 0.207300 -vn 0.297500 0.865300 0.403400 -vn 0.505100 0.808100 0.303000 -vn 0.053500 0.966600 0.250500 -vn 0.040800 0.870800 0.489900 -vn -0.767600 0.000000 -0.641000 -vn -0.024000 0.512200 -0.858500 -vn -0.706800 0.266200 -0.655400 -vn -0.528800 0.004000 -0.848700 -vn 0.000000 1.000000 0.000000 -vn 0.000000 0.828700 0.559600 -vn 0.173500 0.984800 0.000000 -vn -0.282800 0.774700 0.565600 -vn -0.210900 0.597700 0.773500 -vn -0.299000 0.813400 0.498900 -vn -0.282800 0.774700 -0.565600 -vn -0.351100 0.936300 0.000000 -vn -0.299000 0.813400 -0.498900 -vn 0.146800 0.831000 -0.536500 -vn 0.779200 0.626800 0.000000 -vn 0.746300 0.537600 -0.392500 -vn -0.053500 0.966600 -0.250500 -vn -0.352300 0.517700 -0.779600 -vn 0.297500 0.865300 -0.403400 -vn 0.040800 0.870800 -0.489900 -vn 0.053500 0.966600 -0.250500 -vn 0.310300 0.927700 -0.207300 -vn 0.505100 0.808100 -0.303000 -vn 0.557500 0.814600 -0.160300 -vn -0.981900 0.156900 -0.105900 -vn 0.586900 0.195600 -0.785700 -vn 0.000000 0.671300 -0.741200 -vn 0.386900 0.578400 -0.718100 -vn -0.210900 0.597700 -0.773500 -vn 0.701300 0.265500 -0.661600 -vn 0.000000 0.316200 0.948700 -vn -0.707100 0.000800 -0.707100 -vn 0.707100 0.000300 0.707100 -vn 0.833200 0.000900 -0.553000 -vn 0.943400 0.329600 -0.035700 vn 1.000000 0.000000 0.000000 -vn 0.999800 0.004100 -0.017300 -vn 0.781700 0.621700 -0.048700 -vn 0.800000 0.600000 -0.000000 -vn 0.757800 0.644100 -0.104200 -vn 0.933300 0.351600 -0.073100 -vn 0.999500 0.007600 -0.032200 -vn 0.767600 0.000000 -0.641000 -vn 0.114000 0.427600 -0.896800 -vn 0.255800 0.959200 -0.120500 -vn -0.819400 0.003700 0.573200 -vn -0.707100 0.000300 0.707100 -vn -0.027100 0.002700 0.999600 -vn -0.310300 0.927700 0.207300 -vn -0.557500 0.814600 0.160300 -vn -0.053500 0.966600 0.250500 -vn -0.040800 0.870800 0.489900 -vn -0.297500 0.865300 0.403400 -vn -0.505100 0.808100 0.303000 -vn 0.000000 0.600000 0.800000 +vn 0.207300 0.310300 0.927700 +vn 0.805600 0.192600 0.560200 +vn 0.303000 0.505100 0.808100 +vn 0.160300 0.557500 0.814600 +vn -0.536500 -0.146800 0.831000 +vn -0.937700 -0.075700 0.338900 +vn -0.694400 -0.689700 0.205200 +vn -0.392500 -0.746300 0.537600 +vn 0.035700 0.943400 0.329600 +vn -0.000000 1.000000 -0.000000 +vn 0.785700 0.586900 0.195600 +vn 0.090600 -0.535500 0.839600 +vn 0.779600 -0.352300 0.517700 +vn 0.105900 -0.981900 0.156900 +vn 0.042000 -0.943000 0.330000 +vn 0.017300 0.999800 0.004100 +vn 0.661600 0.701300 0.265500 +vn 0.042000 0.943000 0.330000 +vn 0.090600 0.535500 0.839600 +vn 0.718100 0.386900 0.578400 +vn 0.119800 0.000000 0.992800 +vn 0.767500 -0.005700 0.640900 +vn 0.788700 0.344000 0.509500 +vn 0.800000 0.000000 0.600000 +vn 0.559600 0.000000 0.828700 +vn 0.948700 0.000000 0.316200 +vn 0.924400 -0.098200 0.368400 +vn 0.767500 0.005700 0.640900 +vn 0.999500 0.030800 -0.005100 +vn 0.576600 0.817000 -0.001200 +vn 0.697500 -0.687300 0.202400 +vn 0.938800 -0.077600 0.335500 +vn -0.160300 -0.557500 0.814600 +vn -0.207300 -0.310300 0.927700 +vn -0.403400 -0.297500 0.865300 +vn -0.303000 -0.505100 0.808100 +vn -0.250500 -0.053500 0.966600 +vn -0.489900 -0.040800 0.870800 +vn 0.641000 0.767600 0.000000 +vn 0.858500 0.024000 0.512200 +vn 0.655400 0.706800 0.266200 +vn 0.848700 0.528800 0.004000 vn 0.000000 0.000000 1.000000 +vn -0.559600 0.000000 0.828700 +vn 0.000000 -0.173500 0.984800 +vn -0.565600 0.282800 0.774700 +vn -0.773500 0.210900 0.597700 +vn -0.498900 0.299000 0.813400 +vn 0.565600 0.282800 0.774700 +vn -0.000000 0.351100 0.936300 +vn 0.498900 0.299000 0.813400 +vn 0.536500 -0.146800 0.831000 +vn 0.000000 -0.779200 0.626800 +vn 0.392500 -0.746300 0.537600 +vn 0.250500 0.053500 0.966600 +vn 0.779600 0.352300 0.517700 +vn 0.403400 -0.297500 0.865300 +vn 0.489900 -0.040800 0.870800 +vn 0.250500 -0.053500 0.966600 +vn 0.207300 -0.310300 0.927700 +vn 0.303000 -0.505100 0.808100 +vn 0.160300 -0.557500 0.814600 +vn 0.105900 0.981900 0.156900 +vn 0.785700 -0.586900 0.195600 +vn 0.741200 0.000000 0.671300 +vn 0.718100 -0.386900 0.578400 +vn 0.773500 0.210900 0.597700 +vn 0.661600 -0.701300 0.265500 +vn -0.948700 -0.000000 0.316200 +vn 0.707100 0.707100 0.000800 +vn -0.707100 -0.707100 0.000300 +vn 0.553000 -0.833200 0.000900 +vn 0.035700 -0.943400 0.329600 vn 0.000000 -1.000000 0.000000 +vn 0.017300 -0.999800 0.004100 +vn 0.048700 -0.781700 0.621700 +vn 0.000000 -0.800000 0.600000 +vn 0.104200 -0.757800 0.644100 +vn 0.073100 -0.933300 0.351600 +vn 0.032200 -0.999500 0.007600 +vn 0.641000 -0.767600 0.000000 +vn 0.896800 -0.114000 0.427600 +vn 0.120500 -0.255800 0.959200 +vn -0.573200 0.819400 0.003700 +vn -0.707100 0.707100 0.000300 +vn -0.999600 0.027100 0.002700 +vn -0.207300 0.310300 0.927700 +vn -0.160300 0.557500 0.814600 +vn -0.250500 0.053500 0.966600 +vn -0.489900 0.040800 0.870800 +vn -0.403400 0.297500 0.865300 +vn -0.303000 0.505100 0.808100 +vn -0.800000 -0.000000 0.600000 +vn -1.000000 -0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 g Cylinder_Cylinder_upholstery s off f 61/1/1 134/2/1 35/3/1 diff --git a/lrfurn/models/lrfurn_sofa_long.obj b/lrfurn/models/lrfurn_sofa_long.obj index 99d0db6..d8e32db 100644 --- a/lrfurn/models/lrfurn_sofa_long.obj +++ b/lrfurn/models/lrfurn_sofa_long.obj @@ -1,183 +1,183 @@ -# Blender v2.73 (sub 0) OBJ File: 'lrfurn-sofa-long.blend' +# Blender v2.72 (sub 0) OBJ File: 'lrfurn-sofa-long.blend' # www.blender.org o Cylinder -v 0.312500 0.234375 -0.464844 -v -0.500000 0.218750 2.347656 -v 0.312500 0.234375 2.347656 -v -0.500000 0.218750 2.464844 -v 0.316406 0.421875 -0.500000 -v 0.496094 0.421875 -0.500000 -v 0.496094 0.421875 2.500000 -v 0.316406 0.421875 2.500000 -v 0.312500 -0.078125 -0.312500 -v -0.500000 -0.078125 -0.312500 -v -0.500000 0.187500 -0.496094 -v 0.312500 0.187500 -0.500000 -v 0.312500 0.187500 -0.312500 -v -0.500000 0.187500 -0.316406 -v -0.500000 -0.078125 2.312500 -v 0.312500 -0.078125 2.312500 -v -0.500000 0.187500 2.316406 -v 0.312500 0.187500 2.312500 -v 0.312500 0.187500 2.500000 -v -0.500000 0.187500 2.496094 -v -0.500000 -0.078125 0.500000 -v 0.500000 0.437500 0.500000 -v 0.312500 0.437500 0.500000 -v 0.312500 -0.078125 0.500000 -v 0.500000 0.437500 1.500000 -v 0.312500 -0.078125 1.500000 -v -0.500000 -0.078125 1.500000 -v 0.312500 0.437500 1.500000 -v 0.312500 0.234375 2.464844 -v -0.500000 0.218750 -0.464844 -v 0.312500 0.234375 -0.347656 -v -0.500000 0.218750 -0.347656 -v -0.500000 0.234375 2.406250 -v 0.312500 0.250000 2.406250 -v -0.500000 0.234375 -0.406250 -v 0.312500 0.250000 -0.406250 -v 0.406250 0.476562 -0.500000 -v 0.406250 0.476562 2.500000 -v 0.406250 0.500000 0.500000 -v 0.406250 0.500000 1.500000 -v 0.464844 0.460938 -0.500000 -v 0.347656 0.460938 2.500000 -v 0.347656 0.484375 0.500000 -v 0.347656 0.484375 1.500000 -v 0.347656 0.460938 -0.500000 -v 0.464844 0.460938 2.500000 -v 0.464844 0.484375 0.500000 -v 0.464844 0.484375 1.500000 -v 0.312500 -0.039062 1.906250 -v -0.500000 -0.039062 1.000000 -v 0.312500 -0.039062 0.093750 -v 0.312500 -0.039062 1.000000 -v -0.500000 -0.039062 0.093750 -v -0.500000 -0.039062 1.906250 -v 0.312500 -0.046875 1.562500 -v -0.500000 -0.046875 0.562500 -v -0.500000 -0.046875 2.250000 -v 0.312500 -0.046875 0.437500 -v -0.500000 -0.046875 0.437500 -v 0.312500 -0.046875 1.437500 -v 0.312500 -0.046875 0.562500 -v -0.500000 -0.046875 -0.250000 -v 0.312500 -0.046875 -0.250000 -v -0.500000 -0.046875 1.437500 -v 0.312500 -0.046875 2.250000 -v -0.500000 -0.046875 1.562500 -v -0.437500 0.000000 0.093750 -v -0.437500 0.000000 1.906250 -v -0.437500 -0.062500 -0.312500 -v -0.437500 -0.062500 2.312500 -v -0.437500 -0.062500 1.500000 -v -0.437500 -0.062500 0.500000 -v -0.437500 0.000000 1.000000 -v -0.437500 -0.015625 1.562500 -v -0.437500 -0.015625 -0.250000 -v -0.437500 -0.015625 1.437500 -v -0.437500 -0.015625 2.250000 -v -0.437500 -0.015625 0.437500 -v -0.437500 -0.015625 0.562500 -v 0.250000 0.000000 0.093750 -v 0.250000 0.000000 1.906250 -v 0.250000 -0.062500 -0.312500 -v 0.250000 -0.062500 1.500000 -v 0.250000 -0.015625 1.562500 -v 0.250000 -0.015625 -0.250000 -v 0.250000 -0.015625 2.250000 -v 0.250000 -0.015625 0.437500 -v 0.250000 -0.062500 2.312500 -v 0.250000 -0.062500 0.500000 -v 0.250000 0.000000 1.000000 -v 0.250000 -0.015625 1.437500 -v 0.250000 -0.015625 0.562500 -v 0.228538 -0.153004 2.426160 -v -0.437500 0.187500 -0.500000 -v -0.437500 0.187500 -0.312500 -v -0.437500 0.187500 2.312500 -v -0.437500 0.187500 2.500000 -v -0.437500 0.234375 -0.464844 -v -0.437500 0.234375 2.347656 -v -0.437500 0.234375 -0.347656 -v -0.437500 0.234375 2.464844 -v -0.437500 0.250000 -0.406250 -v -0.437500 0.250000 2.406250 -v 0.312500 0.437500 -0.437500 -v 0.500000 0.437500 2.437500 -v 0.500000 0.437500 -0.437500 -v 0.312500 0.437500 2.437500 -v 0.406250 0.500000 2.437500 -v 0.406250 0.500000 -0.437500 -v 0.347656 0.484375 -0.437500 -v 0.347656 0.484375 2.437500 -v 0.464844 0.484375 2.437500 -v 0.464844 0.484375 -0.437500 -v 0.500000 -0.187500 0.500000 -v 0.500000 -0.187500 1.500000 -v 0.500000 -0.187500 2.500000 -v 0.500000 -0.187500 -0.500000 -v -0.500000 -0.187500 2.500000 -v -0.500000 -0.187500 1.500000 -v -0.500000 -0.187500 0.500000 -v -0.500000 -0.187500 -0.500000 -v -0.500000 -0.375000 2.500000 -v 0.500000 -0.375000 2.500000 -v 0.500000 -0.375000 -0.500000 -v -0.500000 -0.375000 -0.500000 -v -0.437500 -0.500000 -0.437500 -v -0.375000 -0.500000 -0.437500 -v -0.375000 -0.500000 -0.375000 -v -0.437500 -0.500000 -0.375000 -v -0.437500 -0.375000 -0.437500 -v -0.375000 -0.375000 -0.437500 -v -0.375000 -0.375000 -0.375000 -v -0.437500 -0.375000 -0.375000 -v -0.437500 -0.500000 2.375000 -v -0.375000 -0.500000 2.375000 -v -0.375000 -0.500000 2.437500 -v -0.437500 -0.500000 2.437500 -v -0.437500 -0.375000 2.375000 -v -0.375000 -0.375000 2.375000 -v -0.375000 -0.375000 2.437500 -v -0.437500 -0.375000 2.437500 -v 0.375000 -0.500000 -0.437500 -v 0.437500 -0.500000 -0.437500 -v 0.437500 -0.500000 -0.375000 -v 0.375000 -0.500000 -0.375000 -v 0.375000 -0.375000 -0.437500 -v 0.437500 -0.375000 -0.437500 +v 0.464844 -0.312500 0.234375 +v -2.347656 0.500000 0.218751 +v -2.347656 -0.312500 0.234375 +v -2.464844 0.500000 0.218751 +v 0.500000 -0.316407 0.421875 +v 0.500000 -0.496094 0.421875 +v -2.500000 -0.496094 0.421875 +v -2.500000 -0.316406 0.421875 +v 0.312500 -0.312500 -0.078125 +v 0.312500 0.500000 -0.078125 +v 0.496094 0.500000 0.187500 +v 0.500000 -0.312500 0.187500 +v 0.312500 -0.312500 0.187500 +v 0.316406 0.500000 0.187500 +v -2.312500 0.500000 -0.078124 +v -2.312500 -0.312500 -0.078125 +v -2.316406 0.500000 0.187501 +v -2.312500 -0.312500 0.187500 +v -2.500000 -0.312500 0.187500 +v -2.496094 0.500000 0.187501 +v -0.500000 0.500000 -0.078125 +v -0.500000 -0.500000 0.437500 +v -0.500000 -0.312500 0.437500 +v -0.500000 -0.312500 -0.078125 +v -1.500000 -0.500000 0.437500 +v -1.500000 -0.312500 -0.078125 +v -1.500000 0.500000 -0.078124 +v -1.500000 -0.312500 0.437500 +v -2.464844 -0.312500 0.234375 +v 0.464844 0.500000 0.218750 +v 0.347656 -0.312500 0.234375 +v 0.347656 0.500000 0.218750 +v -2.406250 0.500000 0.234376 +v -2.406250 -0.312500 0.250000 +v 0.406250 0.500000 0.234375 +v 0.406250 -0.312500 0.250000 +v 0.500000 -0.406250 0.476562 +v -2.500000 -0.406250 0.476563 +v -0.500000 -0.406250 0.500000 +v -1.500000 -0.406250 0.500000 +v 0.500000 -0.464844 0.460937 +v -2.500000 -0.347656 0.460938 +v -0.500000 -0.347656 0.484375 +v -1.500000 -0.347656 0.484375 +v 0.500000 -0.347657 0.460937 +v -2.500000 -0.464844 0.460938 +v -0.500000 -0.464844 0.484375 +v -1.500000 -0.464844 0.484375 +v -1.906250 -0.312500 -0.039062 +v -1.000000 0.500000 -0.039062 +v -0.093750 -0.312500 -0.039063 +v -1.000000 -0.312500 -0.039063 +v -0.093750 0.500000 -0.039062 +v -1.906250 0.500000 -0.039062 +v -1.562500 -0.312500 -0.046875 +v -0.562500 0.500000 -0.046875 +v -2.250000 0.500000 -0.046874 +v -0.437500 -0.312500 -0.046875 +v -0.437500 0.500000 -0.046875 +v -1.437500 -0.312500 -0.046875 +v -0.562500 -0.312500 -0.046875 +v 0.250000 0.500000 -0.046875 +v 0.250000 -0.312500 -0.046875 +v -1.437500 0.500000 -0.046874 +v -2.250000 -0.312500 -0.046875 +v -1.562500 0.500000 -0.046874 +v -0.093750 0.437500 0.000000 +v -1.906250 0.437500 0.000001 +v 0.312500 0.437500 -0.062500 +v -2.312500 0.437500 -0.062499 +v -1.500000 0.437500 -0.062499 +v -0.500000 0.437500 -0.062500 +v -1.000000 0.437500 0.000000 +v -1.562500 0.437500 -0.015624 +v 0.250000 0.437500 -0.015625 +v -1.437500 0.437500 -0.015625 +v -2.250000 0.437500 -0.015624 +v -0.437500 0.437500 -0.015625 +v -0.562500 0.437500 -0.015625 +v -0.093750 -0.250000 -0.000000 +v -1.906250 -0.250000 0.000000 +v 0.312500 -0.250000 -0.062500 +v -1.500000 -0.250000 -0.062500 +v -1.562500 -0.250000 -0.015625 +v 0.250000 -0.250000 -0.015625 +v -2.250000 -0.250000 -0.015625 +v -0.437500 -0.250000 -0.015625 +v -2.312500 -0.250000 -0.062500 +v -0.500000 -0.250000 -0.062500 +v -1.000000 -0.250000 -0.000000 +v -1.437500 -0.250000 -0.015625 +v -0.562500 -0.250000 -0.015625 +v -2.426160 -0.228537 -0.153004 +v 0.500000 0.437500 0.187500 +v 0.312500 0.437500 0.187500 +v -2.312500 0.437500 0.187501 +v -2.500000 0.437500 0.187501 +v 0.464844 0.437500 0.234375 +v -2.347656 0.437500 0.234376 +v 0.347656 0.437500 0.234375 +v -2.464844 0.437500 0.234376 +v 0.406250 0.437500 0.250000 +v -2.406250 0.437500 0.250001 +v 0.437500 -0.312500 0.437500 +v -2.437500 -0.500000 0.437500 +v 0.437500 -0.500000 0.437500 +v -2.437500 -0.312500 0.437500 +v -2.437500 -0.406250 0.500000 +v 0.437500 -0.406250 0.500000 +v 0.437500 -0.347657 0.484375 +v -2.437500 -0.347656 0.484375 +v -2.437500 -0.464844 0.484375 +v 0.437500 -0.464844 0.484375 +v -0.500000 -0.500000 -0.187500 +v -1.500000 -0.500000 -0.187500 +v -2.500000 -0.499999 -0.187500 +v 0.500000 -0.500000 -0.187500 +v -2.500000 0.500000 -0.187499 +v -1.500000 0.500000 -0.187499 +v -0.500000 0.500000 -0.187500 +v 0.500000 0.500000 -0.187500 +v -2.500000 0.500001 -0.374999 +v -2.500000 -0.499999 -0.375000 +v 0.500000 -0.500000 -0.375000 +v 0.500000 0.500000 -0.375000 +v 0.437500 0.437500 -0.500000 +v 0.437500 0.375000 -0.500000 +v 0.375000 0.375000 -0.500000 +v 0.375000 0.437500 -0.500000 +v 0.437500 0.437500 -0.375000 +v 0.437500 0.375000 -0.375000 +v 0.375000 0.375000 -0.375000 +v 0.375000 0.437500 -0.375000 +v -2.375000 0.437501 -0.499999 +v -2.375000 0.375001 -0.499999 +v -2.437500 0.375001 -0.499999 +v -2.437500 0.437501 -0.499999 +v -2.375000 0.437501 -0.374999 +v -2.375000 0.375001 -0.374999 +v -2.437500 0.375001 -0.374999 +v -2.437500 0.437501 -0.374999 +v 0.437500 -0.375000 -0.500000 +v 0.437500 -0.437500 -0.500000 +v 0.375000 -0.437500 -0.500000 +v 0.375000 -0.375000 -0.500000 v 0.437500 -0.375000 -0.375000 +v 0.437500 -0.437500 -0.375000 +v 0.375000 -0.437500 -0.375000 v 0.375000 -0.375000 -0.375000 -v 0.375000 -0.500000 2.375000 -v 0.437500 -0.500000 2.375000 -v 0.437500 -0.500000 2.437500 -v 0.375000 -0.500000 2.437500 -v 0.375000 -0.375000 2.375000 -v 0.437500 -0.375000 2.375000 -v 0.437500 -0.375000 2.437500 -v 0.375000 -0.375000 2.437500 -v -0.437500 -0.500000 0.968750 -v -0.375000 -0.500000 0.968750 -v -0.375000 -0.500000 1.031250 -v -0.437500 -0.500000 1.031250 -v -0.437500 -0.375000 0.968750 -v -0.375000 -0.375000 0.968750 -v -0.375000 -0.375000 1.031250 -v -0.437500 -0.375000 1.031250 -v 0.375000 -0.500000 0.968750 -v 0.437500 -0.500000 0.968750 -v 0.437500 -0.500000 1.031250 -v 0.375000 -0.500000 1.031250 -v 0.375000 -0.375000 0.968750 -v 0.437500 -0.375000 0.968750 -v 0.437500 -0.375000 1.031250 -v 0.375000 -0.375000 1.031250 -v 0.500000 -0.375000 0.500000 -v -0.500000 -0.375000 0.500000 -v -0.500000 -0.375000 1.500000 -v 0.500000 -0.375000 1.500000 +v -2.375000 -0.374999 -0.500000 +v -2.375000 -0.437499 -0.500000 +v -2.437500 -0.437499 -0.500000 +v -2.437500 -0.374999 -0.500000 +v -2.375000 -0.374999 -0.375000 +v -2.375000 -0.437499 -0.375000 +v -2.437500 -0.437499 -0.375000 +v -2.437500 -0.374999 -0.375000 +v -0.968750 0.437500 -0.500000 +v -0.968750 0.375000 -0.500000 +v -1.031250 0.375000 -0.500000 +v -1.031250 0.437500 -0.500000 +v -0.968750 0.437500 -0.375000 +v -0.968750 0.375000 -0.375000 +v -1.031250 0.375000 -0.375000 +v -1.031250 0.437500 -0.375000 +v -0.968750 -0.375000 -0.500000 +v -0.968750 -0.437500 -0.500000 +v -1.031250 -0.437500 -0.500000 +v -1.031250 -0.375000 -0.500000 +v -0.968750 -0.375000 -0.375000 +v -0.968750 -0.437500 -0.375000 +v -1.031250 -0.437500 -0.375000 +v -1.031250 -0.375000 -0.375000 +v -0.500000 -0.500000 -0.375000 +v -0.500000 0.500000 -0.375000 +v -1.500000 0.500000 -0.374999 +v -1.500000 -0.500000 -0.375000 vt 0.250000 0.383435 vt 0.265625 0.375706 vt 0.265625 0.503232 @@ -416,103 +416,103 @@ vt 0.531250 0.875000 vt 0.531250 0.937500 vt 0.468750 0.062500 vt 0.531250 0.062500 -vn -1.000000 0.000000 0.000000 -vn -0.948700 0.316200 0.000000 -vn 0.207400 0.931200 -0.299600 -vn 0.404600 0.867500 -0.289300 -vn 0.351100 0.936300 0.000000 -vn 0.193100 0.981200 0.000000 -vn 0.251900 0.967700 0.000000 -vn 0.490300 0.871600 -0.000000 -vn 0.536500 0.831000 -0.146800 -vn 0.937700 0.338900 -0.075700 -vn 0.694400 0.205200 -0.689700 -vn 0.392500 0.537600 -0.746300 -vn -0.035700 0.329600 0.943400 -vn 0.000000 -0.000000 1.000000 -vn -0.785700 0.195600 0.586900 -vn -0.090600 0.839600 -0.535500 -vn -0.779600 0.517700 -0.352300 -vn -0.105900 0.156900 -0.981900 -vn -0.042000 0.330000 -0.943000 -vn -0.017300 0.004100 0.999800 -vn -0.788400 0.511400 -0.341800 -vn -0.785700 0.195600 -0.586900 -vn -0.035700 0.329600 -0.943400 -vn 0.251500 0.967800 0.000000 -vn 0.207400 0.930000 0.303500 -vn 0.404200 0.866700 0.292300 -vn -0.251500 0.967800 0.000000 -vn -0.860000 0.510300 0.000000 -vn -0.805300 0.561700 0.189400 -vn -0.207400 0.930000 0.303500 -vn 0.559600 0.828700 0.000000 -vn 0.948700 0.316200 0.000000 -vn 0.536500 0.831000 0.146800 -vn 0.937700 0.338900 0.075700 -vn -0.119800 0.992800 0.000000 -vn -0.760700 0.649000 0.002000 -vn -0.973400 0.205400 -0.101100 -vn -0.160300 0.814600 0.557500 -vn 0.404600 0.867500 0.289300 -vn 0.207400 0.931200 0.299600 -vn -0.760700 0.649000 -0.002000 -vn -0.788400 0.511400 0.341800 -vn -0.090600 0.839600 0.535500 -vn -0.559600 0.828700 0.000000 -vn -0.536500 0.831000 -0.146800 -vn -0.940200 0.331200 -0.079300 -vn -0.699900 0.200500 -0.685500 -vn -0.042000 0.330000 0.943000 -vn -0.105900 0.156900 0.981900 -vn -0.779600 0.517700 0.352300 -vn 0.160300 0.814600 -0.557500 -vn 0.207400 0.930000 -0.303500 -vn 0.404200 0.866700 -0.292300 -vn 0.303000 0.808100 -0.505100 -vn -0.193100 0.981200 0.000000 -vn -0.902600 0.430500 0.000000 -vn -0.805300 0.561700 -0.189400 -vn -0.207400 0.930000 -0.303500 -vn -0.699900 0.200500 0.685500 -vn -0.641000 0.000000 0.767600 -vn -0.655400 0.266200 0.706800 -vn -0.973400 0.205400 0.101100 -vn -0.392500 0.537600 0.746300 -vn 0.000000 0.626800 0.779200 -vn -0.536500 0.831000 0.146800 -vn -0.940200 0.331200 0.079300 -vn 0.392500 0.537600 0.746300 -vn 0.000000 0.984800 0.173500 vn 0.000000 1.000000 0.000000 -vn 0.000000 0.984800 -0.173500 -vn 0.000000 0.000000 -1.000000 -vn -0.017300 0.004100 -0.999800 -vn -0.641000 0.000000 -0.767600 -vn -0.655400 0.266200 -0.706800 -vn -0.718100 0.578400 0.386900 -vn -0.661600 0.265500 0.701300 -vn -0.741200 0.671300 0.000000 -vn -0.718100 0.578400 -0.386900 -vn 0.000000 0.626800 -0.779200 -vn -0.392500 0.537600 -0.746300 -vn -0.805200 0.562500 0.187600 -vn -0.207400 0.931200 0.299600 -vn -0.251900 0.967700 0.000000 -vn -0.860700 0.509200 0.000000 -vn -0.160300 0.814600 -0.557500 -vn 0.160300 0.814600 0.557500 -vn -0.207400 0.931200 -0.299600 -vn -0.805200 0.562500 -0.187600 -vn 0.303000 0.808100 0.505100 -vn -0.661600 0.265500 -0.701300 -vn 0.694400 0.205200 0.689700 -vn 1.000000 0.000000 -0.000000 -vn 0.707100 0.000300 0.707100 -vn 0.707100 0.000300 -0.707100 -vn -0.707100 0.000800 -0.707100 -vn -0.707100 0.000800 0.707100 -vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.948700 0.316200 +vn 0.299600 -0.207400 0.931200 +vn 0.289300 -0.404600 0.867500 +vn -0.000000 -0.351100 0.936300 +vn 0.000000 -0.193100 0.981200 +vn 0.000000 -0.251900 0.967700 +vn 0.000000 -0.490300 0.871600 +vn 0.146800 -0.536500 0.831000 +vn 0.075700 -0.937700 0.338900 +vn 0.689700 -0.694400 0.205200 +vn 0.746300 -0.392500 0.537600 +vn -0.943400 0.035700 0.329600 +vn -1.000000 0.000000 0.000000 +vn -0.586900 0.785700 0.195600 +vn 0.535500 0.090600 0.839600 +vn 0.352300 0.779600 0.517700 +vn 0.981900 0.105900 0.156900 +vn 0.943000 0.042000 0.330000 +vn -0.999800 0.017300 0.004100 +vn 0.341800 0.788400 0.511400 +vn 0.586900 0.785700 0.195600 +vn 0.943400 0.035700 0.329600 +vn 0.000000 -0.251500 0.967800 +vn -0.303500 -0.207400 0.930000 +vn -0.292300 -0.404200 0.866700 +vn 0.000000 0.251500 0.967800 +vn 0.000000 0.860000 0.510300 +vn -0.189400 0.805300 0.561700 +vn -0.303500 0.207400 0.930000 +vn 0.000000 -0.559600 0.828700 +vn 0.000000 -0.948700 0.316200 +vn -0.146800 -0.536500 0.831000 +vn -0.075700 -0.937700 0.338900 +vn 0.000000 0.119800 0.992800 +vn -0.002000 0.760700 0.649000 +vn 0.101100 0.973400 0.205400 +vn -0.557500 0.160300 0.814600 +vn -0.289300 -0.404600 0.867500 +vn -0.299600 -0.207400 0.931200 +vn 0.002000 0.760700 0.649000 +vn -0.341800 0.788400 0.511400 +vn -0.535500 0.090600 0.839600 +vn 0.000000 0.559600 0.828700 +vn 0.146800 0.536500 0.831000 +vn 0.079300 0.940200 0.331200 +vn 0.685500 0.699900 0.200500 +vn -0.943000 0.042000 0.330000 +vn -0.981900 0.105900 0.156900 +vn -0.352300 0.779600 0.517700 +vn 0.557500 -0.160300 0.814600 +vn 0.303500 -0.207400 0.930000 +vn 0.292300 -0.404200 0.866700 +vn 0.505100 -0.303000 0.808100 +vn 0.000000 0.193100 0.981200 +vn 0.000000 0.902600 0.430500 +vn 0.189400 0.805300 0.561700 +vn 0.303500 0.207400 0.930000 +vn -0.685500 0.699900 0.200500 +vn -0.767600 0.641000 0.000000 +vn -0.706800 0.655400 0.266200 +vn -0.101100 0.973400 0.205400 +vn -0.746300 0.392500 0.537600 +vn -0.779200 0.000000 0.626800 +vn -0.146800 0.536500 0.831000 +vn -0.079300 0.940200 0.331200 +vn -0.746300 -0.392500 0.537600 +vn -0.173500 0.000000 0.984800 +vn 0.000000 0.000000 1.000000 +vn 0.173500 0.000000 0.984800 +vn 1.000000 -0.000000 0.000000 +vn 0.999800 0.017300 0.004100 +vn 0.767600 0.641000 0.000000 +vn 0.706800 0.655400 0.266200 +vn -0.386900 0.718100 0.578400 +vn -0.701300 0.661600 0.265500 +vn 0.000000 0.741200 0.671300 +vn 0.386900 0.718100 0.578400 +vn 0.779200 0.000000 0.626800 +vn 0.746300 0.392500 0.537600 +vn -0.187600 0.805200 0.562500 +vn -0.299600 0.207400 0.931200 +vn 0.000000 0.251900 0.967700 +vn 0.000000 0.860700 0.509200 +vn 0.557500 0.160300 0.814600 +vn -0.557500 -0.160300 0.814600 +vn 0.299600 0.207400 0.931200 +vn 0.187600 0.805200 0.562500 +vn -0.505100 -0.303000 0.808100 +vn 0.701300 0.661600 0.265500 +vn -0.689700 -0.694400 0.205200 +vn -0.000000 -1.000000 -0.000000 +vn -0.707100 -0.707100 0.000300 +vn 0.707100 -0.707100 0.000300 +vn 0.707100 0.707100 0.000800 +vn -0.707100 0.707100 0.000800 +vn -0.000000 0.000000 -1.000000 g Cylinder_Cylinder_upholstery s 1 f 58/1/1 24/2/1 23/3/2 diff --git a/lrfurn/models/lrfurn_sofa_short.obj b/lrfurn/models/lrfurn_sofa_short.obj index a11e01b..1bf1446 100644 --- a/lrfurn/models/lrfurn_sofa_short.obj +++ b/lrfurn/models/lrfurn_sofa_short.obj @@ -1,142 +1,142 @@ -# Blender v2.73 (sub 0) OBJ File: 'lrfurn-sofa-short.blend' +# Blender v2.72 (sub 0) OBJ File: 'lrfurn-sofa-short.blend' # www.blender.org o Cylinder -v 0.312500 0.234375 -0.464844 -v -0.500000 0.218750 1.347656 -v 0.312500 0.234375 1.347656 -v -0.500000 0.218750 1.464844 -v 0.316406 0.421875 -0.500000 -v 0.496094 0.421875 -0.500000 -v 0.496094 0.421875 1.500000 -v 0.316406 0.421875 1.500000 -v 0.312500 -0.078125 -0.312500 -v -0.500000 -0.078125 -0.312500 -v -0.500000 0.187500 -0.496094 -v 0.312500 0.187500 -0.500000 -v 0.312500 0.187500 -0.312500 -v -0.500000 0.187500 -0.316406 -v -0.500000 -0.078125 1.312500 -v 0.312500 -0.078125 1.312500 -v -0.500000 0.187500 1.316406 -v 0.312500 0.187500 1.312500 -v 0.312500 0.187500 1.500000 -v -0.500000 0.187500 1.496094 -v -0.500000 -0.078125 0.500000 -v 0.500000 0.437500 0.500000 -v 0.312500 0.437500 0.500000 -v 0.312500 -0.078125 0.500000 -v 0.312500 0.234375 1.464844 -v -0.500000 0.218750 -0.464844 -v 0.312500 0.234375 -0.347656 -v -0.500000 0.218750 -0.347656 -v -0.500000 0.234375 1.406250 -v 0.312500 0.250000 1.406250 -v -0.500000 0.234375 -0.406250 -v 0.312500 0.250000 -0.406250 -v 0.406250 0.476562 -0.500000 -v 0.406250 0.476562 1.500000 -v 0.406250 0.500000 0.500000 -v 0.464844 0.460938 -0.500000 -v 0.347656 0.460938 1.500000 -v 0.347656 0.484375 0.500000 -v 0.347656 0.460938 -0.500000 -v 0.464844 0.460938 1.500000 -v 0.464844 0.484375 0.500000 -v 0.312500 -0.039062 0.906250 -v 0.312500 -0.039062 0.093750 -v -0.500000 -0.039062 0.093750 -v -0.500000 -0.039062 0.906250 -v 0.312500 -0.046875 0.562500 -v -0.500000 -0.046875 1.250000 -v 0.312500 -0.046875 0.437500 -v -0.500000 -0.046875 0.437500 -v -0.500000 -0.046875 -0.250000 -v 0.312500 -0.046875 -0.250000 -v 0.312500 -0.046875 1.250000 -v -0.500000 -0.046875 0.562500 -v -0.437500 0.000000 0.093750 -v -0.437500 0.000000 0.906250 -v -0.437500 -0.062500 -0.312500 -v -0.437500 -0.062500 1.312500 -v -0.437500 -0.062500 0.500000 -v -0.437500 -0.015625 0.562500 -v -0.437500 -0.015625 -0.250000 -v -0.437500 -0.015625 1.250000 -v -0.437500 -0.015625 0.437500 -v 0.250000 0.000000 0.093750 -v 0.250000 0.000000 0.906250 -v 0.250000 -0.062500 -0.312500 -v 0.250000 -0.015625 0.562500 -v 0.250000 -0.015625 -0.250000 -v 0.250000 -0.015625 1.250000 -v 0.250000 -0.015625 0.437500 -v 0.250000 -0.062500 1.312500 -v 0.250000 -0.062500 0.500000 -v 0.228538 -0.153004 2.426160 -v -0.437500 0.187500 -0.500000 -v -0.437500 0.187500 -0.312500 -v -0.437500 0.187500 1.312500 -v -0.437500 0.187500 1.500000 -v -0.437500 0.234375 -0.464844 -v -0.437500 0.234375 1.347656 -v -0.437500 0.234375 -0.347656 -v -0.437500 0.234375 1.464844 -v -0.437500 0.250000 -0.406250 -v -0.437500 0.250000 1.406250 -v 0.312500 0.437500 -0.437500 -v 0.500000 0.437500 1.437500 -v 0.500000 0.437500 -0.437500 -v 0.312500 0.437500 1.437500 -v 0.406250 0.500000 1.437500 -v 0.406250 0.500000 -0.437500 -v 0.347656 0.484375 -0.437500 -v 0.347656 0.484375 1.437500 -v 0.464844 0.484375 1.437500 -v 0.464844 0.484375 -0.437500 -v 0.500000 -0.187500 0.500000 -v 0.500000 -0.187500 1.500000 -v 0.500000 -0.187500 -0.500000 -v -0.500000 -0.187500 1.500000 -v -0.500000 -0.187500 0.500000 -v -0.500000 -0.187500 -0.500000 -v -0.500000 -0.375000 1.500000 -v 0.500000 -0.375000 1.500000 -v 0.500000 -0.375000 -0.500000 -v -0.500000 -0.375000 -0.500000 -v -0.437500 -0.500000 -0.437500 -v -0.375000 -0.500000 -0.437500 -v -0.375000 -0.500000 -0.375000 -v -0.437500 -0.500000 -0.375000 -v -0.437500 -0.375000 -0.437500 -v -0.375000 -0.375000 -0.437500 -v -0.375000 -0.375000 -0.375000 -v -0.437500 -0.375000 -0.375000 -v -0.437500 -0.500000 1.375000 -v -0.375000 -0.500000 1.375000 -v -0.375000 -0.500000 1.437500 -v -0.437500 -0.500000 1.437500 -v -0.437500 -0.375000 1.375000 -v -0.375000 -0.375000 1.375000 -v -0.375000 -0.375000 1.437500 -v -0.437500 -0.375000 1.437500 -v 0.375000 -0.500000 -0.437500 -v 0.437500 -0.500000 -0.437500 -v 0.437500 -0.500000 -0.375000 -v 0.375000 -0.500000 -0.375000 -v 0.375000 -0.375000 -0.437500 -v 0.437500 -0.375000 -0.437500 +v 0.464844 -0.312500 0.234375 +v -1.347656 0.500000 0.218750 +v -1.347656 -0.312500 0.234375 +v -1.464844 0.500000 0.218750 +v 0.500000 -0.316406 0.421875 +v 0.500000 -0.496094 0.421875 +v -1.500000 -0.496094 0.421875 +v -1.500000 -0.316407 0.421875 +v 0.312500 -0.312500 -0.078125 +v 0.312500 0.500000 -0.078125 +v 0.496094 0.500000 0.187500 +v 0.500000 -0.312500 0.187500 +v 0.312500 -0.312500 0.187500 +v 0.316406 0.500000 0.187500 +v -1.312500 0.500000 -0.078125 +v -1.312500 -0.312500 -0.078125 +v -1.316406 0.500000 0.187500 +v -1.312500 -0.312500 0.187500 +v -1.500000 -0.312500 0.187500 +v -1.496094 0.500000 0.187500 +v -0.500000 0.500000 -0.078125 +v -0.500000 -0.500000 0.437500 +v -0.500000 -0.312500 0.437500 +v -0.500000 -0.312500 -0.078125 +v -1.464844 -0.312500 0.234375 +v 0.464844 0.500000 0.218750 +v 0.347656 -0.312500 0.234375 +v 0.347656 0.500000 0.218750 +v -1.406250 0.500000 0.234375 +v -1.406250 -0.312500 0.250000 +v 0.406250 0.500000 0.234375 +v 0.406250 -0.312500 0.250000 +v 0.500000 -0.406250 0.476562 +v -1.500000 -0.406250 0.476562 +v -0.500000 -0.406250 0.500000 +v 0.500000 -0.464844 0.460938 +v -1.500000 -0.347657 0.460938 +v -0.500000 -0.347656 0.484375 +v 0.500000 -0.347656 0.460938 +v -1.500000 -0.464844 0.460938 +v -0.500000 -0.464844 0.484375 +v -0.906250 -0.312500 -0.039062 +v -0.093750 -0.312500 -0.039062 +v -0.093750 0.500000 -0.039062 +v -0.906250 0.500000 -0.039062 +v -0.562500 -0.312500 -0.046875 +v -1.250000 0.500000 -0.046875 +v -0.437500 -0.312500 -0.046875 +v -0.437500 0.500000 -0.046875 +v 0.250000 0.500000 -0.046875 +v 0.250000 -0.312500 -0.046875 +v -1.250000 -0.312500 -0.046875 +v -0.562500 0.500000 -0.046875 +v -0.093750 0.437500 0.000000 +v -0.906250 0.437500 0.000000 +v 0.312500 0.437500 -0.062500 +v -1.312500 0.437500 -0.062500 +v -0.500000 0.437500 -0.062500 +v -0.562500 0.437500 -0.015625 +v 0.250000 0.437500 -0.015625 +v -1.250000 0.437500 -0.015625 +v -0.437500 0.437500 -0.015625 +v -0.093750 -0.250000 0.000000 +v -0.906250 -0.250000 0.000000 +v 0.312500 -0.250000 -0.062500 +v -0.562500 -0.250000 -0.015625 +v 0.250000 -0.250000 -0.015625 +v -1.250000 -0.250000 -0.015625 +v -0.437500 -0.250000 -0.015625 +v -1.312500 -0.250000 -0.062500 +v -0.500000 -0.250000 -0.062500 +v -2.426160 -0.228538 -0.153004 +v 0.500000 0.437500 0.187500 +v 0.312500 0.437500 0.187500 +v -1.312500 0.437500 0.187500 +v -1.500000 0.437500 0.187500 +v 0.464844 0.437500 0.234375 +v -1.347656 0.437500 0.234375 +v 0.347656 0.437500 0.234375 +v -1.464844 0.437500 0.234375 +v 0.406250 0.437500 0.250000 +v -1.406250 0.437500 0.250000 +v 0.437500 -0.312500 0.437500 +v -1.437500 -0.500000 0.437500 +v 0.437500 -0.500000 0.437500 +v -1.437500 -0.312500 0.437500 +v -1.437500 -0.406250 0.500000 +v 0.437500 -0.406250 0.500000 +v 0.437500 -0.347656 0.484375 +v -1.437500 -0.347657 0.484375 +v -1.437500 -0.464844 0.484375 +v 0.437500 -0.464844 0.484375 +v -0.500000 -0.500000 -0.187500 +v -1.500000 -0.500000 -0.187500 +v 0.500000 -0.500000 -0.187500 +v -1.500000 0.500000 -0.187500 +v -0.500000 0.500000 -0.187500 +v 0.500000 0.500000 -0.187500 +v -1.500000 0.500000 -0.375000 +v -1.500000 -0.500000 -0.375000 +v 0.500000 -0.500000 -0.375000 +v 0.500000 0.500000 -0.375000 +v 0.437500 0.437500 -0.500000 +v 0.437500 0.375000 -0.500000 +v 0.375000 0.375000 -0.500000 +v 0.375000 0.437500 -0.500000 +v 0.437500 0.437500 -0.375000 +v 0.437500 0.375000 -0.375000 +v 0.375000 0.375000 -0.375000 +v 0.375000 0.437500 -0.375000 +v -1.375000 0.437500 -0.500000 +v -1.375000 0.375000 -0.500000 +v -1.437500 0.375000 -0.500000 +v -1.437500 0.437500 -0.500000 +v -1.375000 0.437500 -0.375000 +v -1.375000 0.375000 -0.375000 +v -1.437500 0.375000 -0.375000 +v -1.437500 0.437500 -0.375000 +v 0.437500 -0.375000 -0.500000 +v 0.437500 -0.437500 -0.500000 +v 0.375000 -0.437500 -0.500000 +v 0.375000 -0.375000 -0.500000 v 0.437500 -0.375000 -0.375000 +v 0.437500 -0.437500 -0.375000 +v 0.375000 -0.437500 -0.375000 v 0.375000 -0.375000 -0.375000 -v 0.375000 -0.500000 1.375000 -v 0.437500 -0.500000 1.375000 -v 0.437500 -0.500000 1.437500 -v 0.375000 -0.500000 1.437500 -v 0.375000 -0.375000 1.375000 -v 0.437500 -0.375000 1.375000 -v 0.437500 -0.375000 1.437500 -v 0.375000 -0.375000 1.437500 -v 0.500000 -0.375000 0.500000 -v -0.500000 -0.375000 0.500000 +v -1.375000 -0.375000 -0.500000 +v -1.375000 -0.437500 -0.500000 +v -1.437500 -0.437500 -0.500000 +v -1.437500 -0.375000 -0.500000 +v -1.375000 -0.375000 -0.375000 +v -1.375000 -0.437500 -0.375000 +v -1.437500 -0.437500 -0.375000 +v -1.437500 -0.375000 -0.375000 +v -0.500000 -0.500000 -0.375000 +v -0.500000 0.500000 -0.375000 vt 0.250000 0.383435 vt 0.265625 0.375706 vt 0.265625 0.503232 @@ -347,92 +347,92 @@ vt 0.062500 0.062500 vt 0.125000 0.062500 vt 0.875000 0.062500 vt 0.937500 0.062500 -vn -1.000000 0.000000 0.000000 -vn -0.948700 0.316200 0.000000 -vn 0.536500 0.831000 -0.146800 -vn 0.937700 0.338900 -0.075700 -vn 0.694400 0.205200 -0.689700 -vn 0.392500 0.537600 -0.746300 -vn -0.035700 0.329600 0.943400 -vn 0.000000 -0.000000 1.000000 -vn -0.785700 0.195600 0.586900 -vn -0.090600 0.839600 -0.535500 -vn -0.779600 0.517700 -0.352300 -vn -0.105900 0.156900 -0.981900 -vn -0.042000 0.330000 -0.943000 -vn -0.017300 0.004100 0.999800 -vn -0.788400 0.511400 -0.341800 -vn -0.785700 0.195600 -0.586900 -vn -0.035700 0.329600 -0.943400 -vn 0.251500 0.967800 0.000000 -vn 0.207400 0.930000 0.303500 -vn 0.404200 0.866700 0.292300 -vn 0.490300 0.871600 -0.000000 -vn 0.193100 0.981200 0.000000 -vn 0.351100 0.936300 -0.000000 -vn -0.251500 0.967800 0.000000 -vn -0.860000 0.510300 0.000000 -vn -0.805300 0.561700 0.189400 -vn -0.207400 0.930000 0.303500 -vn -0.119800 0.992800 0.000000 -vn -0.760700 0.649000 0.002000 -vn -0.973400 0.205400 -0.101100 -vn -0.160300 0.814600 0.557500 -vn -0.760700 0.649000 -0.002000 -vn -0.788400 0.511400 0.341800 -vn -0.090600 0.839600 0.535500 -vn -0.559600 0.828700 0.000000 -vn -0.536500 0.831000 -0.146800 -vn -0.940200 0.331200 -0.079300 -vn -0.699900 0.200500 -0.685500 -vn -0.042000 0.330000 0.943000 -vn -0.105900 0.156900 0.981900 -vn -0.779600 0.517700 0.352300 -vn 0.160300 0.814600 -0.557500 -vn 0.207400 0.930000 -0.303500 -vn 0.404200 0.866700 -0.292300 -vn 0.303000 0.808100 -0.505100 -vn -0.699900 0.200500 0.685500 -vn -0.207400 0.930000 -0.303500 -vn -0.805300 0.561700 -0.189400 -vn -0.641000 0.000000 0.767600 -vn -0.655400 0.266200 0.706800 -vn -0.973400 0.205400 0.101100 -vn -0.392500 0.537600 0.746300 -vn 0.000000 0.626800 0.779200 -vn -0.536500 0.831000 0.146800 -vn -0.940200 0.331200 0.079300 -vn 0.392500 0.537600 0.746300 -vn 0.536500 0.831000 0.146800 -vn 0.000000 0.984800 0.173500 -vn 0.000000 1.000000 0.000000 -vn 0.559600 0.828700 0.000000 -vn 0.000000 0.984800 -0.173500 -vn 0.000000 0.000000 -1.000000 -vn -0.017300 0.004100 -0.999800 -vn -0.641000 0.000000 -0.767600 -vn -0.655400 0.266200 -0.706800 -vn -0.718100 0.578400 0.386900 -vn -0.661600 0.265500 0.701300 -vn -0.741200 0.671300 0.000000 -vn -0.718100 0.578400 -0.386900 -vn 0.000000 0.626800 -0.779200 -vn -0.392500 0.537600 -0.746300 -vn -0.160300 0.814600 -0.557500 -vn 0.160300 0.814600 0.557500 -vn -0.902600 0.430500 0.000000 -vn -0.193100 0.981200 0.000000 -vn 0.303000 0.808100 0.505100 -vn -0.707100 0.000800 0.707100 -vn -0.661600 0.265500 -0.701300 -vn 0.694400 0.205200 0.689700 -vn 0.937700 0.338900 0.075700 -vn 0.948700 0.316200 0.000000 -vn 0.707100 0.000300 0.707100 -vn 0.707100 0.000300 -0.707100 -vn -0.707100 0.000800 -0.707100 -vn 1.000000 0.000000 -0.000000 +vn -0.000000 1.000000 0.000000 +vn 0.000000 0.948700 0.316200 +vn 0.146800 -0.536500 0.831000 +vn 0.075700 -0.937700 0.338900 +vn 0.689700 -0.694400 0.205200 +vn 0.746300 -0.392500 0.537600 +vn -0.943400 0.035700 0.329600 +vn -1.000000 -0.000000 0.000000 +vn -0.586900 0.785700 0.195600 +vn 0.535500 0.090600 0.839600 +vn 0.352300 0.779600 0.517700 +vn 0.981900 0.105900 0.156900 +vn 0.943000 0.042000 0.330000 +vn -0.999800 0.017300 0.004100 +vn 0.341800 0.788400 0.511400 +vn 0.586900 0.785700 0.195600 +vn 0.943400 0.035700 0.329600 +vn 0.000000 -0.251500 0.967800 +vn -0.303500 -0.207400 0.930000 +vn -0.292300 -0.404200 0.866700 +vn 0.000000 -0.490300 0.871600 +vn 0.000000 -0.193100 0.981200 +vn 0.000000 -0.351100 0.936300 +vn 0.000000 0.251500 0.967800 +vn 0.000000 0.860000 0.510300 +vn -0.189400 0.805300 0.561700 +vn -0.303500 0.207400 0.930000 +vn 0.000000 0.119800 0.992800 +vn -0.002000 0.760700 0.649000 +vn 0.101100 0.973400 0.205400 +vn -0.557500 0.160300 0.814600 +vn 0.002000 0.760700 0.649000 +vn -0.341800 0.788400 0.511400 +vn -0.535500 0.090600 0.839600 +vn 0.000000 0.559600 0.828700 +vn 0.146800 0.536500 0.831000 +vn 0.079300 0.940200 0.331200 +vn 0.685500 0.699900 0.200500 +vn -0.943000 0.042000 0.330000 +vn -0.981900 0.105900 0.156900 +vn -0.352300 0.779600 0.517700 +vn 0.557500 -0.160300 0.814600 +vn 0.303500 -0.207400 0.930000 +vn 0.292300 -0.404200 0.866700 +vn 0.505100 -0.303000 0.808100 +vn -0.685500 0.699900 0.200500 +vn 0.303500 0.207400 0.930000 +vn 0.189400 0.805300 0.561700 +vn -0.767600 0.641000 0.000000 +vn -0.706800 0.655400 0.266200 +vn -0.101100 0.973400 0.205400 +vn -0.746300 0.392500 0.537600 +vn -0.779200 0.000000 0.626800 +vn -0.146800 0.536500 0.831000 +vn -0.079300 0.940200 0.331200 +vn -0.746300 -0.392500 0.537600 +vn -0.146800 -0.536500 0.831000 +vn -0.173500 0.000000 0.984800 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.559600 0.828700 +vn 0.173500 0.000000 0.984800 +vn 1.000000 0.000000 0.000000 +vn 0.999800 0.017300 0.004100 +vn 0.767600 0.641000 0.000000 +vn 0.706800 0.655400 0.266200 +vn -0.386900 0.718100 0.578400 +vn -0.701300 0.661600 0.265500 +vn 0.000000 0.741200 0.671300 +vn 0.386900 0.718100 0.578400 +vn 0.779200 0.000000 0.626800 +vn 0.746300 0.392500 0.537600 +vn 0.557500 0.160300 0.814600 +vn -0.557500 -0.160300 0.814600 +vn 0.000000 0.902600 0.430500 +vn 0.000000 0.193100 0.981200 +vn -0.505100 -0.303000 0.808100 +vn -0.707100 0.707100 0.000800 +vn 0.701300 0.661600 0.265500 +vn -0.689700 -0.694400 0.205200 +vn -0.075700 -0.937700 0.338900 +vn 0.000000 -0.948700 0.316200 +vn -0.707100 -0.707100 0.000300 +vn 0.707100 -0.707100 0.000300 +vn 0.707100 0.707100 0.000800 vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 g Cylinder_Cylinder_upholstery s 1 f 48/1/1 24/2/1 23/3/2 diff --git a/lrfurn/sofas.lua b/lrfurn/sofas.lua index bc071c2..b05414c 100644 --- a/lrfurn/sofas.lua +++ b/lrfurn/sofas.lua @@ -1,87 +1,129 @@ - -local sofa_sbox = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 1.5} -} +local S = homedecor_i18n.gettext local sofa_cbox = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0, 1.5 }, - {-0.5, -0.5, 0.5, -0.4, 0.5, 1.5 } - } + type = "wallmounted", + wall_side = {-0.5, -0.5, -0.5, 0.5, 0.5, 1.5} } -for i in ipairs(lrfurn.colors) do - local colour = lrfurn.colors[i][1] - local hue = lrfurn.colors[i][2] - - minetest.register_node("lrfurn:sofa_"..colour, { - description = "Sofa ("..colour..")", - drawtype = "mesh", - mesh = "lrfurn_sofa_short.obj", - tiles = { - "lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png", - "lrfurn_sofa_bottom.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - selection_box = sofa_sbox, - node_box = sofa_cbox, - on_rotate = screwdriver.disallow, - - after_place_node = function(pos, placer, itemstack, pointed_thing) - if minetest.is_protected(pos, placer:get_player_name()) then return true end - - local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) - - if lrfurn.check_forward(pos, fdir, false, placer) then - minetest.set_node(pos, {name = "lrfurn:sofa_"..colour, param2 = fdir}) - itemstack:take_item() - else - minetest.chat_send_player(placer:get_player_name(), "No room to place the sofa!") - minetest.set_node(pos, { name = "air" }) +minetest.register_node("lrfurn:sofa", { + description = S("Sofa"), + drawtype = "mesh", + mesh = "lrfurn_sofa_short.obj", + tiles = { + "lrfurn_upholstery.png", + { name = "lrfurn_sofa_bottom.png", color = 0xffffffff } + }, + paramtype = "light", + paramtype2 = "colorwallmounted", + palette = "unifieddyes_palette_colorwallmounted.png", + inventory_image = "lrfurn_sofa_inv.png", + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + selection_box = sofa_cbox, + node_box = sofa_cbox, + on_rotate = screwdriver.disallow, + after_place_node = function(pos, placer, itemstack, pointed_thing) + lrfurn.fix_rotation(pos, placer, itemstack, pointed_thing) + if minetest.is_protected(pos, placer:get_player_name()) then return true end - end - return itemstack - end, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) + + if lrfurn.check_forward(pos, fdir, false, placer) then + itemstack:take_item() + else + minetest.chat_send_player(placer:get_player_name(), S("No room to place the sofa!")) + minetest.set_node(pos, { name = "air" }) + end + return itemstack + end, + after_dig_node = unifieddyes.after_dig_node, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + local itemname = itemstack:get_name() + if string.find(itemname, "dye:") or string.find(itemname, "unifieddyes:") then + unifieddyes.on_rightclick(pos, node, clicker, + itemstack, pointed_thing, "lrfurn:sofa", "wallmounted") + else if not clicker:is_player() then return itemstack end + pos.y = pos.y-0.5 clicker:setpos(pos) clicker:set_hp(20) return itemstack end - }) - - minetest.register_alias("lrfurn:sofa_left_"..colour, "air") - minetest.register_alias("lrfurn:sofa_right_"..colour, "lrfurn:sofa_"..colour) - - minetest.register_craft({ - output = "lrfurn:sofa_"..colour, - recipe = { - {"wool:"..colour, "wool:"..colour, "", }, - {"stairs:slab_wood", "stairs:slab_wood", "", }, - {"group:stick", "group:stick", "", } - } - }) - - minetest.register_craft({ - output = "lrfurn:sofa_"..colour, - recipe = { - {"wool:"..colour, "wool:"..colour, "", }, - {"moreblocks:slab_wood", "moreblocks:slab_wood", "", }, - {"group:stick", "group:stick", "", } - } - }) + end +}) + +minetest.register_craft({ + output = "lrfurn:sofa", + recipe = { + {"wool:white", "wool:white", "", }, + {"stairs:slab_wood", "stairs:slab_wood", "", }, + {"group:stick", "group:stick", "", } + } +}) + +minetest.register_craft({ + output = "lrfurn:sofa", + recipe = { + {"wool:white", "wool:white", "", }, + {"moreblocks:slab_wood", "moreblocks:slab_wood", "", }, + {"group:stick", "group:stick", "", } + } +}) +-- convert old static nodes to param2 color + +lrfurn.old_static_sofas = {} + +for _, color in ipairs(lrfurn.colors) do + table.insert(lrfurn.old_static_sofas, "lrfurn:sofa_"..color) end +minetest.register_lbm({ + name = "lrfurn:convert_sofas", + label = "Convert lrfurn short sofas to use param2 color", + run_at_every_load = true, + nodenames = lrfurn.old_static_sofas, + action = function(pos, node) + local name = node.name + local color = string.sub(name, string.find(name, "_")+1) + + if color == "red" then + color = "medium_red" + elseif color == "dark_green" then + color = "medium_green" + elseif color == "magenta" then + color = "medium_magenta" + elseif color == "cyan" then + color = "medium_cyan" + end + + local paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted") + local old_fdir = math.floor(node.param2 % 32) + local new_fdir = 3 + + if old_fdir == 0 then + new_fdir = 3 + elseif old_fdir == 1 then + new_fdir = 4 + elseif old_fdir == 2 then + new_fdir = 2 + elseif old_fdir == 3 then + new_fdir = 5 + end + + local param2 = paletteidx + new_fdir + + minetest.set_node(pos, { name = "lrfurn:sofa", param2 = param2 }) + local meta = minetest.get_meta(pos) + meta:set_string("dye", "unifieddyes:"..color) + + end +}) + if minetest.setting_get("log_mods") then - minetest.log("action", "sofas loaded") + minetest.log("action", "[lrfurn/sofas] "..S("Loaded!")) end diff --git a/lrfurn/textures/lrfurn_armchair_inv.png b/lrfurn/textures/lrfurn_armchair_inv.png Binary files differnew file mode 100644 index 0000000..cc6b87b --- /dev/null +++ b/lrfurn/textures/lrfurn_armchair_inv.png diff --git a/lrfurn/textures/lrfurn_longsofa_inv.png b/lrfurn/textures/lrfurn_longsofa_inv.png Binary files differnew file mode 100644 index 0000000..37bde8b --- /dev/null +++ b/lrfurn/textures/lrfurn_longsofa_inv.png diff --git a/lrfurn/textures/lrfurn_sofa_inv.png b/lrfurn/textures/lrfurn_sofa_inv.png Binary files differnew file mode 100644 index 0000000..a4f7f6f --- /dev/null +++ b/lrfurn/textures/lrfurn_sofa_inv.png diff --git a/lrfurn/textures/lrfurn_upholstery.png b/lrfurn/textures/lrfurn_upholstery.png Binary files differnew file mode 100644 index 0000000..6db36a8 --- /dev/null +++ b/lrfurn/textures/lrfurn_upholstery.png |
