From 65fce91b5c5cd26c945bec2b4073df8664b9a8e4 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Mon, 27 May 2019 15:07:25 -0400 Subject: update digistuff, farming, homedecor, signs_lib, simple streetlights --- lrfurn/README.txt | 67 --- lrfurn/armchairs.lua | 121 ----- lrfurn/coffeetable.lua | 79 --- lrfurn/depends.txt | 4 - lrfurn/endtable.lua | 53 -- lrfurn/init.lua | 75 --- lrfurn/longsofas.lua | 136 ----- lrfurn/models/lrfurn_armchair.obj | 575 --------------------- lrfurn/models/lrfurn_sofa_long.obj | 715 --------------------------- lrfurn/models/lrfurn_sofa_short.obj | 595 ---------------------- lrfurn/sofas.lua | 136 ----- lrfurn/textures/lrfurn_armchair_inv.png | Bin 6841 -> 0 bytes lrfurn/textures/lrfurn_coffeetable_back.png | Bin 488 -> 0 bytes lrfurn/textures/lrfurn_coffeetable_front.png | Bin 473 -> 0 bytes lrfurn/textures/lrfurn_longsofa_inv.png | Bin 4423 -> 0 bytes lrfurn/textures/lrfurn_sofa_bottom.png | Bin 642 -> 0 bytes lrfurn/textures/lrfurn_sofa_inv.png | Bin 5297 -> 0 bytes lrfurn/textures/lrfurn_upholstery.png | Bin 2309 -> 0 bytes 18 files changed, 2556 deletions(-) delete mode 100644 lrfurn/README.txt delete mode 100644 lrfurn/armchairs.lua delete mode 100644 lrfurn/coffeetable.lua delete mode 100644 lrfurn/depends.txt delete mode 100644 lrfurn/endtable.lua delete mode 100644 lrfurn/init.lua delete mode 100644 lrfurn/longsofas.lua delete mode 100644 lrfurn/models/lrfurn_armchair.obj delete mode 100644 lrfurn/models/lrfurn_sofa_long.obj delete mode 100644 lrfurn/models/lrfurn_sofa_short.obj delete mode 100644 lrfurn/sofas.lua delete mode 100644 lrfurn/textures/lrfurn_armchair_inv.png delete mode 100644 lrfurn/textures/lrfurn_coffeetable_back.png delete mode 100644 lrfurn/textures/lrfurn_coffeetable_front.png delete mode 100644 lrfurn/textures/lrfurn_longsofa_inv.png delete mode 100644 lrfurn/textures/lrfurn_sofa_bottom.png delete mode 100644 lrfurn/textures/lrfurn_sofa_inv.png delete mode 100644 lrfurn/textures/lrfurn_upholstery.png (limited to 'lrfurn') diff --git a/lrfurn/README.txt b/lrfurn/README.txt deleted file mode 100644 index c86df3c..0000000 --- a/lrfurn/README.txt +++ /dev/null @@ -1,67 +0,0 @@ -Living Room Furniture (lrfurn) mod for Minetest - - -by thefamilygrog66 - -Description: -Coloured Long Sofas (3 blocks wide), Sofas (2 blocks wide), Armchairs, Coffee Tables and End Tables, loosely based on PilzAdam's beds mod. There are 9 colours in all: red, orange, yellow, green, blue, violet, black, grey and white. - -When you right-click on a long sofa, sofa or armchair, it transports you onto it, and replenishes your HP. Good if you've just escaped nasty mobs, didn't fare so well in battle, or just had a bad fall. The coffee table - which isn't coloured, just wooden - is pretty much just for decoration. It stands half a block high and nearly 2 blocks long. The end table is similar to the coffee table, though roughly half the length (i.e. only one block) and square. - -Recipes: - - Long Sofa - - +---------------+---------------+---------------+ - | coloured wool | coloured wool | coloured wool | - +---------------+---------------+---------------+ - | wood slab | wood slab | wood slab | - +---------------+---------------+---------------+ - | stick | stick | stick | - +---------------+---------------+---------------+ - - Sofa - - +---------------+---------------+-------+ - | coloured wool | coloured wool | | - +---------------+---------------+-------+ - | wood slab | wood slab | | - +---------------+---------------+-------+ - | stick | stick | | - +---------------+---------------+-------+ - - Armchair - - +---------------+-------+-------+ - | coloured wool | | | - +---------------+-------+-------+ - | wood slab | | | - +---------------+-------+-------+ - | stick | | | - +---------------+-------+-------+ - - Coffee Table (only wood texture) - - +-----------+-----------+-----------+ - | | | | - +-----------+-----------+-----------+ - | wood slab | wood slab | wood slab | - +-----------+-----------+-----------+ - | stick | | stick | - +-----------+-----------+-----------+ - - End Table (only wood texture) - - +-----------+-----------+-----------+ - | | | | - +-----------+-----------+-----------+ - | wood slab | wood slab | | - +-----------+-----------+-----------+ - | stick | stick | | - +-----------+-----------+-----------+ - - -Mod dependencies: default, wool - -See also: -http://minetest.net/ diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua deleted file mode 100644 index 6950cad..0000000 --- a/lrfurn/armchairs.lua +++ /dev/null @@ -1,121 +0,0 @@ - -local S = homedecor.gettext -local armchair_cbox = { - type = "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 } - } -} - -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, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), - node_box = armchair_cbox, - after_place_node = function(pos, placer, itemstack, pointed_thing) - unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) - end, - on_rotate = unifieddyes.fix_after_screwdriver_nsew, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - 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_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", "", "", } - } -}) - -unifieddyes.register_color_craft({ - output = "lrfurn:armchair", - palette = "wallmounted", - type = "shapeless", - neutral_node = "lrfurn:armchair", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - --- 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) -end - -minetest.register_lbm({ - name = "lrfurn:convert_armchairs", - label = "Convert lrfurn armchairs to use param2 color", - run_at_every_load = false, - 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.settings:get("log_mods") then - minetest.log("action", "[lrfurn/armchairs] "..S("Loaded!")) -end diff --git a/lrfurn/coffeetable.lua b/lrfurn/coffeetable.lua deleted file mode 100644 index 8b095ce..0000000 --- a/lrfurn/coffeetable.lua +++ /dev/null @@ -1,79 +0,0 @@ - -local S = homedecor.gettext - -minetest.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable") -minetest.register_alias("lrfurn:coffeetable_front", "air") - -minetest.register_node("lrfurn:coffeetable", { - 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", - paramtype2 = "facedir", - groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, - sounds = default.node_sound_wood_defaults(), - node_box = { - type = "fixed", - fixed = { - --legs - { -0.375, -0.5, -0.375, -0.3125, -0.0625, -0.3125 }, - { 0.3125, -0.5, -0.375, 0.375, -0.0625, -0.3125 }, - { -0.375, -0.5, 1.3125, -0.3125, -0.0625, 1.375 }, - { 0.3125, -0.5, 1.3125, 0.375, -0.0625, 1.375 }, - --tabletop - {-0.4375, -0.0625, -0.4375, 0.4375, 0, 1.4375}, - } - }, - selection_box = { - type = "fixed", - fixed = { - {-0.4375, -0.5, -0.4375, 0.4375, 0.0, 1.4375}, - } - }, - - after_place_node = function(pos, placer, itemstack, pointed_thing) - if minetest.is_protected(pos, placer:get_player_name()) then return true end - local node = minetest.get_node(pos) - local fdir = node.param2 - - if lrfurn.check_right(pos, fdir, false, placer) then - minetest.set_node(pos, { name = node.name, param2 = (fdir + 1) % 4 }) - else - 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 - end, -}) - -minetest.register_craft({ - output = "lrfurn:coffeetable", - type = "shapeless", - recipe = { - "lrfurn:endtable", - "lrfurn:endtable" - } -}) - -minetest.register_craft({ - output = "lrfurn:coffeetable", - recipe = { - {"", "", "", }, - {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood", }, - {"group:stick", "", "group:stick", } - } -}) - -minetest.register_craft({ - output = "lrfurn:coffeetable", - recipe = { - {"", "", "", }, - {"moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood", }, - {"group:stick", "", "group:stick", } - } -}) - -if minetest.settings:get("log_mods") then - minetest.log("action", "[lrfurn/coffeetable] "..S("Loaded!")) -end diff --git a/lrfurn/depends.txt b/lrfurn/depends.txt deleted file mode 100644 index 398a410..0000000 --- a/lrfurn/depends.txt +++ /dev/null @@ -1,4 +0,0 @@ -default -wool -homedecor_common -unifieddyes diff --git a/lrfurn/endtable.lua b/lrfurn/endtable.lua deleted file mode 100644 index 470e907..0000000 --- a/lrfurn/endtable.lua +++ /dev/null @@ -1,53 +0,0 @@ - -local S = homedecor.gettext - -minetest.register_node("lrfurn:endtable", { - 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", - paramtype2 = "facedir", - groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, - sounds = default.node_sound_wood_defaults(), - node_box = { - type = "fixed", - fixed = { - --legs - {-0.375, -0.5, -0.375, -0.3125, -0.0625, -0.3125}, - {0.3125, -0.5, -0.375, 0.375, -0.0625, -0.3125}, - {-0.375, -0.5, 0.3125, -0.3125, -0.0625, 0.375}, - {0.3125, -0.5, 0.3125, 0.375, -0.0625, 0.375}, - - --tabletop - {-0.4375, -0.0625, -0.4375, 0.4375, 0, 0.4375}, - } - }, - selection_box = { - type = "fixed", - fixed = { - {-0.4375, -0.5, -0.4375, 0.4375, 0.0, 0.4375}, - } - }, -}) - -minetest.register_craft({ - output = "lrfurn:endtable", - recipe = { - {"", "", "", }, - {"stairs:slab_wood", "stairs:slab_wood", "", }, - {"group:stick", "group:stick", "", } - } -}) - -minetest.register_craft({ - output = "lrfurn:endtable", - recipe = { - {"", "", "", }, - {"moreblocks:slab_wood", "moreblocks:slab_wood", "", }, - {"group:stick", "group:stick", "", } - } -}) - -if minetest.settings:get("log_mods") then - minetest.log("action", "[lrfurn/endtable] "..S("Loaded!")) -end diff --git a/lrfurn/init.lua b/lrfurn/init.lua deleted file mode 100644 index a23aff4..0000000 --- a/lrfurn/init.lua +++ /dev/null @@ -1,75 +0,0 @@ -local S = homedecor.gettext - -lrfurn = {} -screwdriver = screwdriver or {} - -lrfurn.fdir_to_right = { - { 1, 0 }, - { 0, -1 }, - { -1, 0 }, - { 0, 1 }, -} - -lrfurn.colors = { - "black", - "brown", - "blue", - "cyan", - "dark_grey", - "dark_green", - "green", - "grey", - "magenta", - "orange", - "pink", - "red", - "violet", - "white", - "yellow", -} - -function lrfurn.check_right(pos, fdir, long, placer) - if not fdir or fdir > 3 then fdir = 0 end - - local pos2 = { x = pos.x + lrfurn.fdir_to_right[fdir+1][1], y=pos.y, z = pos.z + lrfurn.fdir_to_right[fdir+1][2] } - local pos3 = { x = pos.x + lrfurn.fdir_to_right[fdir+1][1] * 2, y=pos.y, z = pos.z + lrfurn.fdir_to_right[fdir+1][2] * 2 } - - local node2 = minetest.get_node(pos2) - if node2 and node2.name ~= "air" then - return false - elseif minetest.is_protected(pos2, placer:get_player_name()) then - if not long then - minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where other end goes!")) - else - minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the middle or far end goes!")) - end - return false - end - - if long then - local node3 = minetest.get_node(pos3) - if node3 and node3.name ~= "air" then - return false - elseif minetest.is_protected(pos3, placer:get_player_name()) then - minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!")) - return false - end - end - - return true -end - -function lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing) - local node = minetest.get_node(pos) - local colorbits = node.param2 - (node.param2 % 8) - local yaw = placer:get_look_yaw() - local dir = minetest.yaw_to_dir(yaw-1.5) - local fdir = minetest.dir_to_wallmounted(dir) - minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits }) -end - -dofile(minetest.get_modpath("lrfurn").."/longsofas.lua") -dofile(minetest.get_modpath("lrfurn").."/sofas.lua") -dofile(minetest.get_modpath("lrfurn").."/armchairs.lua") -dofile(minetest.get_modpath("lrfurn").."/coffeetable.lua") -dofile(minetest.get_modpath("lrfurn").."/endtable.lua") diff --git a/lrfurn/longsofas.lua b/lrfurn/longsofas.lua deleted file mode 100644 index 2df177c..0000000 --- a/lrfurn/longsofas.lua +++ /dev/null @@ -1,136 +0,0 @@ - -local S = homedecor.gettext - -local longsofa_cbox = { - type = "wallmounted", - wall_side = {-0.5, -0.5, -0.5, 0.5, 0.5, 2.5}, -} - -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", - wield_scale = { x = 0.6, y = 0.6, z = 0.6 }, - groups = {snappy=3, ud_param2_colorable = 1}, - 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_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing) - local playername = placer:get_player_name() - 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_right(pos, fdir, true, placer) then - if not creative.is_enabled_for(playername) then - itemstack:take_item() - end - 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 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_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", } - } -}) - -unifieddyes.register_color_craft({ - output = "lrfurn:longsofa", - palette = "wallmounted", - type = "shapeless", - neutral_node = "lrfurn:longsofa", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - --- 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 = false, - 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.settings: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 deleted file mode 100644 index 1ad653e..0000000 --- a/lrfurn/models/lrfurn_armchair.obj +++ /dev/null @@ -1,575 +0,0 @@ -# Blender v2.72 (sub 0) OBJ File: 'lrfurn-armchair.blend' -# www.blender.org -o Cylinder -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.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.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 -vt 0.062442 0.262281 -vt 0.015625 0.234971 -vt 0.703125 0.562500 -vt 0.703125 0.546875 -vt 0.718750 0.546875 -vt 0.718750 0.562500 -vt 0.749590 0.202859 -vt 0.749590 0.190887 -vt 0.765553 0.186896 -vt 0.765553 0.196873 -vt 0.305134 0.884532 -vt 0.476969 0.822047 -vt 0.492591 0.884532 -vt 0.249108 0.918025 -vt 0.062649 0.918025 -vt 0.062649 0.906371 -vt 0.249108 0.906371 -vt 0.305134 0.822047 -vt 0.516834 0.906371 -vt 0.532373 0.906371 -vt 0.532373 0.918025 -vt 0.516834 0.914140 -vt 0.031250 0.562500 -vt 0.031250 0.750000 -vt 0.015625 0.750000 -vt 0.015625 0.562500 -vt 0.062500 0.562500 -vt 0.062500 0.750000 -vt 0.046875 0.750000 -vt 0.046875 0.562500 -vt 0.749864 0.503824 -vt 0.749864 0.515528 -vt 0.640625 0.515528 -vt 0.640625 0.503824 -vt 0.727431 0.453105 -vt 0.742061 0.457007 -vt 0.765470 0.499922 -vt 0.015625 0.499922 -vt 0.039033 0.457007 -vt 0.031231 0.503824 -vt 0.062500 0.734375 -vt 0.078125 0.734375 -vt 0.078125 0.750000 -vt 0.171875 0.734375 -vt 0.171875 0.750000 -vt 0.024403 0.453105 -vt 0.492591 0.818141 -vt 0.015625 0.441401 -vt 0.640625 0.234971 -vt 0.703047 0.270084 -vt 0.640625 0.272035 -vt 0.718653 0.262281 -vt 0.289513 0.884532 -vt 0.289513 0.818141 -vt 0.148438 0.765625 -vt 0.148438 0.779712 -vt 0.031250 0.779712 -vt 0.031250 0.765625 -vt 0.015625 0.196873 -vt 0.015625 0.186896 -vt 0.031589 0.190887 -vt 0.031589 0.202859 -vt 0.727572 0.974351 -vt 0.742139 0.978235 -vt 0.742139 0.984062 -vt 0.727572 0.980178 -vt 0.756706 0.974351 -vt 0.756706 0.980178 -vt 0.053909 0.980178 -vt 0.039342 0.984062 -vt 0.039342 0.978236 -vt 0.053909 0.974351 -vt 0.031231 0.515528 -vt 0.015625 0.509676 -vt 0.024774 0.980178 -vt 0.024774 0.974351 -vt 0.609375 0.562500 -vt 0.609375 0.546875 -vt 0.756692 0.453105 -vt 0.078125 0.546875 -vt 0.171875 0.546875 -vt 0.171875 0.562500 -vt 0.078125 0.562500 -vt 0.062500 0.546875 -vt 0.053664 0.453105 -vt 0.765470 0.441401 -vt 0.718653 0.441401 -vt 0.046875 0.546875 -vt 0.031250 0.546875 -vt 0.015625 0.546875 -vt 0.765470 0.509676 -vt 0.264646 0.914140 -vt 0.264646 0.906371 -vt 0.016600 0.328605 -vt 0.024403 0.336408 -vt 0.039033 0.340309 -vt 0.053664 0.336408 -vt 0.061466 0.328605 -vt 0.148438 0.750000 -vt 0.637844 0.202859 -vt 0.637844 0.190887 -vt 0.017005 0.964640 -vt 0.061678 0.964640 -vt 0.765470 0.234971 -vt 0.016034 0.813142 -vt 0.264646 0.813142 -vt 0.062442 0.441401 -vt 0.140470 0.503824 -vt 0.477287 0.976904 -vt 0.305452 0.914419 -vt 0.477287 0.914419 -vt 0.734375 0.562500 -vt 0.734375 0.750000 -vt 0.718750 0.750000 -vt 0.734375 0.546875 -vt 0.492909 0.976904 -vt 0.492909 0.910513 -vt 0.289831 0.910513 -vt 0.289831 0.976904 -vt 0.765553 0.031250 -vt 0.765625 0.546875 -vt 0.765625 0.562500 -vt 0.750000 0.562500 -vt 0.750000 0.546875 -vt 0.719628 0.328605 -vt 0.727431 0.336408 -vt 0.742061 0.340309 -vt 0.756692 0.336408 -vt 0.764494 0.328605 -vt 0.719803 0.964639 -vt 0.718832 0.906371 -vt 0.765625 0.750000 -vt 0.750000 0.750000 -vt 0.718832 0.918025 -vt 0.764475 0.964639 -vt 0.516834 0.813142 -vt 0.765447 0.813142 -vt 0.015625 0.031250 -vt 0.703125 0.734375 -vt 0.718750 0.734375 -vt 0.609375 0.734375 -vt 0.609375 0.750000 -vt 0.703125 0.750000 -vt 0.062442 0.375077 -vt 0.078047 0.382880 -vt 0.703047 0.382880 -vt 0.718653 0.375077 -vt 0.140470 0.384831 -vt 0.640625 0.384831 -vt 0.143334 0.190887 -vt 0.143334 0.202859 -vt 0.734375 0.765625 -vt 0.617188 0.765625 -vt 0.617188 0.750000 -vt 0.734375 0.779712 -vt 0.617188 0.779712 -vt 0.140470 0.515528 -vt 0.143334 0.031250 -vt 0.637844 0.031250 -vt -0.000000 0.125000 -vt 1.000000 0.125000 -vt 1.000000 0.312500 -vt 0.500000 0.312500 -vt -0.000000 0.312500 -vt 0.937500 0.125000 -vt 0.875000 0.125000 -vt 0.875000 0.000000 -vt 0.937500 0.000000 -vt 0.125000 0.125000 -vt 0.062500 0.125000 -vt 0.062500 0.000000 -vt 0.125000 0.000000 -vt 0.062500 0.937500 -vt 0.062500 0.875000 -vt 0.125000 0.875000 -vt 0.125000 0.937500 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.062500 0.062500 -vt 0.125000 0.062500 -vt 0.875000 0.937500 -vt 0.875000 0.875000 -vt 0.937500 0.875000 -vt 0.937500 0.937500 -vt 0.875000 0.062500 -vt 0.937500 0.062500 -vn 1.000000 0.000000 0.000000 -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 -f 7/4/1 61/1/1 35/3/1 -f 7/4/1 65/5/1 61/1/1 -s 1 -f 139/6/2 135/7/3 33/8/4 138/9/5 -f 59/10/6 55/11/7 5/12/8 27/13/9 -f 45/14/10 41/15/11 10/16/12 -f 48/17/13 1/18/14 9/19/15 44/20/16 -f 41/15/11 45/14/10 38/21/17 -f 85/22/18 78/23/19 66/24/20 99/25/21 -f 52/26/22 24/27/23 1/28/14 48/29/13 -f 45/30/10 10/31/12 20/32/24 50/33/20 -f 17/34/25 28/35/26 145/36/26 56/37/27 -f 100/38/28 82/39/29 129/34/30 -f 97/40/31 129/34/30 82/39/29 -f 4/41/32 24/42/23 54/43/33 -f 41/44/34 42/45/35 36/46/36 6/31/37 -f 42/45/35 40/47/38 31/48/39 36/46/36 -f 50/33/20 20/32/24 24/27/23 52/26/22 -f 4/41/32 1/49/14 24/42/23 -f 6/50/40 10/16/12 41/15/11 -f 1/49/14 4/41/32 9/51/15 -f 61/52/1 135/53/3 134/54/41 -f 96/55/1 135/53/3 61/52/1 -f 45/14/10 11/56/42 7/57/43 38/21/17 -f 144/58/44 146/59/45 59/60/6 57/61/46 -f 2/62/47 49/63/48 128/64/48 132/65/49 -f 12/66/50 13/67/51 130/68/51 131/69/52 -f 13/67/51 2/70/47 132/71/49 130/68/51 -f 58/72/53 57/73/46 25/74/54 29/75/55 -f 54/43/33 58/76/53 29/77/55 4/41/32 -f 57/73/46 59/78/6 27/79/9 25/74/54 -f 137/80/56 134/81/41 135/7/3 139/6/2 -f 82/39/29 84/82/57 97/40/31 -f 35/83/58 32/84/59 37/85/60 39/86/61 -f 7/87/62 35/83/58 39/86/61 38/30/63 -f 20/88/24 54/43/33 24/42/23 -f 84/82/57 94/89/64 97/40/31 -f 47/90/65 100/38/28 56/37/27 -f 39/86/61 37/85/60 40/47/38 42/45/35 -f 38/30/63 39/86/61 42/45/35 41/44/34 -f 21/91/21 50/33/20 52/26/22 23/92/66 -f 11/87/42 45/30/10 50/33/20 21/91/21 -f 23/92/66 52/26/22 48/29/13 19/93/67 -f 46/40/68 12/94/50 131/35/52 129/34/68 -f 19/95/67 48/17/13 44/20/16 8/96/69 -f 8/97/69 7/4/43 19/98/67 -f 19/98/67 7/4/43 23/99/66 -f 21/100/21 23/99/66 7/4/43 -f 7/4/43 11/101/42 21/100/21 -f 145/102/26 144/58/44 57/61/46 58/27/53 -f 146/103/45 143/104/70 55/11/7 59/10/6 -f 5/105/8 9/19/15 27/79/9 -f 27/79/9 9/19/15 25/74/54 -f 25/74/54 9/19/15 29/75/55 -f 9/19/15 4/106/32 29/75/55 -f 126/107/71 96/55/1 61/52/1 -f 62/108/72 65/109/73 9/19/15 -f 9/19/15 65/109/73 44/20/16 -f 44/20/16 65/109/73 8/96/69 -f 7/4/43 8/97/69 65/5/73 -f 100/38/28 129/34/30 56/37/27 -f 10/110/12 56/111/27 20/88/24 -f 3/112/74 14/113/75 22/114/76 -f 127/115/77 15/116/78 47/117/65 3/9/74 -f 54/43/33 20/88/24 56/111/27 -f 34/118/79 127/115/77 3/9/74 51/8/80 -f 51/119/80 3/112/74 22/114/76 63/120/81 -f 53/121/82 14/113/75 47/122/65 -f 47/122/65 14/113/75 3/112/74 -f 5/105/8 62/108/72 9/19/15 -f 55/11/7 62/123/72 5/12/8 -f 99/124/21 66/125/20 124/126/22 83/127/66 -f 95/128/1 96/55/1 101/129/83 -f 101/129/83 96/55/1 83/130/66 -f 83/130/66 96/55/1 99/131/21 -f 99/131/21 96/55/1 85/132/18 -f 97/133/31 94/134/64 80/66/11 -f 80/66/11 94/134/64 81/67/11 -f 66/125/20 84/135/57 82/136/29 124/126/22 -f 78/23/19 94/134/64 84/137/57 66/24/20 -f 124/126/22 82/136/29 100/116/28 67/115/84 -f 83/127/66 124/126/22 67/115/84 101/118/83 -f 81/67/11 94/134/64 79/70/11 -f 94/134/64 98/138/85 79/70/11 -f 96/55/1 126/107/71 85/132/18 -f 85/22/18 126/139/71 78/23/19 -f 78/23/19 126/139/71 94/134/64 -f 126/139/71 125/140/86 94/134/64 -f 94/134/64 125/140/86 98/138/85 -f 128/64/87 98/63/85 125/141/86 -f 141/142/88 139/6/2 138/9/5 142/143/89 -f 140/144/90 137/80/56 139/6/2 141/142/88 -f 133/145/91 140/144/90 141/142/88 136/146/92 -f 136/146/92 141/142/88 142/143/89 18/117/93 -f 6/147/40 36/148/1 10/110/12 -f 136/149/1 53/150/82 47/90/65 -f 47/90/65 56/37/27 136/149/1 -f 56/111/27 10/110/12 36/148/1 -f 36/148/1 133/151/1 56/111/27 -f 136/149/1 56/37/27 133/152/1 -f 30/65/45 16/64/94 143/153/70 146/154/45 -f 28/116/26 26/155/44 144/156/44 145/157/26 -f 26/155/44 30/158/45 146/159/45 144/156/44 -f 56/111/27 145/160/26 58/76/53 54/43/33 -f 143/153/70 128/64/87 125/141/86 -f 62/123/72 55/11/7 143/104/70 -f 125/141/86 147/161/95 143/153/70 -f 143/104/70 147/162/95 62/123/72 -g Cylinder_Cylinder_bottom -s off -f 69/163/1 103/164/1 64/165/1 61/166/1 65/167/1 -f 68/163/75 69/164/75 65/165/75 62/167/75 -f 68/164/95 62/165/95 60/167/95 102/163/95 -f 74/168/75 75/169/75 71/170/75 70/171/75 -f 75/168/95 76/169/95 72/170/95 71/171/95 -f 76/172/11 77/173/11 73/174/11 72/175/11 -f 77/172/1 74/173/1 70/174/1 73/175/1 -f 70/176/96 71/177/96 72/178/96 73/179/96 -f 69/180/96 68/181/96 102/182/96 103/183/96 -f 90/172/75 91/173/75 87/174/75 86/175/75 -f 91/168/95 92/169/95 88/170/95 87/171/95 -f 92/168/11 93/169/11 89/170/11 88/171/11 -f 93/172/1 90/173/1 86/174/1 89/175/1 -f 86/173/96 87/184/96 88/185/96 89/172/96 -f 106/163/11 107/164/11 104/165/11 105/167/11 -f 112/168/75 113/169/75 109/170/75 108/171/75 -f 113/172/95 114/173/95 110/174/95 109/175/95 -f 114/172/11 115/173/11 111/174/11 110/175/11 -f 115/168/1 112/169/1 108/170/1 111/171/1 -f 108/186/96 109/187/96 110/188/96 111/189/96 -f 120/172/75 121/173/75 117/174/75 116/175/75 -f 121/172/95 122/173/95 118/174/95 117/175/95 -f 122/168/11 123/169/11 119/170/11 118/171/11 -f 123/168/1 120/169/1 116/170/1 119/171/1 -f 116/169/96 117/190/96 118/191/96 119/168/96 diff --git a/lrfurn/models/lrfurn_sofa_long.obj b/lrfurn/models/lrfurn_sofa_long.obj deleted file mode 100644 index d8e32db..0000000 --- a/lrfurn/models/lrfurn_sofa_long.obj +++ /dev/null @@ -1,715 +0,0 @@ -# Blender v2.72 (sub 0) OBJ File: 'lrfurn-sofa-long.blend' -# www.blender.org -o Cylinder -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 -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 -vt 0.281250 0.734375 -vt 0.281250 0.750000 -vt 0.265625 0.750000 -vt 0.265625 0.734375 -vt 0.390625 0.734375 -vt 0.390625 0.750000 -vt 0.750000 0.201141 -vt 0.750000 0.187500 -vt 0.765625 0.187500 -vt 0.305134 0.884532 -vt 0.476969 0.822047 -vt 0.492591 0.884532 -vt 0.249108 0.918025 -vt 0.062649 0.918025 -vt 0.062649 0.906371 -vt 0.249108 0.906371 -vt 0.305134 0.822047 -vt 0.734375 0.562500 -vt 0.734375 0.750000 -vt 0.718750 0.750000 -vt 0.718750 0.562500 -vt 0.171875 0.734375 -vt 0.250000 0.734375 -vt 0.250000 0.750000 -vt 0.171875 0.750000 -vt 0.609375 0.562500 -vt 0.609375 0.546875 -vt 0.703125 0.546875 -vt 0.703125 0.562500 -vt 0.265625 0.201141 -vt 0.265625 0.187500 -vt 0.515625 0.187500 -vt 0.515625 0.201141 -vt 0.031250 0.201141 -vt 0.031250 0.187500 -vt 0.031250 0.562500 -vt 0.031250 0.750000 -vt 0.015625 0.750000 -vt 0.015625 0.562500 -vt 0.718750 0.546875 -vt 0.515625 0.734375 -vt 0.515625 0.750000 -vt 0.500000 0.750000 -vt 0.500000 0.734375 -vt 0.750000 0.562500 -vt 0.750000 0.750000 -vt 0.062500 0.562500 -vt 0.062500 0.750000 -vt 0.046875 0.750000 -vt 0.046875 0.562500 -vt 0.265625 0.514825 -vt 0.031250 0.514825 -vt 0.031250 0.503232 -vt 0.053711 0.452995 -vt 0.062500 0.441401 -vt 0.015625 0.499368 -vt 0.532373 0.906371 -vt 0.718832 0.906371 -vt 0.718832 0.918025 -vt 0.532373 0.918025 -vt 0.062500 0.734375 -vt 0.078125 0.734375 -vt 0.078125 0.750000 -vt 0.515625 0.562500 -vt 0.515625 0.546875 -vt 0.531250 0.546875 -vt 0.531250 0.562500 -vt 0.742188 0.456859 -vt 0.765625 0.499368 -vt 0.727539 0.452995 -vt 0.765625 0.441401 -vt 0.756836 0.452995 -vt 0.515625 0.503232 -vt 0.718750 0.441401 -vt 0.765625 0.562500 -vt 0.765625 0.750000 -vt 0.015625 0.441401 -vt 0.024414 0.452995 -vt 0.492591 0.818141 -vt 0.039062 0.456859 -vt 0.289513 0.884532 -vt 0.289513 0.818141 -vt 0.727572 0.974351 -vt 0.742139 0.978235 -vt 0.719803 0.964639 -vt 0.765625 0.509029 -vt 0.750000 0.514825 -vt 0.750000 0.503232 -vt 0.756706 0.974351 -vt 0.756706 0.980178 -vt 0.742139 0.984062 -vt 0.265625 0.765625 -vt 0.265625 0.779712 -vt 0.031250 0.779712 -vt 0.031250 0.765625 -vt 0.477287 0.976904 -vt 0.305452 0.914419 -vt 0.477287 0.914419 -vt 0.289831 0.976904 -vt 0.289831 0.910513 -vt 0.492909 0.976904 -vt 0.492909 0.910513 -vt 0.756836 0.337900 -vt 0.718750 0.264013 -vt 0.764648 0.330122 -vt 0.742187 0.341789 -vt 0.727539 0.337900 -vt 0.719727 0.330122 -vt 0.750000 0.765625 -vt 0.515625 0.765625 -vt 0.053909 0.980178 -vt 0.039342 0.984062 -vt 0.039342 0.978236 -vt 0.053909 0.974351 -vt 0.015625 0.509029 -vt 0.515625 0.514825 -vt 0.750000 0.779712 -vt 0.515625 0.779712 -vt 0.024774 0.980178 -vt 0.024774 0.974351 -vt 0.164062 0.385367 -vt 0.078125 0.383435 -vt 0.515625 0.375706 -vt 0.531250 0.383435 -vt 0.617188 0.385367 -vt 0.703125 0.383435 -vt 0.500000 0.383435 -vt 0.390625 0.385367 -vt 0.281250 0.383435 -vt 0.531250 0.734375 -vt 0.609375 0.734375 -vt 0.078125 0.546875 -vt 0.171875 0.546875 -vt 0.171875 0.562500 -vt 0.078125 0.562500 -vt 0.500000 0.546875 -vt 0.500000 0.562500 -vt 0.390625 0.562500 -vt 0.390625 0.546875 -vt 0.062500 0.546875 -vt 0.703125 0.734375 -vt 0.718750 0.734375 -vt 0.250000 0.546875 -vt 0.265625 0.546875 -vt 0.265625 0.562500 -vt 0.250000 0.562500 -vt 0.281250 0.562500 -vt 0.281250 0.546875 -vt 0.062500 0.375706 -vt 0.718750 0.375706 -vt 0.609375 0.750000 -vt 0.703125 0.750000 -vt 0.531250 0.750000 -vt 0.765625 0.546875 -vt 0.750000 0.546875 -vt 0.046875 0.546875 -vt 0.031250 0.546875 -vt 0.516834 0.906371 -vt 0.516834 0.914140 -vt 0.734375 0.546875 -vt 0.015625 0.546875 -vt 0.264646 0.914140 -vt 0.264646 0.906371 -vt 0.016602 0.330122 -vt 0.062500 0.264013 -vt 0.024414 0.337900 -vt 0.039062 0.341789 -vt 0.053711 0.337900 -vt 0.061523 0.330122 -vt 0.727572 0.980178 -vt 0.015625 0.187500 -vt 0.764475 0.964639 -vt 0.017005 0.964640 -vt 0.061678 0.964640 -vt 0.265625 0.031250 -vt 0.015625 0.031250 -vt 0.515625 0.031250 -vt 0.016034 0.813142 -vt 0.264646 0.813142 -vt 0.015625 0.236792 -vt 0.078125 0.271791 -vt 0.265625 0.236792 -vt 0.164062 0.273735 -vt 0.250000 0.271791 -vt 0.265625 0.264013 -vt 0.281250 0.271791 -vt 0.390625 0.273735 -vt 0.515625 0.236792 -vt 0.500000 0.271791 -vt 0.515625 0.264013 -vt 0.531250 0.271791 -vt 0.617187 0.273735 -vt 0.703125 0.271791 -vt 0.765625 0.236792 -vt 0.516834 0.813142 -vt 0.765447 0.813142 -vt 0.765625 0.031250 -vt -0.000000 0.125000 -vt 1.000000 0.125000 -vt 1.000000 0.312500 -vt -0.000000 0.312500 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.937500 0.125000 -vt 0.875000 0.125000 -vt 0.875000 0.000000 -vt 0.937500 0.000000 -vt 0.125000 0.125000 -vt 0.062500 0.125000 -vt 0.062500 0.000000 -vt 0.125000 0.000000 -vt 0.062500 0.937500 -vt 0.062500 0.875000 -vt 0.125000 0.875000 -vt 0.125000 0.937500 -vt 0.875000 0.937500 -vt 0.875000 0.875000 -vt 0.937500 0.875000 -vt 0.937500 0.937500 -vt 0.062500 0.062500 -vt 0.125000 0.062500 -vt 0.875000 0.062500 -vt 0.937500 0.062500 -vt 0.531250 0.125000 -vt 0.468750 0.125000 -vt 0.468750 0.000000 -vt 0.531250 0.000000 -vt 0.468750 0.937500 -vt 0.468750 0.875000 -vt 0.531250 0.875000 -vt 0.531250 0.937500 -vt 0.468750 0.062500 -vt 0.531250 0.062500 -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 -f 92/4/3 61/5/4 24/6/5 89/7/6 -f 90/8/7 52/9/8 61/5/4 92/4/3 -f 113/10/9 106/11/10 6/12/11 41/12/12 -f 95/13/13 82/14/14 13/15/15 -f 98/16/16 1/17/17 12/18/18 94/19/19 -f 82/14/14 95/13/13 69/20/20 -f 99/21/16 3/22/21 18/23/22 96/24/23 -f 80/25/24 87/26/25 58/27/26 51/28/8 -f 87/26/25 89/7/6 24/6/5 58/27/26 -f 68/29/27 54/30/28 57/31/29 77/32/30 -f 48/33/31 25/34/32 22/35/32 47/36/31 -f 112/37/33 105/38/34 25/34/32 48/33/31 -f 102/39/35 36/40/36 1/41/17 98/42/16 -f 77/32/30 57/31/29 15/43/37 70/24/38 -f 83/44/6 26/45/5 60/46/39 91/47/40 -f 103/48/35 34/49/41 3/22/21 99/21/16 -f 95/50/13 13/51/15 31/52/42 100/53/43 -f 23/3/2 43/54/44 110/55/45 104/56/46 -f 31/57/42 23/3/2 104/56/46 -f 13/58/15 23/3/2 31/57/42 -f 5/59/47 31/57/42 104/56/46 -f 97/60/48 19/61/49 29/62/50 101/63/43 -f 82/64/51 85/65/52 63/66/53 9/51/54 -f 71/67/55 27/68/56 66/69/57 74/70/58 -f 34/71/41 8/72/59 3/73/21 -f 91/47/40 60/46/39 52/9/8 90/8/7 -f 85/65/52 80/25/24 51/28/8 63/66/53 -f 100/53/43 31/52/42 36/40/36 102/39/35 -f 19/74/49 8/72/59 29/75/50 -f 74/70/58 66/69/57 54/30/28 68/29/27 -f 3/73/21 28/76/2 18/77/22 -f 101/78/43 29/79/50 34/49/41 103/48/35 -f 12/80/18 1/81/17 5/59/47 -f 9/82/60 13/15/15 82/14/14 -f 36/83/36 5/59/47 1/81/17 -f 5/59/47 36/83/36 31/57/42 -f 8/72/59 34/71/41 29/75/50 -f 95/13/13 14/84/61 10/85/62 69/20/20 -f 42/86/63 19/61/49 38/87/64 -f 8/88/59 19/61/49 42/86/63 -f 8/72/59 42/89/63 111/90/65 107/91/66 -f 38/87/64 46/92/67 112/93/33 108/94/68 -f 39/95/69 47/96/31 113/97/9 109/98/70 -f 96/99/23 88/100/71 70/101/72 -f 18/102/22 88/100/71 96/99/23 -f 16/103/73 88/100/71 18/102/22 -f 17/104/74 96/99/23 70/101/72 15/105/37 -f 4/106/75 15/107/37 20/108/76 -f 33/109/77 15/107/37 4/106/75 -f 2/110/78 15/107/37 33/109/77 -f 17/111/74 15/107/37 2/110/78 -f 111/49/65 108/112/68 40/113/69 44/45/44 -f 44/45/44 40/113/69 39/95/69 43/6/44 -f 110/114/45 109/115/70 37/116/79 45/117/80 -f 104/56/46 110/55/45 45/118/80 5/59/47 -f 28/76/2 44/119/44 43/54/44 23/3/2 -f 107/91/66 111/90/65 44/119/44 28/76/2 -f 108/112/68 112/120/33 48/121/31 40/113/69 -f 40/113/69 48/121/31 47/96/31 39/95/69 -f 109/115/70 113/122/9 41/123/12 37/116/79 -f 58/1/1 23/3/2 51/124/1 -f 51/124/1 23/3/2 63/125/1 -f 26/126/1 55/127/1 28/76/2 -f 55/127/1 49/128/1 28/76/2 -f 49/128/1 65/129/1 28/76/2 -f 26/126/1 28/76/2 60/130/1 -f 60/130/1 28/76/2 52/131/1 -f 61/132/1 52/131/1 23/3/2 -f 24/2/1 61/132/1 23/3/2 -f 28/76/2 23/3/2 52/131/1 -f 84/133/52 74/70/58 68/29/27 81/134/24 -f 62/135/57 53/136/28 67/137/27 75/138/58 -f 64/139/81 76/140/82 73/141/83 50/142/84 -f 83/44/6 71/67/55 74/70/58 84/133/52 -f 10/143/62 62/135/57 75/138/58 69/50/85 -f 27/68/56 71/67/55 76/140/82 64/139/81 -f 86/144/25 77/32/30 70/24/38 88/145/86 -f 81/134/24 68/29/27 77/32/30 86/144/25 -f 59/146/29 21/147/56 72/148/55 78/149/30 -f 53/136/28 59/146/29 78/149/30 67/137/27 -f 50/142/84 73/141/83 79/150/87 56/151/88 -f 56/151/88 79/150/87 72/148/55 21/147/56 -f 9/152/60 63/125/1 13/58/15 -f 23/3/2 13/58/15 63/125/1 -f 16/153/73 18/77/22 65/129/1 -f 28/76/2 65/129/1 18/77/22 -f 49/154/8 81/134/24 86/144/25 65/155/26 -f 65/155/26 86/144/25 88/145/86 16/23/89 -f 26/45/5 83/44/6 84/133/52 55/156/53 -f 55/156/53 84/133/52 81/134/24 49/154/8 -f 75/138/58 67/137/27 80/25/24 85/65/52 -f 76/140/82 91/47/40 90/8/7 73/141/83 -f 69/50/85 75/138/58 85/65/52 82/64/51 -f 71/67/55 83/44/6 91/47/40 76/140/82 -f 78/149/30 72/148/55 89/7/6 87/26/25 -f 67/137/27 78/149/30 87/26/25 80/25/24 -f 73/141/83 90/8/7 92/4/3 79/150/87 -f 79/150/87 92/4/3 89/7/6 72/148/55 -f 4/157/75 101/78/43 103/48/35 33/158/77 -f 32/159/75 100/53/43 102/39/35 35/160/77 -f 20/161/76 97/60/48 101/63/43 4/162/75 -f 14/143/61 95/50/13 100/53/43 32/159/75 -f 33/158/77 103/48/35 99/21/16 2/163/78 -f 35/160/77 102/39/35 98/42/16 30/164/78 -f 2/163/78 99/21/16 96/24/23 17/43/74 -f 30/165/78 98/16/16 94/19/19 11/166/90 -f 11/167/90 10/168/62 30/169/78 -f 30/169/78 10/168/62 35/170/77 -f 32/171/75 35/170/77 10/168/62 -f 10/168/62 14/172/61 32/171/75 -f 43/6/44 39/95/69 109/98/70 110/40/45 -f 42/86/63 38/87/64 108/94/68 111/173/65 -f 46/174/67 7/174/91 105/38/34 112/37/33 -f 47/36/31 22/35/32 106/11/10 113/10/9 -f 38/87/64 19/61/49 46/92/67 -f 19/61/49 7/175/91 46/92/67 -f 6/176/11 12/18/18 41/123/12 -f 41/123/12 12/18/18 37/116/79 -f 37/116/79 12/18/18 45/117/80 -f 12/18/18 5/177/47 45/117/80 -f 3/73/21 8/72/59 107/91/66 -f 107/91/66 28/76/2 3/73/21 -f 115/178/92 25/34/32 116/179/93 -f 25/34/32 105/38/34 116/179/93 -f 7/174/91 116/179/93 105/38/34 -f 25/34/32 115/178/92 114/180/92 22/35/32 -f 117/181/94 121/182/95 12/18/18 -f 12/18/18 121/182/95 94/19/19 -f 94/19/19 121/182/95 11/166/90 -f 10/168/62 11/167/90 121/183/95 -f 62/184/57 10/168/62 120/185/1 -f 62/184/57 120/185/1 53/186/28 -f 53/186/28 120/185/1 59/187/29 -f 59/187/29 120/185/1 21/188/56 -f 121/183/95 120/185/1 10/168/62 -f 21/188/56 120/185/1 56/189/88 -f 56/189/88 120/185/1 50/190/84 -f 120/185/1 119/191/1 50/190/84 -f 50/190/84 119/191/1 64/192/81 -f 64/192/81 119/191/1 27/193/56 -f 27/193/56 119/191/1 66/194/57 -f 66/194/57 119/191/1 54/195/28 -f 54/195/28 119/191/1 57/196/29 -f 57/196/29 119/191/1 15/107/37 -f 119/191/1 118/197/96 15/107/37 -f 15/107/37 118/197/96 20/108/76 -f 20/161/76 118/198/96 97/60/48 -f 97/60/48 118/198/96 19/61/49 -f 118/198/96 116/199/93 19/61/49 -f 19/61/49 116/199/93 7/175/91 -f 6/176/11 117/181/94 12/18/18 -f 106/11/10 117/200/94 6/12/11 -f 22/35/32 117/200/94 106/11/10 -f 22/35/32 114/180/92 117/200/94 -g Cylinder_Cylinder_bottom -s off -f 125/201/1 175/202/1 120/203/1 121/204/1 -f 175/201/1 176/202/1 119/203/1 120/204/1 -f 176/201/1 122/202/1 118/203/1 119/204/1 -f 122/201/14 123/202/14 116/203/14 118/204/14 -f 124/201/71 125/202/71 121/203/71 117/204/71 -f 124/202/92 117/203/92 114/204/92 174/201/92 -f 177/201/92 174/202/92 114/203/92 115/204/92 -f 123/201/92 177/202/92 115/203/92 116/204/92 -f 176/205/97 177/206/97 123/207/97 122/208/97 -f 130/209/71 131/210/71 127/211/71 126/212/71 -f 131/209/92 132/210/92 128/211/92 127/212/92 -f 132/213/14 133/214/14 129/215/14 128/216/14 -f 133/213/1 130/214/1 126/215/1 129/216/1 -f 126/217/97 127/218/97 128/219/97 129/220/97 -f 138/209/71 139/210/71 135/211/71 134/212/71 -f 139/213/92 140/214/92 136/215/92 135/216/92 -f 140/213/14 141/214/14 137/215/14 136/216/14 -f 141/209/1 138/210/1 134/211/1 137/212/1 -f 134/221/97 135/222/97 136/223/97 137/224/97 -f 125/205/97 124/206/97 174/207/97 175/208/97 -f 146/213/71 147/214/71 143/215/71 142/216/71 -f 147/209/92 148/210/92 144/211/92 143/212/92 -f 148/209/14 149/210/14 145/211/14 144/212/14 -f 149/213/1 146/214/1 142/215/1 145/216/1 -f 142/214/97 143/225/97 144/226/97 145/213/97 -f 154/213/71 155/214/71 151/215/71 150/216/71 -f 155/213/92 156/214/92 152/215/92 151/216/92 -f 156/209/14 157/210/14 153/211/14 152/212/14 -f 157/209/1 154/210/1 150/211/1 153/212/1 -f 150/210/97 151/227/97 152/228/97 153/209/97 -f 162/209/71 163/210/71 159/211/71 158/212/71 -f 163/229/92 164/230/92 160/231/92 159/232/92 -f 164/213/14 165/214/14 161/215/14 160/216/14 -f 165/229/1 162/230/1 158/231/1 161/232/1 -f 158/233/97 159/234/97 160/235/97 161/236/97 -f 170/213/71 171/214/71 167/215/71 166/216/71 -f 171/229/92 172/230/92 168/231/92 167/232/92 -f 172/209/14 173/210/14 169/211/14 168/212/14 -f 173/229/1 170/230/1 166/231/1 169/232/1 -f 166/230/97 167/237/97 168/238/97 169/229/97 -f 175/205/97 174/206/97 177/207/97 176/208/97 diff --git a/lrfurn/models/lrfurn_sofa_short.obj b/lrfurn/models/lrfurn_sofa_short.obj deleted file mode 100644 index 1bf1446..0000000 --- a/lrfurn/models/lrfurn_sofa_short.obj +++ /dev/null @@ -1,595 +0,0 @@ -# Blender v2.72 (sub 0) OBJ File: 'lrfurn-sofa-short.blend' -# www.blender.org -o Cylinder -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 -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 -vt 0.750000 0.201141 -vt 0.750000 0.187500 -vt 0.765625 0.187500 -vt 0.305134 0.884532 -vt 0.476969 0.822047 -vt 0.492591 0.884532 -vt 0.249108 0.918025 -vt 0.062649 0.918025 -vt 0.062649 0.906371 -vt 0.249108 0.906371 -vt 0.305134 0.822047 -vt 0.734375 0.562500 -vt 0.734375 0.750000 -vt 0.718750 0.750000 -vt 0.718750 0.562500 -vt 0.171875 0.734375 -vt 0.250000 0.734375 -vt 0.250000 0.750000 -vt 0.171875 0.750000 -vt 0.265625 0.734375 -vt 0.265625 0.750000 -vt 0.609375 0.562500 -vt 0.609375 0.546875 -vt 0.703125 0.546875 -vt 0.703125 0.562500 -vt 0.031250 0.562500 -vt 0.031250 0.750000 -vt 0.015625 0.750000 -vt 0.015625 0.562500 -vt 0.718750 0.546875 -vt 0.750000 0.562500 -vt 0.750000 0.750000 -vt 0.062500 0.562500 -vt 0.062500 0.750000 -vt 0.046875 0.750000 -vt 0.046875 0.562500 -vt 0.265625 0.514825 -vt 0.031250 0.514825 -vt 0.031250 0.503232 -vt 0.053711 0.452995 -vt 0.062500 0.441401 -vt 0.015625 0.499368 -vt 0.532373 0.906371 -vt 0.718832 0.906371 -vt 0.718832 0.918025 -vt 0.532373 0.918025 -vt 0.062500 0.734375 -vt 0.078125 0.734375 -vt 0.078125 0.750000 -vt 0.742188 0.456859 -vt 0.765625 0.499368 -vt 0.727539 0.452995 -vt 0.765625 0.441401 -vt 0.756836 0.452995 -vt 0.531250 0.562500 -vt 0.531250 0.546875 -vt 0.765625 0.562500 -vt 0.765625 0.750000 -vt 0.015625 0.441401 -vt 0.024414 0.452995 -vt 0.492591 0.818141 -vt 0.039062 0.456859 -vt 0.289513 0.884532 -vt 0.289513 0.818141 -vt 0.727572 0.974351 -vt 0.742139 0.978235 -vt 0.719803 0.964639 -vt 0.765625 0.509029 -vt 0.750000 0.514825 -vt 0.750000 0.503232 -vt 0.756706 0.974351 -vt 0.756706 0.980178 -vt 0.742139 0.984062 -vt 0.265625 0.765625 -vt 0.265625 0.779712 -vt 0.031250 0.779712 -vt 0.031250 0.765625 -vt 0.477287 0.976904 -vt 0.305452 0.914419 -vt 0.477287 0.914419 -vt 0.289831 0.976904 -vt 0.289831 0.910513 -vt 0.492909 0.976904 -vt 0.492909 0.910513 -vt 0.756836 0.337900 -vt 0.718750 0.264013 -vt 0.764648 0.330122 -vt 0.742187 0.341789 -vt 0.727539 0.337900 -vt 0.719727 0.330122 -vt 0.053909 0.980178 -vt 0.039342 0.984062 -vt 0.039342 0.978236 -vt 0.053909 0.974351 -vt 0.015625 0.509029 -vt 0.024774 0.980178 -vt 0.024774 0.974351 -vt 0.164062 0.385367 -vt 0.078125 0.383435 -vt 0.531250 0.734375 -vt 0.609375 0.734375 -vt 0.078125 0.546875 -vt 0.171875 0.546875 -vt 0.171875 0.562500 -vt 0.078125 0.562500 -vt 0.062500 0.546875 -vt 0.703125 0.734375 -vt 0.718750 0.734375 -vt 0.250000 0.546875 -vt 0.265625 0.546875 -vt 0.265625 0.562500 -vt 0.250000 0.562500 -vt 0.062500 0.375706 -vt 0.718750 0.375706 -vt 0.718750 0.441401 -vt 0.703125 0.383435 -vt 0.609375 0.750000 -vt 0.703125 0.750000 -vt 0.531250 0.750000 -vt 0.515625 0.236792 -vt 0.765625 0.236792 -vt 0.703125 0.271791 -vt 0.617187 0.273735 -vt 0.531250 0.271791 -vt 0.765625 0.546875 -vt 0.750000 0.546875 -vt 0.046875 0.546875 -vt 0.031250 0.546875 -vt 0.516834 0.906371 -vt 0.516834 0.914140 -vt 0.734375 0.546875 -vt 0.015625 0.546875 -vt 0.264646 0.914140 -vt 0.264646 0.906371 -vt 0.016602 0.330122 -vt 0.062500 0.264013 -vt 0.024414 0.337900 -vt 0.039062 0.341789 -vt 0.053711 0.337900 -vt 0.061523 0.330122 -vt 0.727572 0.980178 -vt 0.015625 0.187500 -vt 0.031250 0.187500 -vt 0.031250 0.201141 -vt 0.515625 0.201141 -vt 0.515625 0.187500 -vt 0.764475 0.964639 -vt 0.017005 0.964640 -vt 0.061678 0.964640 -vt 0.015625 0.031250 -vt 0.515625 0.264013 -vt 0.016034 0.813142 -vt 0.264646 0.813142 -vt 0.015625 0.236792 -vt 0.078125 0.271791 -vt 0.265625 0.236792 -vt 0.164062 0.273735 -vt 0.250000 0.271791 -vt 0.265625 0.264013 -vt 0.265625 0.187500 -vt 0.265625 0.031250 -vt 0.515625 0.503232 -vt 0.515625 0.750000 -vt 0.515625 0.734375 -vt 0.516834 0.813142 -vt 0.765447 0.813142 -vt 0.765625 0.031250 -vt 0.515625 0.031250 -vt 0.515625 0.562500 -vt 0.617188 0.385367 -vt 0.531250 0.383435 -vt 0.515625 0.375706 -vt 0.750000 0.765625 -vt 0.750000 0.779712 -vt 0.515625 0.779712 -vt 0.515625 0.765625 -vt 0.515625 0.514825 -vt 0.515625 0.546875 -vt 0.265625 0.201141 -vt -0.000000 0.125000 -vt 1.000000 0.125000 -vt 1.000000 0.312500 -vt -0.000000 0.312500 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.937500 0.125000 -vt 0.875000 0.125000 -vt 0.875000 0.000000 -vt 0.937500 0.000000 -vt 0.125000 0.125000 -vt 0.062500 0.125000 -vt 0.062500 0.000000 -vt 0.125000 0.000000 -vt 0.062500 0.937500 -vt 0.062500 0.875000 -vt 0.125000 0.875000 -vt 0.125000 0.937500 -vt 0.875000 0.937500 -vt 0.875000 0.875000 -vt 0.937500 0.875000 -vt 0.937500 0.937500 -vt 0.062500 0.062500 -vt 0.125000 0.062500 -vt 0.875000 0.062500 -vt 0.937500 0.062500 -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 -f 92/4/3 85/5/4 6/6/5 36/6/6 -f 74/7/7 65/8/8 13/9/9 -f 77/10/10 1/11/11 12/12/12 73/13/13 -f 65/8/8 74/7/7 56/14/14 -f 78/15/10 3/16/15 18/17/16 75/18/17 -f 63/19/18 69/20/19 48/21/20 43/22/21 -f 69/20/19 71/23/22 24/24/23 48/21/20 -f 55/25/24 45/26/25 47/27/26 61/28/27 -f 81/29/28 32/30/29 1/31/11 77/32/10 -f 61/28/27 47/27/26 15/33/30 57/18/31 -f 82/34/28 30/35/32 3/16/15 78/15/10 -f 74/36/7 13/37/9 27/38/33 79/39/34 -f 23/3/2 38/40/35 89/41/36 83/42/37 -f 27/43/33 23/3/2 83/42/37 -f 13/44/9 23/3/2 27/43/33 -f 5/45/38 27/43/33 83/42/37 -f 76/46/39 19/47/40 25/48/41 80/49/34 -f 65/50/42 67/51/43 51/52/44 9/37/45 -f 30/53/32 8/54/46 3/55/15 -f 67/51/43 63/19/18 43/22/21 51/52/44 -f 79/39/34 27/38/33 32/30/29 81/29/28 -f 19/56/40 8/54/46 25/57/41 -f 59/58/47 53/59/48 45/26/25 55/25/24 -f 80/60/34 25/61/41 30/35/32 82/34/28 -f 12/62/12 1/63/11 5/45/38 -f 9/64/49 13/9/9 65/8/8 -f 32/65/29 5/45/38 1/63/11 -f 5/45/38 32/65/29 27/43/33 -f 8/54/46 30/53/32 25/57/41 -f 74/7/7 14/66/50 10/67/51 56/14/14 -f 37/68/52 19/47/40 34/69/53 -f 8/70/46 19/47/40 37/68/52 -f 8/54/46 37/71/52 90/72/54 86/73/55 -f 34/69/53 40/74/56 91/75/57 87/76/58 -f 35/77/59 41/78/60 92/79/3 88/80/61 -f 75/81/17 70/82/62 57/83/63 -f 18/84/16 70/82/62 75/81/17 -f 16/85/64 70/82/62 18/84/16 -f 17/86/65 75/81/17 57/83/63 15/87/30 -f 4/88/66 15/89/30 20/90/67 -f 29/91/68 15/89/30 4/88/66 -f 2/92/69 15/89/30 29/91/68 -f 17/93/65 15/89/30 2/92/69 -f 89/94/36 88/95/61 33/96/70 39/97/71 -f 83/42/37 89/41/36 39/98/71 5/45/38 -f 88/95/61 92/99/3 36/100/6 33/96/70 -f 48/1/1 23/3/2 43/101/1 -f 43/101/1 23/3/2 51/102/1 -f 66/103/43 59/58/47 55/25/24 64/104/18 -f 50/105/48 44/106/25 54/107/24 60/108/47 -f 10/109/51 50/105/48 60/108/47 56/36/72 -f 68/110/19 61/28/27 57/18/31 70/111/73 -f 64/104/18 55/25/24 61/28/27 68/110/19 -f 49/112/26 21/113/74 58/114/75 62/115/27 -f 44/106/25 49/112/26 62/115/27 54/107/24 -f 9/116/49 51/102/1 13/44/9 -f 23/3/2 13/44/9 51/102/1 -f 16/117/64 18/118/16 52/119/1 -f 42/120/21 64/104/18 68/110/19 52/121/20 -f 52/121/20 68/110/19 70/111/73 16/17/76 -f 46/122/44 66/103/43 64/104/18 42/120/21 -f 60/108/47 54/107/24 63/19/18 67/51/43 -f 97/123/1 96/124/77 15/89/30 -f 56/36/72 60/108/47 67/51/43 65/50/42 -f 47/125/26 97/123/1 15/89/30 -f 62/115/27 58/114/75 71/23/22 69/20/19 -f 54/107/24 62/115/27 69/20/19 63/19/18 -f 45/126/25 97/123/1 47/125/26 -f 53/127/48 97/123/1 45/126/25 -f 4/128/66 80/60/34 82/34/28 29/129/68 -f 28/130/66 79/39/34 81/29/28 31/131/68 -f 20/132/67 76/46/39 80/49/34 4/133/66 -f 14/109/50 74/36/7 79/39/34 28/130/66 -f 29/129/68 82/34/28 78/15/10 2/134/69 -f 31/131/68 81/29/28 77/32/10 26/135/69 -f 2/134/69 78/15/10 75/18/17 17/33/65 -f 26/136/69 77/10/10 73/13/13 11/137/78 -f 11/138/78 10/139/51 26/140/69 -f 26/140/69 10/139/51 31/141/68 -f 28/142/66 31/141/68 10/139/51 -f 10/139/51 14/143/50 28/142/66 -f 38/24/35 35/77/59 88/80/61 89/30/36 -f 37/68/52 34/69/53 87/76/58 90/144/54 -f 40/145/56 7/145/79 84/146/80 91/147/57 -f 41/148/60 22/149/81 85/5/4 92/4/3 -f 34/69/53 19/47/40 40/74/56 -f 19/47/40 7/150/79 40/74/56 -f 6/151/5 12/12/12 36/100/6 -f 36/100/6 12/12/12 33/96/70 -f 33/96/70 12/12/12 39/97/71 -f 12/12/12 5/152/38 39/97/71 -f 3/55/15 8/54/46 86/73/55 -f 7/145/79 94/153/82 84/146/80 -f 21/154/74 97/123/1 53/127/48 -f 95/155/83 98/156/84 12/12/12 -f 12/12/12 98/156/84 73/13/13 -f 73/13/13 98/156/84 11/137/78 -f 10/139/51 11/138/78 98/157/84 -f 50/158/48 10/139/51 97/159/1 -f 50/158/48 97/159/1 44/160/25 -f 44/160/25 97/159/1 49/161/26 -f 49/161/26 97/159/1 21/162/74 -f 98/157/84 97/159/1 10/139/51 -f 22/163/81 84/146/80 94/153/82 -f 93/164/85 22/163/81 94/153/82 -f 86/73/55 23/165/2 3/55/15 -f 24/166/23 71/167/22 66/103/43 46/122/44 -f 23/165/2 52/119/1 18/118/16 -f 15/89/30 96/124/77 20/90/67 -f 20/132/67 96/168/77 76/46/39 -f 76/46/39 96/168/77 19/47/40 -f 96/168/77 94/169/82 19/47/40 -f 19/47/40 94/169/82 7/150/79 -f 6/151/5 95/155/83 12/12/12 -f 85/5/4 95/170/83 6/6/5 -f 22/149/81 95/170/83 85/5/4 -f 22/149/81 93/171/85 95/170/83 -f 71/167/22 58/172/75 59/58/47 66/103/43 -f 42/173/1 52/119/1 23/165/2 -f 46/174/1 42/173/1 23/165/2 -f 24/175/1 46/174/1 23/165/2 -f 87/176/58 91/177/57 41/178/60 35/179/59 -f 86/73/55 90/72/54 38/180/35 23/165/2 -f 90/35/54 87/176/58 35/179/59 38/166/35 -f 3/55/15 23/165/2 18/118/16 -f 58/172/75 21/181/74 53/59/48 59/58/47 -f 91/147/57 84/146/80 22/163/81 41/182/60 -g Cylinder_Cylinder_bottom -s off -f 102/183/1 136/184/1 97/185/1 98/186/1 -f 99/183/8 100/184/8 94/185/8 96/186/8 -f 101/183/62 102/184/62 98/185/62 95/186/62 -f 136/187/86 135/188/86 100/189/86 99/190/86 -f 101/184/85 95/185/85 93/186/85 135/183/85 -f 100/183/85 135/184/85 93/185/85 94/186/85 -f 107/191/62 108/192/62 104/193/62 103/194/62 -f 108/191/85 109/192/85 105/193/85 104/194/85 -f 109/195/8 110/196/8 106/197/8 105/198/8 -f 110/195/1 107/196/1 103/197/1 106/198/1 -f 103/199/86 104/200/86 105/201/86 106/202/86 -f 115/191/62 116/192/62 112/193/62 111/194/62 -f 116/195/85 117/196/85 113/197/85 112/198/85 -f 117/195/8 118/196/8 114/197/8 113/198/8 -f 118/191/1 115/192/1 111/193/1 114/194/1 -f 111/203/86 112/204/86 113/205/86 114/206/86 -f 102/187/86 101/188/86 135/189/86 136/190/86 -f 123/195/62 124/196/62 120/197/62 119/198/62 -f 124/191/85 125/192/85 121/193/85 120/194/85 -f 125/191/8 126/192/8 122/193/8 121/194/8 -f 126/195/1 123/196/1 119/197/1 122/198/1 -f 119/196/86 120/207/86 121/208/86 122/195/86 -f 131/195/62 132/196/62 128/197/62 127/198/62 -f 132/195/85 133/196/85 129/197/85 128/198/85 -f 133/191/8 134/192/8 130/193/8 129/194/8 -f 134/191/1 131/192/1 127/193/1 130/194/1 -f 127/192/86 128/209/86 129/210/86 130/191/86 -f 136/183/1 99/184/1 96/185/1 97/186/1 diff --git a/lrfurn/sofas.lua b/lrfurn/sofas.lua deleted file mode 100644 index 7d1cd53..0000000 --- a/lrfurn/sofas.lua +++ /dev/null @@ -1,136 +0,0 @@ - -local S = homedecor.gettext - -local sofa_cbox = { - type = "wallmounted", - wall_side = {-0.5, -0.5, -0.5, 0.5, 0.5, 1.5} -} - -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", - wield_scale = { x = 0.6, y = 0.6, z = 0.6 }, - groups = {snappy=3, ud_param2_colorable = 1}, - 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_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing) - local playername = placer:get_player_name() - 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_right(pos, fdir, false, placer) then - if not creative.is_enabled_for(playername) then - itemstack:take_item() - end - 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 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_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", "", } - } -}) - -unifieddyes.register_color_craft({ - output = "lrfurn:sofa", - palette = "wallmounted", - type = "shapeless", - neutral_node = "lrfurn:sofa", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - --- 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 = false, - 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.settings: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 deleted file mode 100644 index cc6b87b..0000000 Binary files a/lrfurn/textures/lrfurn_armchair_inv.png and /dev/null differ diff --git a/lrfurn/textures/lrfurn_coffeetable_back.png b/lrfurn/textures/lrfurn_coffeetable_back.png deleted file mode 100644 index 04894fd..0000000 Binary files a/lrfurn/textures/lrfurn_coffeetable_back.png and /dev/null differ diff --git a/lrfurn/textures/lrfurn_coffeetable_front.png b/lrfurn/textures/lrfurn_coffeetable_front.png deleted file mode 100644 index 65d4f51..0000000 Binary files a/lrfurn/textures/lrfurn_coffeetable_front.png and /dev/null differ diff --git a/lrfurn/textures/lrfurn_longsofa_inv.png b/lrfurn/textures/lrfurn_longsofa_inv.png deleted file mode 100644 index 37bde8b..0000000 Binary files a/lrfurn/textures/lrfurn_longsofa_inv.png and /dev/null differ diff --git a/lrfurn/textures/lrfurn_sofa_bottom.png b/lrfurn/textures/lrfurn_sofa_bottom.png deleted file mode 100644 index e72944a..0000000 Binary files a/lrfurn/textures/lrfurn_sofa_bottom.png and /dev/null differ diff --git a/lrfurn/textures/lrfurn_sofa_inv.png b/lrfurn/textures/lrfurn_sofa_inv.png deleted file mode 100644 index a4f7f6f..0000000 Binary files a/lrfurn/textures/lrfurn_sofa_inv.png and /dev/null differ diff --git a/lrfurn/textures/lrfurn_upholstery.png b/lrfurn/textures/lrfurn_upholstery.png deleted file mode 100644 index 6db36a8..0000000 Binary files a/lrfurn/textures/lrfurn_upholstery.png and /dev/null differ -- cgit v1.2.3