From 6cadc7cf263a45edf269390d846d725093aecf3a Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Mon, 30 Jan 2017 16:46:04 -0500 Subject: [PATCH] convert lrfurn to use param2 colorization To maximize the palette, this uses the colorwallmounted param2 style, which necessitated modifying the models to make wallmounted look like normal facedir. This means couches and chairs can now only ever be placed upright, facing one of N/S/E/W like a couch or chair normally would, but since the screwdriver was already disabled, it was basically impossible to rotate them to any other orientation anyway. Since this is colorwallmounted, it uses the 32-color abridged Unified Dyes palette. --- lrfurn/armchairs.lua | 124 ++++-- lrfurn/depends.txt | 1 + lrfurn/init.lua | 39 +- lrfurn/longsofas.lua | 167 +++++--- lrfurn/models/lrfurn_armchair.obj | 478 ++++++++++----------- lrfurn/models/lrfurn_sofa_long.obj | 544 ++++++++++++------------ lrfurn/models/lrfurn_sofa_short.obj | 440 +++++++++---------- lrfurn/sofas.lua | 166 +++++--- lrfurn/textures/lrfurn_armchair_inv.png | Bin 0 -> 6841 bytes lrfurn/textures/lrfurn_longsofa_inv.png | Bin 0 -> 4423 bytes lrfurn/textures/lrfurn_sofa_inv.png | Bin 0 -> 5297 bytes 11 files changed, 1053 insertions(+), 906 deletions(-) create mode 100644 lrfurn/textures/lrfurn_armchair_inv.png create mode 100644 lrfurn/textures/lrfurn_longsofa_inv.png create mode 100644 lrfurn/textures/lrfurn_sofa_inv.png diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua index 1c32924..ec665e0 100644 --- a/lrfurn/armchairs.lua +++ b/lrfurn/armchairs.lua @@ -1,6 +1,5 @@ local S = homedecor_i18n.gettext - local armchair_cbox = { type = "fixed", fixed = { @@ -9,23 +8,29 @@ local armchair_cbox = { } } -for i, c in ipairs(lrfurn.colors) do - local colour, coldesc, hue = unpack(c) - - minetest.register_node("lrfurn:armchair_"..colour, { - description = S("Armchair (@1)", coldesc), - drawtype = "mesh", - mesh = "lrfurn_armchair.obj", - tiles = { - { name = "lrfurn_upholstery.png", color = hue }, - "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 = "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 @@ -34,28 +39,77 @@ for i, c in ipairs(lrfurn.colors) do clicker:set_hp(20) return itemstack end - }) + end +}) - minetest.register_craft({ - output = "lrfurn:armchair_"..colour, - recipe = { - {"wool:"..colour, "", "", }, - {"stairs:slab_wood", "", "", }, - {"group:stick", "", "", } - } - }) +minetest.register_craft({ + output = "lrfurn:armchair", + recipe = { + {"wool:white", "", "", }, + {"stairs:slab_wood", "", "", }, + {"group:stick", "", "", } + } +}) - minetest.register_craft({ - output = "lrfurn:armchair_"..colour, - recipe = { - {"wool:"..colour, "", "", }, - {"moreblocks: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", "[lrfurn/armchairs] "..S("Loaded!")) end diff --git a/lrfurn/depends.txt b/lrfurn/depends.txt index e7bb2cf..973de17 100644 --- a/lrfurn/depends.txt +++ b/lrfurn/depends.txt @@ -1,3 +1,4 @@ default wool homedecor_i18n +unifieddyes diff --git a/lrfurn/init.lua b/lrfurn/init.lua index 9c44604..6434136 100644 --- a/lrfurn/init.lua +++ b/lrfurn/init.lua @@ -12,21 +12,21 @@ lrfurn.fdir_to_fwd = { } lrfurn.colors = { - { "black", S("black"), 0xff181818 }, - { "brown", S("brown"), 0xff251005 }, - { "blue", S("blue"), 0xff0000d0 }, - { "cyan", S("cyan"), 0xff009fa7 }, - { "dark_grey", S("dark grey"), 0xff101010 }, - { "dark_green", S("dark green"), 0xff007000 }, - { "green", S("green"), 0xff00d000 }, - { "grey", S("grey"), 0xff303030 }, - { "magenta", S("magenta"), 0xffe0048b }, - { "orange", S("orange"), 0xffee9000 }, - { "pink", S("pink"), 0xffff90b0 }, - { "red", S("red"), 0xff800000 }, - { "violet", S("violet"), 0xff9000d0 }, - { "white", S("white"), 0xffffffff }, - { "yellow", S("yellow"), 0xffdde000 } + "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) @@ -60,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 ba087fb..d9c506b 100644 --- a/lrfurn/longsofas.lua +++ b/lrfurn/longsofas.lua @@ -1,88 +1,129 @@ local S = homedecor_i18n.gettext -local longsofa_sbox = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 2.5} -} - 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, c in ipairs(lrfurn.colors) do - local colour, coldesc, hue = unpack(c) +minetest.register_node("lrfurn:longsofa", { + description = "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 - minetest.register_node("lrfurn:longsofa_"..colour, { - description = S("Long Sofa (@1)", coldesc), - drawtype = "mesh", - mesh = "lrfurn_sofa_long.obj", - tiles = { - { name = "lrfurn_upholstery.png", color = hue }, - "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, + local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) - 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(), - S("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) + if lrfurn.check_forward(pos, fdir, true, placer) then + 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, + 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 - }) + 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", + 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_"..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", + recipe = { + {"wool:white", "wool:white", "wool:white", }, + {"moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks: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", } - } - }) +-- 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", "[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 41d625a..725eac4 100644 --- a/lrfurn/sofas.lua +++ b/lrfurn/sofas.lua @@ -1,87 +1,129 @@ local S = homedecor_i18n.gettext -local sofa_sbox = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 1.5} -} - 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, c in ipairs(lrfurn.colors) do - local colour, coldesc, hue = unpack(c) +minetest.register_node("lrfurn:sofa", { + description = "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 - minetest.register_node("lrfurn:sofa_"..colour, { - description = S("Sofa (@1)", coldesc), - drawtype = "mesh", - mesh = "lrfurn_sofa_short.obj", - tiles = { - { name = "lrfurn_upholstery.png", color = hue }, - "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, + local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false) - 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" }) - - end - return itemstack - end, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + if lrfurn.check_forward(pos, fdir, false, placer) then + 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, + 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 - }) + 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", + recipe = { + {"wool:white", "wool:white", "", }, + {"stairs:slab_wood", "stairs:slab_wood", "", }, + {"group:stick", "group:stick", "", } + } +}) - 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", + recipe = { + {"wool:white", "wool:white", "", }, + {"moreblocks:slab_wood", "moreblocks: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", "", } - } - }) +-- 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", "[lrfurn/sofas] "..S("Loaded!")) end diff --git a/lrfurn/textures/lrfurn_armchair_inv.png b/lrfurn/textures/lrfurn_armchair_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..cc6b87b4660548cfb0c92d61246d72ebc14a8946 GIT binary patch literal 6841 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 literal 0 HcmV?d00001 diff --git a/lrfurn/textures/lrfurn_longsofa_inv.png b/lrfurn/textures/lrfurn_longsofa_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..37bde8bc3a0242f2fc66d9b87d8272014610924d GIT binary patch literal 4423 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 N002ovPDHLkV1f=(lS%*p literal 0 HcmV?d00001 diff --git a/lrfurn/textures/lrfurn_sofa_inv.png b/lrfurn/textures/lrfurn_sofa_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..a4f7f6facc6b4b5e3e53631284454b8f9a58c8cc GIT binary patch literal 5297 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 DRnyU8 literal 0 HcmV?d00001