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 --- homedecor_furniture/init.lua | 236 --------- homedecor_furniture/models/forniture_armchair.obj | 539 --------------------- .../models/homedecor_kitchen_chair.obj | 205 -------- .../textures/homedecor_armchair_inv.png | Bin 6376 -> 0 bytes .../textures/homedecor_chair_padded_inv.png | Bin 4554 -> 0 bytes .../textures/homedecor_chair_wood_inv.png | Bin 4411 -> 0 bytes 6 files changed, 980 deletions(-) delete mode 100644 homedecor_furniture/models/forniture_armchair.obj delete mode 100644 homedecor_furniture/models/homedecor_kitchen_chair.obj delete mode 100644 homedecor_furniture/textures/homedecor_armchair_inv.png delete mode 100644 homedecor_furniture/textures/homedecor_chair_padded_inv.png delete mode 100644 homedecor_furniture/textures/homedecor_chair_wood_inv.png (limited to 'homedecor_furniture') diff --git a/homedecor_furniture/init.lua b/homedecor_furniture/init.lua index 108f28d..5d452a6 100644 --- a/homedecor_furniture/init.lua +++ b/homedecor_furniture/init.lua @@ -32,85 +32,7 @@ for _, t in ipairs(table_colors) do }) end -local kc_cbox = { - type = "fixed", - fixed = { -0.3125, -0.3125, -0.5, 0.3125, 0.3125, 0.5 }, -} - -homedecor.register("kitchen_chair_wood", { - description = S("Kitchen chair"), - mesh = "homedecor_kitchen_chair.obj", - tiles = { - homedecor.plain_wood, - homedecor.plain_wood - }, - inventory_image = "homedecor_chair_wood_inv.png", - paramtype2 = "wallmounted", - selection_box = kc_cbox, - collision_box = kc_cbox, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, - sounds = default.node_sound_wood_defaults(), - after_place_node = unifieddyes.fix_rotation_nsew, - on_rotate = unifieddyes.fix_after_screwdriver_nsew, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - pos.y = pos.y+0 -- where do I put my ass ? - homedecor.sit(pos, node, clicker) - return itemstack - end -}) - -homedecor.register("kitchen_chair_padded", { - description = S("Kitchen chair"), - mesh = "homedecor_kitchen_chair.obj", - tiles = { - homedecor.plain_wood, - "wool_white.png", - }, - inventory_image = "homedecor_chair_padded_inv.png", - paramtype2 = "colorwallmounted", - palette = "unifieddyes_palette_colorwallmounted.png", - selection_box = kc_cbox, - collision_box = kc_cbox, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), - 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) - pos.y = pos.y+0 -- where do I put my ass ? - homedecor.sit(pos, node, clicker) - return itemstack - end -}) -local ac_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 } - } -} - -homedecor.register("armchair", { - description = S("Armchair"), - mesh = "forniture_armchair.obj", - tiles = { - "wool_white.png", - { name = "wool_dark_grey.png", color = 0xffffffff }, - { name = "default_wood.png", color = 0xffffffff } - }, - inventory_image = "homedecor_armchair_inv.png", - paramtype2 = "colorwallmounted", - palette = "unifieddyes_palette_colorwallmounted.png", - groups = {snappy=3, ud_param2_colorable = 1}, - sounds = default.node_sound_wood_defaults(), - node_box = ac_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, -}) local ob_cbox = { type = "fixed", @@ -205,73 +127,6 @@ minetest.register_craft({ burntime = 30, }) -minetest.register_craft({ - output = "homedecor:kitchen_chair_wood 2", - recipe = { - { "group:stick",""}, - { "group:wood","group:wood" }, - { "group:stick","group:stick" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:armchair 2", - recipe = { - { "wool:white",""}, - { "group:wood","group:wood" }, - { "wool:white","wool:white" }, - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:armchair", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:armchair", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "homedecor:kitchen_chair_padded", - recipe = { - "homedecor:kitchen_chair_wood", - "wool:white", - }, -}) - -unifieddyes.register_color_craft({ - output = "homedecor:kitchen_chair_padded", - palette = "wallmounted", - type = "shapeless", - neutral_node = "homedecor:kitchen_chair_padded", - recipe = { - "NEUTRAL_NODE", - "MAIN_DYE" - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:kitchen_chair_wood", - burntime = 15, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:kitchen_chair_padded", - burntime = 15, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:armchair", - burntime = 30, -}) - minetest.register_craft({ output = "homedecor:standing_lamp_off", recipe = { @@ -435,95 +290,4 @@ minetest.register_craft({ -- Aliases for 3dforniture mod. minetest.register_alias("3dforniture:table", "homedecor:table") -minetest.register_alias("3dforniture:chair", "homedecor:chair") -minetest.register_alias("3dforniture:armchair", "homedecor:armchair_black") -minetest.register_alias("homedecor:armchair", "homedecor:armchair_black") - minetest.register_alias('table', 'homedecor:table') -minetest.register_alias('chair', 'homedecor:chair') -minetest.register_alias('armchair', 'homedecor:armchair') - --- conversion to param2 colorization - -homedecor.old_static_chairs = {} - -local chair_colors = { - "black", - "brown", - "blue", - "cyan", - "dark_grey", - "dark_green", - "green", - "grey", - "magenta", - "orange", - "pink", - "red", - "violet", - "white", - "yellow", -} - -for _, color in ipairs(chair_colors) do - table.insert(homedecor.old_static_chairs, "homedecor:chair_"..color) - table.insert(homedecor.old_static_chairs, "homedecor:armchair_"..color) -end -table.insert(homedecor.old_static_chairs, "homedecor:chair") - -minetest.register_lbm({ - name = ":homedecor:convert_chairs", - label = "Convert homedecor chairs to use param2 color", - run_at_every_load = false, - nodenames = homedecor.old_static_chairs, - action = function(pos, node) - local name = node.name - local paletteidx = 0 - local color - local a,b = string.find(name, "_") - - if a then - color = string.sub(name, a+1) - - if color == "blue" then - color = "medium_blue" - elseif color == "violet" then - color = "medium_violet" - elseif color == "red" then - color = "medium_red" - elseif color == "black" then - color = "dark_grey" - end - - paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted") - end - - 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 - local newname = "homedecor:armchair" - - if node.name == "homedecor:chair" then - newname = "homedecor:kitchen_chair_wood" - elseif string.find(node.name, "homedecor:chair_") then - newname = "homedecor:kitchen_chair_padded" - end - - minetest.set_node(pos, { name = newname, param2 = param2 }) - local meta = minetest.get_meta(pos) - if color then - meta:set_string("dye", "unifieddyes:"..color) - end - end -}) diff --git a/homedecor_furniture/models/forniture_armchair.obj b/homedecor_furniture/models/forniture_armchair.obj deleted file mode 100644 index b563691..0000000 --- a/homedecor_furniture/models/forniture_armchair.obj +++ /dev/null @@ -1,539 +0,0 @@ -# Blender v2.72 (sub 0) OBJ File: 'forniture-armchair.blend' -# www.blender.org -o chair_Cylinder -v 0.500000 -0.375000 -0.437500 -v 0.500000 -0.375000 0.039062 -v 0.437500 -0.375000 0.101562 -v -0.035156 -0.375000 0.101562 -v -0.035156 -0.375000 0.437500 -v -0.097656 -0.375000 0.500000 -v -0.375000 0.375000 0.500000 -v 0.375000 -0.312500 -0.187500 -v -0.097656 0.375000 0.500000 -v -0.035156 0.375000 0.437500 -v 0.375000 0.312500 -0.187500 -v -0.035156 0.375000 0.101562 -v 0.437500 0.375000 0.101562 -v 0.500000 0.375000 0.039062 -v -0.375000 -0.375000 0.500000 -v 0.500000 0.375000 -0.437500 -v 0.500000 0.437500 -0.437500 -v 0.375000 0.500000 -0.437500 -v -0.097656 0.500000 0.437500 -v 0.500000 0.437500 0.039062 -v -0.437500 -0.437500 0.500000 -v 0.437500 0.437500 0.101562 -v -0.097656 -0.437500 0.500000 -v -0.035156 0.437500 0.101562 -v -0.035156 -0.437500 0.437500 -v -0.035156 0.437500 0.437500 -v -0.035156 -0.437500 0.101562 -v -0.097656 0.437500 0.500000 -v 0.437500 -0.437500 0.101562 -v -0.437500 0.437500 0.500000 -v 0.500000 -0.437500 0.039062 -v -0.097656 -0.500000 0.437500 -v 0.500000 -0.437500 -0.437500 -v 0.375000 0.312500 -0.437500 -v -0.500000 -0.500000 0.437500 -v -0.500000 -0.500000 -0.437500 -v 0.375000 -0.312500 -0.437500 -v -0.500000 0.500000 0.437500 -v -0.500000 0.500000 -0.437500 -v -0.097656 0.500000 0.039062 -v -0.097656 -0.500000 0.039062 -v 0.437500 0.500000 0.039062 -v 0.437500 -0.500000 0.039062 -v 0.437500 0.500000 -0.437500 -v 0.437500 -0.500000 -0.437500 -v -0.097656 -0.312500 0.437500 -v -0.097656 -0.312500 0.039062 -v 0.437500 -0.312500 0.039062 -v 0.437500 -0.312500 -0.437500 -v -0.097656 0.312500 0.437500 -v 0.375000 -0.500000 -0.437500 -v -0.097656 0.312500 0.039062 -v 0.437500 0.312500 0.039062 -v 0.437500 0.312500 -0.437500 -v -0.312500 -0.312500 -0.125000 -v -0.312500 0.312500 -0.125000 -v -0.312500 -0.312500 0.437500 -v -0.312500 0.312500 0.437500 -v 0.187500 -0.312500 -0.109375 -v 0.187500 0.312500 -0.109375 -v -0.285156 -0.312500 0.156250 -v -0.285156 0.312500 0.156250 -v 0.312500 -0.312500 -0.125000 -v -0.250000 0.312500 -0.109375 -v -0.296875 -0.312500 -0.062500 -v -0.296875 0.312500 0.375000 -v -0.250000 -0.312500 -0.109375 -v 0.312500 0.312500 -0.125000 -v -0.296875 -0.312500 0.375000 -v -0.296875 0.312500 -0.062500 -v -0.031250 -0.312500 -0.101562 -v -0.031250 0.312500 -0.101562 -v -0.343750 0.432138 -0.500000 -v -0.343750 0.432138 -0.437500 -v -0.343750 0.380361 -0.500000 -v -0.343750 0.380361 -0.437500 -v -0.380362 0.343750 -0.500000 -v -0.380362 0.343750 -0.437500 -v -0.432139 0.343750 -0.500000 -v -0.432139 0.343750 -0.437500 -v -0.468750 0.380361 -0.500000 -v -0.468750 0.380361 -0.437500 -v -0.468750 0.432138 -0.500000 -v -0.468750 0.432138 -0.437500 -v -0.432139 0.468750 -0.500000 -v -0.432139 0.468750 -0.437500 -v -0.380362 0.468750 -0.500000 -v -0.380362 0.468750 -0.437500 -v -0.380361 -0.343750 -0.437500 -v -0.380361 -0.343750 -0.500000 -v -0.432138 -0.343750 -0.437500 -v -0.432138 -0.343750 -0.500000 -v -0.468750 -0.380362 -0.437500 -v -0.468750 -0.380362 -0.500000 -v -0.468750 -0.432139 -0.437500 -v -0.468750 -0.432139 -0.500000 -v -0.432138 -0.468750 -0.437500 -v -0.432138 -0.468750 -0.500000 -v -0.380361 -0.468750 -0.437500 -v -0.380361 -0.468750 -0.500000 -v -0.343750 -0.432139 -0.437500 -v -0.343750 -0.432139 -0.500000 -v -0.343750 -0.380362 -0.437500 -v -0.343750 -0.380362 -0.500000 -v 0.468750 0.432139 -0.500000 -v 0.468750 0.432139 -0.437500 -v 0.468750 0.380362 -0.500000 -v 0.468750 0.380362 -0.437500 -v 0.432138 0.343750 -0.500000 -v 0.432138 0.343750 -0.437500 -v 0.380361 0.343750 -0.500000 -v 0.380361 0.343750 -0.437500 -v 0.343750 0.380362 -0.500000 -v 0.343750 0.380362 -0.437500 -v 0.343750 0.432139 -0.500000 -v 0.343750 0.432139 -0.437500 -v 0.380361 0.468750 -0.500000 -v 0.380361 0.468750 -0.437500 -v 0.432138 0.468750 -0.500000 -v 0.432138 0.468750 -0.437500 -v 0.432139 -0.343750 -0.437500 -v 0.432139 -0.343750 -0.500000 -v 0.380362 -0.343750 -0.437500 -v 0.380362 -0.343750 -0.500000 -v 0.343750 -0.380361 -0.437500 -v 0.343750 -0.380361 -0.500000 -v 0.343750 -0.432138 -0.437500 -v 0.343750 -0.432138 -0.500000 -v 0.380362 -0.468750 -0.437500 -v 0.380362 -0.468750 -0.500000 -v 0.432139 -0.468750 -0.437500 -v 0.432139 -0.468750 -0.500000 -v 0.468750 -0.432138 -0.437500 -v 0.468750 -0.432138 -0.500000 -v 0.468750 -0.380361 -0.437500 -v 0.468750 -0.380361 -0.500000 -vt 0.062590 0.539162 -vt 0.062590 0.601648 -vt 0.000103 0.539162 -vt 0.125076 0.601648 -vt 0.125076 0.539162 -vt 0.187563 0.539162 -vt 0.937402 0.601648 -vt 0.937402 0.539162 -vt 0.999888 0.539162 -vt 0.812428 0.539162 -vt 0.874915 0.539162 -vt 0.874915 0.601648 -vt 0.000103 0.937514 -vt 0.062590 0.937514 -vt 0.062590 1.000000 -vt 0.125076 1.000000 -vt 0.125076 0.937514 -vt 0.187563 0.937514 -vt 0.937513 1.000000 -vt 0.597743 1.000000 -vt 0.597743 0.937514 -vt 1.000000 0.937514 -vt 0.937299 1.000000 -vt 0.062487 1.000000 -vt 0.000000 0.937514 -vt 0.999786 0.937514 -vt 0.874915 0.937514 -vt 0.874915 1.000000 -vt 0.812428 0.937514 -vt 0.937402 1.000000 -vt 0.937402 0.937514 -vt 0.999888 0.937514 -vt 0.597743 0.539162 -vt 0.062701 0.539162 -vt 0.062701 0.062702 -vt 1.000000 0.062702 -vt 0.187563 0.062702 -vt 0.812428 0.062702 -vt 0.812428 0.312648 -vt 0.187563 0.312648 -vt 0.812433 0.250180 -vt 0.187567 0.250180 -vt 0.187567 0.187694 -vt 0.812433 0.187694 -vt 0.187563 0.875027 -vt 0.812428 0.875027 -vt 0.874919 0.125207 -vt 0.125081 0.125207 -vt 0.062594 0.062721 -vt 0.937406 0.062721 -vt 0.937406 0.402491 -vt 0.874919 0.402491 -vt 0.535256 0.601649 -vt 0.062701 0.601649 -vt 0.999888 0.062702 -vt 0.874915 0.062702 -vt 0.812433 0.812559 -vt 0.187567 0.812559 -vt 0.187567 0.687586 -vt 0.812433 0.687586 -vt 0.187563 0.437621 -vt 0.812428 0.437621 -vt 0.812428 0.656324 -vt 0.187563 0.656324 -vt 0.125081 0.402491 -vt 0.062594 0.402491 -vt 0.402257 0.937513 -vt 0.402257 1.000000 -vt 0.464744 0.601648 -vt 0.402257 0.539161 -vt 0.937298 0.539161 -vt 0.937298 0.601648 -vt 0.874919 0.464978 -vt 0.937406 0.464978 -vt 0.535233 0.601622 -vt 0.062678 0.539135 -vt 0.597718 0.539135 -vt 0.062594 0.464978 -vt 0.125081 0.464978 -vt 0.000103 0.062702 -vt 0.125076 0.062702 -vt 0.875003 0.999974 -vt 0.812517 0.937487 -vt 0.124973 1.000000 -vt 0.187460 0.937513 -vt 0.000000 0.062702 -vt 0.937298 0.062702 -vt 0.187691 0.375183 -vt 0.812557 0.375183 -vt 0.812557 0.437670 -vt 0.187691 0.437670 -vt 0.812428 0.375134 -vt 0.187563 0.375134 -vt 0.812433 0.468883 -vt 0.187567 0.468883 -vt 0.796895 0.875000 -vt 0.785178 0.656297 -vt 0.796895 0.437594 -vt 0.203081 0.875027 -vt 0.214797 0.656324 -vt 0.203081 0.437621 -vt 0.187460 0.375134 -vt 0.249947 0.390756 -vt 0.750030 0.390729 -vt 0.812517 0.375107 -vt 0.531327 0.398540 -vt 0.468650 0.398567 -vt 0.687352 0.390756 -vt 0.312624 0.390729 -vt 0.187651 0.375107 -vt 0.812326 0.375134 -vt 0.874812 0.312648 -vt 0.125164 0.312621 -vt 0.125164 0.062675 -vt 0.874812 0.062702 -vt 0.999786 0.062701 -vt 0.000000 0.125016 -vt 0.000000 0.062508 -vt 0.062507 0.000000 -vt 0.125016 0.000000 -vt 0.187524 0.062508 -vt 0.187524 0.125016 -vt 1.000000 0.125016 -vt 0.812475 0.125016 -vt 0.812475 0.062508 -vt 0.874984 0.000000 -vt 0.937492 0.000000 -vt 1.000000 0.062508 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 0.750000 0.687500 -vt 0.750000 0.750000 -vt 0.687500 0.750000 -vt 0.687500 0.687500 -vt 0.625000 0.750000 -vt 0.625000 0.687500 -vt 0.562500 0.750000 -vt 0.562500 0.687500 -vt 0.500000 0.750000 -vt 0.500000 0.687500 -vt 1.000000 0.687500 -vt 1.000000 0.750000 -vt 0.937500 0.750000 -vt 0.937500 0.687500 -vt 0.875000 0.750000 -vt 0.875000 0.687500 -vt 0.812500 0.687500 -vt 0.812500 0.750000 -vt 0.669272 0.937532 -vt 0.669272 0.874968 -vt 0.625032 0.830728 -vt 0.562468 0.830728 -vt 0.518228 0.874968 -vt 0.518228 0.937532 -vt 0.562468 0.981772 -vt 0.625032 0.981772 -vt 0.169272 0.937532 -vt 0.169272 0.874968 -vt 0.125032 0.830728 -vt 0.062468 0.830728 -vt 0.018228 0.874968 -vt 0.018228 0.937532 -vt 0.062468 0.981772 -vt 0.125032 0.981772 -vt 0.375000 0.687500 -vt 0.375000 0.750000 -vt 0.312500 0.750000 -vt 0.312500 0.687500 -vt 0.250000 0.750000 -vt 0.250000 0.687500 -vt 0.437500 0.687500 -vt 0.437500 0.750000 -vt 0.062500 0.687500 -vt 0.062500 0.750000 -vt 0.000000 0.750000 -vt 0.000000 0.687500 -vt 0.125000 0.687500 -vt 0.125000 0.750000 -vt 0.187500 0.687500 -vt 0.187500 0.750000 -vt 0.750000 0.312500 -vt 0.750000 0.375000 -vt 0.687500 0.375000 -vt 0.687500 0.312500 -vt 0.625000 0.375000 -vt 0.625000 0.312500 -vt 0.562500 0.375000 -vt 0.562500 0.312500 -vt 0.500000 0.375000 -vt 0.500000 0.312500 -vt 1.000000 0.312500 -vt 1.000000 0.375000 -vt 0.937500 0.375000 -vt 0.937500 0.312500 -vt 0.875000 0.375000 -vt 0.875000 0.312500 -vt 0.812500 0.312500 -vt 0.812500 0.375000 -vt 0.669272 0.562532 -vt 0.669272 0.499968 -vt 0.625032 0.455728 -vt 0.562468 0.455728 -vt 0.518228 0.499968 -vt 0.518228 0.562532 -vt 0.562468 0.606772 -vt 0.625032 0.606772 -vt 0.169272 0.562532 -vt 0.169272 0.499968 -vt 0.125032 0.455728 -vt 0.062468 0.455728 -vt 0.018228 0.499968 -vt 0.018228 0.562532 -vt 0.062468 0.606772 -vt 0.125032 0.606772 -vt 0.375000 0.312500 -vt 0.375000 0.375000 -vt 0.312500 0.375000 -vt 0.312500 0.312500 -vt 0.250000 0.375000 -vt 0.250000 0.312500 -vt 0.437500 0.312500 -vt 0.437500 0.375000 -vt 0.062500 0.312500 -vt 0.062500 0.375000 -vt 0.000000 0.375000 -vt 0.000000 0.312500 -vt 0.125000 0.312500 -vt 0.125000 0.375000 -vt 0.187500 0.312500 -vt 0.187500 0.375000 -vn 0.875600 -0.341600 0.341600 -vn 0.341600 -0.341600 0.875600 -vn 0.341600 -0.875600 0.341600 -vn 0.341600 0.341600 0.875600 -vn 0.875600 0.341600 0.341600 -vn 0.341600 0.875600 0.341600 -vn -0.300200 0.300200 0.905400 -vn -0.650700 0.650700 0.391300 -vn -0.300200 -0.300200 0.905400 -vn -0.650700 -0.650700 0.391300 -vn 0.110000 0.987800 0.110000 -vn 0.297100 0.717300 -0.630300 -vn -0.577400 0.577400 -0.577400 -vn 1.000000 0.000000 0.000000 -vn 0.923900 0.000000 0.382700 -vn -0.139900 -0.000000 0.990200 -vn 0.707100 0.000000 0.707100 -vn 0.676600 0.729300 0.101700 -vn 0.676600 -0.729300 0.101700 -vn 0.563000 -0.526700 0.636900 -vn 0.563000 0.526700 0.636900 -vn 0.110000 0.110000 0.987800 -vn 0.110000 -0.110000 0.987800 -vn 0.578900 0.574300 0.578900 -vn 0.717300 0.297100 -0.630200 -vn 0.717300 -0.297100 -0.630200 -vn 0.297100 -0.717300 -0.630200 -vn 0.439400 0.000000 0.898300 -vn 0.079900 0.000000 0.996800 -vn 0.988900 0.000000 -0.148700 -vn 0.110000 -0.987800 0.110000 -vn 0.578900 -0.574300 0.578900 -vn 0.297100 -0.717300 -0.630300 -vn 0.297100 0.717300 -0.630200 -vn -0.577400 -0.577400 -0.577400 -vn 0.000000 0.000000 1.000000 -vn -0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 0.707100 -0.707100 -vn 0.000000 -0.707100 -0.707100 -vn 0.000000 0.000000 -1.000000 -vn 0.707100 -0.707100 0.000000 -vn -0.707100 -0.707100 0.000000 -vn -1.000000 0.000000 0.000000 -vn -0.707100 0.707100 0.000000 -vn 0.707100 0.707100 0.000000 -g chair_Cylinder_colored -s 1 -f 31/1/1 29/2/2 43/3/3 -f 3/4/4 2/5/5 48/6/6 -f 22/7/4 20/8/5 42/9/6 -f 53/10/3 14/11/1 13/12/2 -f 32/13/3 25/14/1 23/15/2 -f 6/16/4 5/17/5 46/18/6 -f 30/19/7 28/20/4 19/21/6 38/22/8 -f 21/23/9 30/24/7 38/25/8 35/26/10 -f 10/27/1 9/28/2 50/29/3 -f 28/30/4 26/31/5 19/32/6 -f 40/33/11 42/34/6 44/35/12 39/36/13 -f 37/37/14 34/38/14 11/39/15 8/40/15 -f 67/41/16 64/42/16 56/43/17 55/44/17 -f 69/45/18 66/46/19 58/29/20 57/18/21 -f 38/22/8 19/21/6 40/33/11 39/36/13 -f 15/47/22 7/48/23 30/49/7 21/50/9 -f 21/50/9 23/51/2 6/52/4 15/47/22 -f 10/27/1 26/31/5 28/30/4 9/28/2 -f 26/31/5 24/7/24 40/9/11 19/32/6 -f 24/53/24 22/54/4 42/34/6 40/33/11 -f 14/11/1 20/8/5 22/7/4 13/12/2 -f 20/8/5 17/50/25 44/55/12 42/9/6 -f 16/56/26 17/50/25 20/8/5 14/11/1 -f 14/11/1 53/10/3 54/38/27 16/56/26 -f 63/57/28 68/58/28 60/59/29 59/60/29 -f 65/61/30 70/62/30 62/63/14 61/64/14 -f 5/17/5 6/16/4 23/15/2 25/14/1 -f 30/49/7 7/48/23 9/65/2 28/66/4 -f 21/24/9 35/25/10 32/67/3 23/68/2 -f 25/14/1 32/13/3 41/3/31 27/2/32 -f 4/4/24 5/17/5 25/14/1 27/2/32 -f 27/69/32 41/70/31 43/71/3 29/72/2 -f 2/5/5 3/4/4 29/2/2 31/1/1 -f 3/27/4 4/73/24 27/74/32 29/31/2 -f 4/75/24 3/54/4 48/76/6 47/77/11 -f 5/17/5 4/4/24 47/6/11 46/18/6 -f 13/17/2 22/14/4 24/78/24 12/79/32 -f 12/12/32 24/7/24 26/31/5 10/27/1 -f 10/27/1 50/29/3 52/10/31 12/12/32 -f 12/69/32 52/70/31 53/71/3 13/72/2 -f 31/1/1 43/3/3 45/80/33 33/49/26 -f 1/81/25 2/5/5 31/1/1 33/49/26 -f 2/5/5 1/81/25 49/37/34 48/6/6 -f 15/82/22 6/20/4 46/21/6 57/83/21 -f 7/84/23 58/85/20 50/67/3 9/68/2 -f 15/16/22 57/18/21 58/29/20 7/28/23 -f 35/25/10 36/86/35 41/70/31 32/67/3 -f 41/70/31 36/86/35 45/87/33 43/71/3 -f 55/88/17 56/89/17 70/90/30 65/91/30 -f 8/40/15 11/39/15 68/92/28 63/93/28 -f 61/64/14 62/63/14 66/46/19 69/45/18 -f 71/94/36 72/95/36 64/42/16 67/41/16 -f 59/60/29 60/59/29 72/95/36 71/94/36 -f 57/83/21 46/21/6 69/96/18 -f 69/96/18 46/21/6 61/97/37 -f 65/98/37 61/97/37 47/77/11 -f 47/77/11 61/97/37 46/21/6 -f 58/85/20 66/99/19 50/67/3 -f 66/99/19 62/100/38 50/67/3 -f 50/67/3 62/100/38 52/70/31 -f 62/100/38 70/101/38 52/70/31 -f 70/101/38 56/102/38 52/70/31 -f 56/102/38 64/103/38 52/70/31 -f 67/104/37 55/105/37 47/77/11 -f 65/98/37 47/77/11 55/105/37 -f 71/106/37 67/104/37 47/77/11 -f 64/103/38 72/107/38 52/70/31 -f 72/107/38 60/108/38 52/70/31 -f 59/109/37 71/106/37 47/77/11 -f 63/110/37 59/109/37 48/76/6 -f 47/77/11 48/76/6 59/109/37 -f 60/108/38 68/111/38 53/71/3 -f 52/70/31 60/108/38 53/71/3 -f 68/111/38 11/112/38 53/71/3 -f 8/113/37 63/110/37 48/76/6 -f 37/114/39 8/113/37 49/35/34 -f 48/76/6 49/35/34 8/113/37 -f 54/87/27 11/112/38 34/115/40 -f 53/71/3 11/112/38 54/87/27 -f 38/25/8 39/86/13 36/116/35 35/26/10 -f 18/117/41 44/118/12 17/119/25 16/120/26 54/121/27 34/122/40 -f 51/123/41 37/124/39 49/125/34 1/126/25 33/127/26 45/128/33 -g chair_Cylinder_grey -f 36/126/35 39/82/13 18/129/41 51/130/41 -g chair_Cylinder_wood -s off -f 73/131/14 74/132/14 76/133/14 75/134/14 -f 75/134/42 76/133/42 78/135/42 77/136/42 -f 77/136/38 78/135/38 80/137/38 79/138/38 -f 79/138/43 80/137/43 82/139/43 81/140/43 -f 81/141/44 82/142/44 84/143/44 83/144/44 -f 83/144/45 84/143/45 86/145/45 85/146/45 -f 87/147/46 88/148/46 74/132/46 73/131/46 -f 85/146/37 86/145/37 88/148/37 87/147/37 -f 73/149/41 75/150/41 77/151/41 79/152/41 81/153/41 83/154/41 85/155/41 87/156/41 -f 104/157/41 102/158/41 100/159/41 98/160/41 96/161/41 94/162/41 92/163/41 90/164/41 -f 92/165/37 91/166/37 89/167/37 90/168/37 -f 90/168/46 89/167/46 103/169/46 104/170/46 -f 94/171/45 93/172/45 91/166/45 92/165/45 -f 96/140/44 95/139/44 93/172/44 94/171/44 -f 98/173/43 97/174/43 95/175/43 96/176/43 -f 100/177/38 99/178/38 97/174/38 98/173/38 -f 102/179/42 101/180/42 99/178/42 100/177/42 -f 104/170/14 103/169/14 101/180/14 102/179/14 -f 105/181/14 106/182/14 108/183/14 107/184/14 -f 107/184/42 108/183/42 110/185/42 109/186/42 -f 109/186/38 110/185/38 112/187/38 111/188/38 -f 111/188/43 112/187/43 114/189/43 113/190/43 -f 113/191/44 114/192/44 116/193/44 115/194/44 -f 115/194/45 116/193/45 118/195/45 117/196/45 -f 119/197/46 120/198/46 106/182/46 105/181/46 -f 117/196/37 118/195/37 120/198/37 119/197/37 -f 105/199/41 107/200/41 109/201/41 111/202/41 113/203/41 115/204/41 117/205/41 119/206/41 -f 136/207/41 134/208/41 132/209/41 130/210/41 128/211/41 126/212/41 124/213/41 122/214/41 -f 124/215/37 123/216/37 121/217/37 122/218/37 -f 122/218/46 121/217/46 135/219/46 136/220/46 -f 126/221/45 125/222/45 123/216/45 124/215/45 -f 128/190/44 127/189/44 125/222/44 126/221/44 -f 130/223/43 129/224/43 127/225/43 128/226/43 -f 132/227/38 131/228/38 129/224/38 130/223/38 -f 134/229/42 133/230/42 131/228/42 132/227/42 -f 136/220/14 135/219/14 133/230/14 134/229/14 diff --git a/homedecor_furniture/models/homedecor_kitchen_chair.obj b/homedecor_furniture/models/homedecor_kitchen_chair.obj deleted file mode 100644 index 52bd58b..0000000 --- a/homedecor_furniture/models/homedecor_kitchen_chair.obj +++ /dev/null @@ -1,205 +0,0 @@ -# Blender v2.72 (sub 0) OBJ File: 'kitchen-chair.blend' -# www.blender.org -o Cylinder -v -0.187500 -0.312500 -0.125000 -v -0.187500 0.312500 -0.125000 -v 0.312500 -0.312500 -0.500000 -v 0.187500 -0.312500 -0.500000 -v 0.187500 -0.187500 -0.500000 -v 0.312500 -0.187500 -0.500000 -v 0.312500 -0.312500 -0.125000 -v 0.187500 -0.312500 -0.125000 -v 0.187500 -0.187500 -0.125000 -v 0.312500 -0.187500 -0.125000 -v 0.312500 0.187500 -0.500000 -v 0.187500 0.187500 -0.500000 -v 0.187500 0.312500 -0.500000 -v 0.312500 0.187500 -0.125000 -v 0.187500 0.187500 -0.125000 -v 0.187500 0.312500 -0.125000 -v 0.312500 0.312500 -0.125000 -v -0.187500 -0.312500 -0.062500 -v 0.312500 -0.312500 -0.062500 -v 0.312500 0.312500 -0.062500 -v -0.187500 -0.312500 0.000000 -v -0.187500 0.312500 0.000000 -v 0.312500 -0.312500 0.000000 -v 0.312500 0.312500 0.000000 -v -0.312500 -0.312500 0.500000 -v -0.187500 -0.312500 0.500000 -v -0.187500 -0.187500 0.500000 -v -0.312500 -0.187500 0.500000 -v -0.312500 0.187500 0.500000 -v -0.187500 0.187500 0.500000 -v -0.187500 0.312500 0.500000 -v -0.312500 0.312500 0.500000 -v -0.187500 0.312500 -0.062500 -v -0.257812 -0.187500 0.437500 -v -0.257813 0.187500 0.437500 -v -0.257812 -0.187500 0.062500 -v -0.257813 0.187500 0.062500 -v -0.242187 -0.187500 0.437500 -v -0.242187 0.187500 0.437500 -v -0.242188 -0.187500 0.062500 -v -0.242188 0.187500 0.062500 -v 0.312500 0.187500 -0.500000 -v 0.187500 0.187500 -0.500000 -v 0.187500 0.312500 -0.500000 -v 0.312500 0.312500 -0.500000 -v 0.312500 0.187500 -0.125000 -v 0.187500 0.312500 -0.125000 -v 0.312500 0.312500 -0.125000 -v -0.187500 -0.312500 -0.500000 -v -0.312500 -0.187500 -0.500000 -v -0.187500 -0.187500 -0.500000 -v -0.187500 -0.312500 0.500000 -v -0.312500 -0.187500 0.500000 -v -0.187500 -0.187500 0.500000 -v -0.187500 0.187500 0.500000 -v -0.187500 0.312500 -0.500000 -v -0.312500 -0.312500 0.500000 -v -0.187500 -0.312500 0.500000 -v -0.187500 -0.187500 -0.500000 -v -0.312500 -0.187500 -0.500000 -v -0.312500 -0.312500 -0.500000 -v -0.187500 -0.312500 -0.500000 -v -0.312500 0.312500 -0.500000 -v -0.312500 0.187500 -0.500000 -v -0.187500 0.187500 -0.500000 -v -0.312500 -0.187500 0.500000 -v -0.312500 0.187500 0.500000 -v -0.312500 0.312500 0.500000 -v -0.187500 0.312500 0.500000 -v -0.187500 0.187500 -0.125000 -v -0.187500 0.187500 0.000000 -v -0.187500 -0.187500 -0.125000 -v -0.187500 -0.187500 0.000000 -v -0.312500 0.187500 -0.125000 -v -0.312500 0.187500 0.000000 -v -0.312500 -0.187500 -0.125000 -v -0.312500 -0.187500 -0.062500 -v -0.312500 -0.187500 0.000000 -v -0.312500 0.187500 -0.062500 -vt 0.125000 0.375000 -vt 0.625000 0.375000 -vt 0.625000 0.437500 -vt 0.125000 0.437500 -vt 0.187500 0.375000 -vt 0.812500 0.375000 -vt 0.812500 0.437500 -vt 0.187500 0.437500 -vt 0.500000 0.375000 -vt 0.500000 0.000000 -vt 0.625000 0.000000 -vt 0.687500 0.375000 -vt 0.687500 0.000000 -vt 0.812500 0.000000 -vt 0.375000 0.375000 -vt 0.375000 0.000000 -vt 0.312500 0.375000 -vt 0.187500 0.000000 -vt 0.312500 0.000000 -vt 0.187500 0.812500 -vt 0.187500 0.687500 -vt 0.312500 0.687500 -vt 0.312500 0.812500 -vt 0.812500 0.812500 -vt 0.187500 0.187500 -vt 0.812500 0.187500 -vt 0.187500 1.000000 -vt 0.187500 0.875000 -vt 0.312500 0.875000 -vt 0.312500 1.000000 -vt 0.687500 1.000000 -vt 0.687500 0.875000 -vt 0.812500 0.875000 -vt 0.812500 1.000000 -vt 0.312500 0.562500 -vt 0.687500 0.562500 -vt 0.687500 0.937500 -vt 0.312500 0.937500 -vt 0.312500 0.968750 -vt 0.312500 0.906250 -vt 0.687500 0.906250 -vt 0.687500 0.968750 -vt 0.687500 0.812500 -vt 0.687500 0.687500 -vt 0.812500 0.687500 -vt 0.875000 0.375000 -vt 0.875000 0.437500 -vt 0.375000 0.437500 -vt 1.000000 1.000000 -vt 0.875000 1.000000 -vt 0.875000 0.000000 -vt 1.000000 0.000000 -vt 0.125000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 0.125000 0.000000 -vt 0.187500 0.312500 -vt 0.312500 0.187500 -vt 0.312500 0.312500 -vt 0.687500 0.312500 -vt 0.687500 0.187500 -vt 0.812500 0.312500 -vt 0.687500 0.437500 -vt 0.312500 0.437500 -vt 0.232843 0.000000 -vt 0.250000 0.937500 -vt 0.750000 0.937500 -vt 0.750000 1.000000 -vt 0.250000 1.000000 -vt 0.250000 0.687500 -vt 0.750000 0.687500 -vt 0.750000 0.750000 -vt 0.250000 0.750000 -vt 0.312500 0.625000 -vt 0.687500 0.625000 -vn 0.000000 -1.000000 0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 -0.000000 0.000000 -vn -0.000000 1.000000 0.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -g Cylinder_Cylinder_wood -s off -f 1/1/1 7/2/1 19/3/1 18/4/1 -f 7/5/2 17/6/2 20/7/2 19/8/2 -f 7/2/1 8/9/1 4/10/1 3/11/1 -f 8/6/3 9/12/3 5/13/3 4/14/3 -f 9/9/4 10/15/4 6/16/4 5/10/4 -f 10/17/2 7/5/2 3/18/2 6/19/2 -f 3/20/5 4/21/5 5/22/5 6/23/5 -f 14/2/1 15/9/1 12/10/1 11/11/1 -f 15/17/3 16/5/3 13/18/3 12/19/3 -f 17/24/5 7/20/5 1/25/5 2/26/5 -f 25/27/6 26/28/6 27/29/6 28/30/6 -f 29/31/6 30/32/6 31/33/6 32/34/6 -f 37/35/3 36/36/3 34/37/3 35/38/3 -f 41/36/2 39/37/2 38/38/2 40/35/2 -f 34/39/6 38/40/6 39/41/6 35/42/6 -f 37/40/5 41/41/5 40/42/5 36/39/5 -f 42/43/5 43/44/5 44/45/5 45/24/5 -f 48/6/2 46/12/2 42/13/2 45/14/2 -f 17/15/4 2/46/4 33/47/4 20/48/4 -f 47/9/4 48/15/4 45/16/4 44/10/4 -f 53/49/4 54/50/4 51/51/4 50/52/4 -f 54/30/2 52/27/2 49/18/2 51/19/2 -f 55/53/1 67/54/1 64/55/1 65/56/1 -f 62/57/5 61/25/5 60/58/5 59/59/5 -f 65/60/5 64/61/5 63/26/5 56/62/5 -f 57/34/3 66/31/3 60/13/3 61/14/3 -f 58/53/1 57/54/1 61/55/1 62/56/1 -f 69/34/2 55/31/2 65/13/2 56/14/2 -f 68/49/4 69/50/4 56/51/4 63/52/4 -f 67/30/3 68/27/3 63/18/3 64/19/3 -f 77/63/3 79/64/3 74/17/3 76/12/3 -f 70/65/5 72/65/5 76/65/5 74/65/5 -f 72/65/2 70/65/2 71/65/2 73/65/2 -g Cylinder_Cylinder_seat -f 19/20/2 20/24/2 24/33/2 23/28/2 -f 24/20/6 22/57/6 21/62/6 23/24/6 -f 18/66/1 19/67/1 23/68/1 21/69/1 -f 20/70/4 33/71/4 22/72/4 24/73/4 -f 77/74/3 78/35/3 75/36/3 79/75/3 -f 73/60/6 71/59/6 75/58/6 78/61/6 diff --git a/homedecor_furniture/textures/homedecor_armchair_inv.png b/homedecor_furniture/textures/homedecor_armchair_inv.png deleted file mode 100644 index 41eb85d..0000000 Binary files a/homedecor_furniture/textures/homedecor_armchair_inv.png and /dev/null differ diff --git a/homedecor_furniture/textures/homedecor_chair_padded_inv.png b/homedecor_furniture/textures/homedecor_chair_padded_inv.png deleted file mode 100644 index 1d59dd5..0000000 Binary files a/homedecor_furniture/textures/homedecor_chair_padded_inv.png and /dev/null differ diff --git a/homedecor_furniture/textures/homedecor_chair_wood_inv.png b/homedecor_furniture/textures/homedecor_chair_wood_inv.png deleted file mode 100644 index 12c216a..0000000 Binary files a/homedecor_furniture/textures/homedecor_chair_wood_inv.png and /dev/null differ -- cgit v1.2.3