mff/homedecor_modpack
1
0
Fork 0
forked from mtcontrib/homedecor_modpack
Code Issues Pull Requests Releases Wiki Activity

use param2 colorization for homedecor kitchen chairs and armchairs

Browse Source 
Note that the all-wood kitchen chair cannot be colored.
This commit is contained in:
Vanessa Ezekowitz 2017-01-30 19:44:44 -05:00
parent ac9927d035
commit dd0e26d95b
8 changed files with 430 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
homedecor/furniture.lua
View File

@ -55,33 +55,20 @@ local ac_cbox = {
} }
} }
for _, t in ipairs(chaircolors) do homedecor.register("kitchen_chair_wood", {
description = S("Kitchen chair"),
local woolcolor, colordesc = unpack(t) mesh = "homedecor_kitchen_chair.obj",
local color = woolcolor tiles = {
local chairtiles
if woolcolor == "" then
chairtiles = {
homedecor.plain_wood, homedecor.plain_wood,
homedecor.plain_wood homedecor.plain_wood
} },
else inventory_image = "homedecor_chair_wood_inv.png",
color = "_"..woolcolor paramtype2 = "wallmounted",
chairtiles = {
homedecor.plain_wood,
"wool"..color..".png",
}
end
homedecor.register("chair"..color, {
description = S("Kitchen chair (@1)", colordesc),
mesh = "homedecor_kitchen_chair.obj",
tiles = chairtiles,
selection_box = kc_cbox, selection_box = kc_cbox,
collision_box = kc_cbox, collision_box = kc_cbox,
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
after_place_node = homedecor.fix_rotation_nsew,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
pos.y = pos.y+0 -- where do I put my ass ? pos.y = pos.y+0 -- where do I put my ass ?
homedecor.sit(pos, node, clicker) homedecor.sit(pos, node, clicker)
@ -89,30 +76,57 @@ for _, t in ipairs(chaircolors) do
end end
}) })
if color ~= "" then homedecor.register("kitchen_chair_padded", {
homedecor.register("armchair"..color, { description = S("Kitchen chair"),
description = S("Armchair (@1)", colordesc), mesh = "homedecor_kitchen_chair.obj",
mesh = "forniture_armchair.obj",
tiles = { tiles = {
"wool"..color..".png", homedecor.plain_wood,
"wool_dark_grey.png", "wool_white.png",
"default_wood.png"
}, },
groups = {snappy=3}, 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},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
node_box = ac_cbox after_place_node = homedecor.fix_rotation_nsew,
after_dig_node = unifieddyes.after_dig_node,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local itemname = itemstack:get_name()
if string.find(itemname, "dye:") or string.find(itemname, "unifieddyes:") then
unifieddyes.on_rightclick(pos, node, clicker,
itemstack, pointed_thing, "homedecor:kitchen_chair_padded", "wallmounted")
else
pos.y = pos.y+0 -- where do I put my ass ?
homedecor.sit(pos, node, clicker)
return itemstack
end
end
}) })
minetest.register_craft({ homedecor.register("armchair", {
output = "homedecor:armchair"..color.." 2", description = S("Armchair"),
recipe = { mesh = "forniture_armchair.obj",
{ "wool:"..woolcolor,""}, tiles = {
{ "group:wood","group:wood" }, "wool_white.png",
{ "wool:"..woolcolor,"wool:"..woolcolor }, { 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},
sounds = default.node_sound_wood_defaults(),
node_box = ac_cbox,
after_place_node = homedecor.fix_rotation_nsew,
after_dig_node = unifieddyes.after_dig_node,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
local itemname = itemstack:get_name()
unifieddyes.on_rightclick(pos, node, clicker,
itemstack, pointed_thing, "homedecor:armchair", "wallmounted")
end
}) })
end
end
local ob_cbox = { local ob_cbox = {
type = "fixed", type = "fixed",
@ -161,3 +175,72 @@ minetest.register_alias("homedecor:armchair", "homedecor:armchair_black")
minetest.register_alias('table', 'homedecor:table') minetest.register_alias('table', 'homedecor:table')
minetest.register_alias('chair', 'homedecor:chair') minetest.register_alias('chair', 'homedecor:chair')
minetest.register_alias('armchair', 'homedecor:armchair') minetest.register_alias('armchair', 'homedecor:armchair')
-- conversion to param2 colorization
homedecor.old_static_chairs = {}
for _, color in ipairs(lrfurn.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 = true,
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"
print(name, dump(a), dump(b), dump(color).."("..dump(paletteidx)..")", dump(param2))
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
})

40
homedecor/furniture_recipes.lua
View File

@ -1,6 +1,6 @@
minetest.register_craft({ minetest.register_craft({
output = "homedecor:table", "homedecor:chair 2", output = "homedecor:table", "homedecor:kitchen_chair_wood 2",
recipe = { recipe = {
{ "group:wood","group:wood", "group:wood" }, { "group:wood","group:wood", "group:wood" },
{ "group:stick", "", "group:stick" }, { "group:stick", "", "group:stick" },
@ -53,7 +53,7 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:chair 2", output = "homedecor:kitchen_chair_wood 2",
recipe = { recipe = {
{ "group:stick",""}, { "group:stick",""},
{ "group:wood","group:wood" }, { "group:wood","group:wood" },
@ -62,40 +62,34 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
type = "fuel", output = "homedecor:armchair 2",
recipe = "homedecor:chair", recipe = {
burntime = 15, { "wool:white",""},
{ "group:wood","group:wood" },
{ "wool:white","wool:white" },
},
}) })
local chaircolors = { "black", "red", "pink", "violet", "blue", "dark_green" }
for _, color in ipairs(chaircolors) do
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "homedecor:chair_"..color, output = "homedecor:kitchen_chair_padded",
recipe = { recipe = {
"homedecor:chair", "homedecor:kitchen_chair_wood",
"wool:white", "wool:white",
"dye:"..color
},
})
minetest.register_craft({
type = "shapeless",
output = "homedecor:chair_"..color,
recipe = {
"homedecor:chair",
"wool:"..color
}, },
}) })
minetest.register_craft({ minetest.register_craft({
type = "fuel", type = "fuel",
recipe = "homedecor:chair_"..color, recipe = "homedecor:kitchen_chair_wood",
burntime = 15,
})
minetest.register_craft({
type = "fuel",
recipe = "homedecor:kitchen_chair_padded",
burntime = 15, burntime = 15,
}) })
end
minetest.register_craft({ minetest.register_craft({
type = "fuel", type = "fuel",

8
homedecor/init.lua
View File

@ -79,6 +79,14 @@ function homedecor.fix_rotation(pos, placer, itemstack, pointed_thing)
minetest.swap_node(pos, { name = node.name, param2 = fdir }) minetest.swap_node(pos, { name = node.name, param2 = fdir })
end end
function homedecor.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
local node = minetest.get_node(pos)
local yaw = placer:get_look_yaw()
local dir = minetest.yaw_to_dir(yaw)
local fdir = minetest.dir_to_wallmounted(dir)
minetest.swap_node(pos, { name = node.name, param2 = fdir })
end
screwdriver = screwdriver or {} screwdriver = screwdriver or {}
homedecor.plain_wood = { name = "homedecor_generic_wood_plain.png", color = 0xffa76820 } homedecor.plain_wood = { name = "homedecor_generic_wood_plain.png", color = 0xffa76820 }

358
homedecor/models/forniture_armchair.obj
View File

@ -1,142 +1,142 @@
# Blender v2.73 (sub 0) OBJ File: 'forniture-armchair.blend' # Blender v2.72 (sub 0) OBJ File: 'forniture-armchair.blend'
# www.blender.org # www.blender.org
o chair_Cylinder o chair_Cylinder
v 0.375000 -0.437500 -0.500000 v 0.500000 -0.375000 -0.437500
v 0.375000 0.039062 -0.500000 v 0.500000 -0.375000 0.039062
v 0.375000 0.101562 -0.437500 v 0.437500 -0.375000 0.101562
v 0.375000 0.101562 0.035156 v -0.035156 -0.375000 0.101562
v 0.375000 0.437500 0.035156 v -0.035156 -0.375000 0.437500
v 0.375000 0.500000 0.097656 v -0.097656 -0.375000 0.500000
v -0.375000 0.500000 0.375000 v -0.375000 0.375000 0.500000
v 0.312500 -0.187500 -0.375000 v 0.375000 -0.312500 -0.187500
v -0.375000 0.500000 0.097656 v -0.097656 0.375000 0.500000
v -0.375000 0.437500 0.035156 v -0.035156 0.375000 0.437500
v -0.312500 -0.187500 -0.375000 v 0.375000 0.312500 -0.187500
v -0.375000 0.101562 0.035156 v -0.035156 0.375000 0.101562
v -0.375000 0.101562 -0.437500 v 0.437500 0.375000 0.101562
v -0.375000 0.039062 -0.500000 v 0.500000 0.375000 0.039062
v 0.375000 0.500000 0.375000 v -0.375000 -0.375000 0.500000
v -0.375000 -0.437500 -0.500000 v 0.500000 0.375000 -0.437500
v -0.437500 -0.437500 -0.500000 v 0.500000 0.437500 -0.437500
v -0.500000 -0.437500 -0.375000 v 0.375000 0.500000 -0.437500
v -0.500000 0.437500 0.097656 v -0.097656 0.500000 0.437500
v -0.437500 0.039062 -0.500000 v 0.500000 0.437500 0.039062
v 0.437500 0.500000 0.437500 v -0.437500 -0.437500 0.500000
v -0.437500 0.101562 -0.437500 v 0.437500 0.437500 0.101562
v 0.437500 0.500000 0.097656 v -0.097656 -0.437500 0.500000
v -0.437500 0.101562 0.035156 v -0.035156 0.437500 0.101562
v 0.437500 0.437500 0.035156 v -0.035156 -0.437500 0.437500
v -0.437500 0.437500 0.035156 v -0.035156 0.437500 0.437500
v 0.437500 0.101562 0.035156 v -0.035156 -0.437500 0.101562
v -0.437500 0.500000 0.097656 v -0.097656 0.437500 0.500000
v 0.437500 0.101562 -0.437500 v 0.437500 -0.437500 0.101562
v -0.437500 0.500000 0.437500 v -0.437500 0.437500 0.500000
v 0.437500 0.039062 -0.500000 v 0.500000 -0.437500 0.039062
v 0.500000 0.437500 0.097656 v -0.097656 -0.500000 0.437500
v 0.437500 -0.437500 -0.500000
v -0.312500 -0.437500 -0.375000
v 0.500000 0.437500 0.500000
v 0.500000 -0.437500 0.500000
v 0.312500 -0.437500 -0.375000
v -0.500000 0.437500 0.500000
v -0.500000 -0.437500 0.500000
v -0.500000 0.039062 0.097656
v 0.500000 0.039062 0.097656
v -0.500000 0.039062 -0.437500
v 0.500000 0.039062 -0.437500
v -0.500000 -0.437500 -0.437500
v 0.500000 -0.437500 -0.437500 v 0.500000 -0.437500 -0.437500
v 0.312500 0.437500 0.097656 v 0.375000 0.312500 -0.437500
v 0.312500 0.039062 0.097656 v -0.500000 -0.500000 0.437500
v 0.312500 0.039062 -0.437500 v -0.500000 -0.500000 -0.437500
v 0.312500 -0.437500 -0.437500 v 0.375000 -0.312500 -0.437500
v -0.312500 0.437500 0.097656 v -0.500000 0.500000 0.437500
v 0.500000 -0.437500 -0.375000 v -0.500000 0.500000 -0.437500
v -0.312500 0.039062 0.097656 v -0.097656 0.500000 0.039062
v -0.312500 0.039062 -0.437500 v -0.097656 -0.500000 0.039062
v -0.312500 -0.437500 -0.437500 v 0.437500 0.500000 0.039062
v 0.312500 -0.125000 0.312500 v 0.437500 -0.500000 0.039062
v -0.312500 -0.125000 0.312500 v 0.437500 0.500000 -0.437500
v 0.312500 0.437500 0.312500 v 0.437500 -0.500000 -0.437500
v -0.312500 0.437500 0.312500 v -0.097656 -0.312500 0.437500
v 0.312500 -0.109375 -0.187500 v -0.097656 -0.312500 0.039062
v -0.312500 -0.109375 -0.187500 v 0.437500 -0.312500 0.039062
v 0.312500 0.156250 0.285156 v 0.437500 -0.312500 -0.437500
v -0.312500 0.156250 0.285156 v -0.097656 0.312500 0.437500
v 0.312500 -0.125000 -0.312500 v 0.375000 -0.500000 -0.437500
v -0.312500 -0.109375 0.250000 v -0.097656 0.312500 0.039062
v 0.312500 -0.062500 0.296875 v 0.437500 0.312500 0.039062
v -0.312500 0.375000 0.296875 v 0.437500 0.312500 -0.437500
v 0.312500 -0.109375 0.250000 v -0.312500 -0.312500 -0.125000
v -0.312500 -0.125000 -0.312500 v -0.312500 0.312500 -0.125000
v 0.312500 0.375000 0.296875 v -0.312500 -0.312500 0.437500
v -0.312500 -0.062500 0.296875 v -0.312500 0.312500 0.437500
v 0.312500 -0.101562 0.031250 v 0.187500 -0.312500 -0.109375
v -0.312500 -0.101562 0.031250 v 0.187500 0.312500 -0.109375
v -0.432138 -0.500000 0.343750 v -0.285156 -0.312500 0.156250
v -0.432138 -0.437500 0.343750 v -0.285156 0.312500 0.156250
v -0.380362 -0.500000 0.343750 v 0.312500 -0.312500 -0.125000
v -0.380362 -0.437500 0.343750 v -0.250000 0.312500 -0.109375
v -0.343750 -0.500000 0.380362 v -0.296875 -0.312500 -0.062500
v -0.343750 -0.437500 0.380362 v -0.296875 0.312500 0.375000
v -0.343750 -0.500000 0.432138 v -0.250000 -0.312500 -0.109375
v -0.343750 -0.437500 0.432138 v 0.312500 0.312500 -0.125000
v -0.380362 -0.500000 0.468750 v -0.296875 -0.312500 0.375000
v -0.380362 -0.437500 0.468750 v -0.296875 0.312500 -0.062500
v -0.432138 -0.500000 0.468750 v -0.031250 -0.312500 -0.101562
v -0.432138 -0.437500 0.468750 v -0.031250 0.312500 -0.101562
v -0.468750 -0.500000 0.432138 v -0.343750 0.432138 -0.500000
v -0.468750 -0.437500 0.432138 v -0.343750 0.432138 -0.437500
v -0.468750 -0.500000 0.380362 v -0.343750 0.380361 -0.500000
v -0.468750 -0.437500 0.380362 v -0.343750 0.380361 -0.437500
v 0.343750 -0.437500 0.380362 v -0.380362 0.343750 -0.500000
v 0.343750 -0.500000 0.380362 v -0.380362 0.343750 -0.437500
v 0.343750 -0.437500 0.432138 v -0.432139 0.343750 -0.500000
v 0.343750 -0.500000 0.432138 v -0.432139 0.343750 -0.437500
v 0.380362 -0.437500 0.468750 v -0.468750 0.380361 -0.500000
v 0.380362 -0.500000 0.468750 v -0.468750 0.380361 -0.437500
v 0.432138 -0.437500 0.468750 v -0.468750 0.432138 -0.500000
v 0.432138 -0.500000 0.468750 v -0.468750 0.432138 -0.437500
v 0.468750 -0.437500 0.432138 v -0.432139 0.468750 -0.500000
v 0.468750 -0.500000 0.432138 v -0.432139 0.468750 -0.437500
v 0.468750 -0.437500 0.380362 v -0.380362 0.468750 -0.500000
v 0.468750 -0.500000 0.380362 v -0.380362 0.468750 -0.437500
v 0.432138 -0.437500 0.343750 v -0.380361 -0.343750 -0.437500
v 0.432138 -0.500000 0.343750 v -0.380361 -0.343750 -0.500000
v 0.380362 -0.437500 0.343750 v -0.432138 -0.343750 -0.437500
v 0.380362 -0.500000 0.343750 v -0.432138 -0.343750 -0.500000
v -0.432138 -0.500000 -0.468750 v -0.468750 -0.380362 -0.437500
v -0.432138 -0.437500 -0.468750 v -0.468750 -0.380362 -0.500000
v -0.380362 -0.500000 -0.468750 v -0.468750 -0.432139 -0.437500
v -0.380362 -0.437500 -0.468750 v -0.468750 -0.432139 -0.500000
v -0.343750 -0.500000 -0.432138 v -0.432138 -0.468750 -0.437500
v -0.343750 -0.437500 -0.432138 v -0.432138 -0.468750 -0.500000
v -0.343750 -0.500000 -0.380362 v -0.380361 -0.468750 -0.437500
v -0.343750 -0.437500 -0.380362 v -0.380361 -0.468750 -0.500000
v -0.380362 -0.500000 -0.343750 v -0.343750 -0.432139 -0.437500
v -0.380362 -0.437500 -0.343750 v -0.343750 -0.432139 -0.500000
v -0.432138 -0.500000 -0.343750 v -0.343750 -0.380362 -0.437500
v -0.432138 -0.437500 -0.343750 v -0.343750 -0.380362 -0.500000
v -0.468750 -0.500000 -0.380362 v 0.468750 0.432139 -0.500000
v -0.468750 -0.437500 -0.380362 v 0.468750 0.432139 -0.437500
v -0.468750 -0.500000 -0.432138 v 0.468750 0.380362 -0.500000
v -0.468750 -0.437500 -0.432138 v 0.468750 0.380362 -0.437500
v 0.343750 -0.437500 -0.432138 v 0.432138 0.343750 -0.500000
v 0.343750 -0.500000 -0.432138 v 0.432138 0.343750 -0.437500
v 0.343750 -0.437500 -0.380362 v 0.380361 0.343750 -0.500000
v 0.343750 -0.500000 -0.380362 v 0.380361 0.343750 -0.437500
v 0.380362 -0.437500 -0.343750 v 0.343750 0.380362 -0.500000
v 0.380362 -0.500000 -0.343750 v 0.343750 0.380362 -0.437500
v 0.432138 -0.437500 -0.343750 v 0.343750 0.432139 -0.500000
v 0.432138 -0.500000 -0.343750 v 0.343750 0.432139 -0.437500
v 0.468750 -0.437500 -0.380362 v 0.380361 0.468750 -0.500000
v 0.468750 -0.500000 -0.380362 v 0.380361 0.468750 -0.437500
v 0.468750 -0.437500 -0.432138 v 0.432138 0.468750 -0.500000
v 0.468750 -0.500000 -0.432138 v 0.432138 0.468750 -0.437500
v 0.432138 -0.437500 -0.468750 v 0.432139 -0.343750 -0.437500
v 0.432138 -0.500000 -0.468750 v 0.432139 -0.343750 -0.500000
v 0.380362 -0.437500 -0.468750 v 0.380362 -0.343750 -0.437500
v 0.380362 -0.500000 -0.468750 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.539162
vt 0.062590 0.601648 vt 0.062590 0.601648
vt 0.000103 0.539162 vt 0.000103 0.539162
@ -367,52 +367,52 @@ vt 0.125000 0.312500
vt 0.125000 0.375000 vt 0.125000 0.375000
vt 0.187500 0.312500 vt 0.187500 0.312500
vt 0.187500 0.375000 vt 0.187500 0.375000
vn 0.341600 0.341600 -0.875600 vn 0.875600 -0.341600 0.341600
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.341600 0.875600 -0.341600 vn 0.341600 0.341600 0.875600
vn -0.341600 0.341600 -0.875600 vn 0.875600 0.341600 0.341600
vn -0.875600 0.341600 -0.341600 vn 0.341600 0.875600 0.341600
vn -0.300200 0.905400 0.300200 vn -0.300200 0.300200 0.905400
vn -0.650700 0.391300 0.650700 vn -0.650700 0.650700 0.391300
vn 0.300200 0.905400 0.300200 vn -0.300200 -0.300200 0.905400
vn 0.650700 0.391300 0.650700 vn -0.650700 -0.650700 0.391300
vn -0.987800 0.110000 -0.110000 vn 0.110000 0.987800 0.110000
vn -0.717300 -0.630300 -0.297100 vn 0.297100 0.717300 -0.630300
vn -0.577400 -0.577400 0.577400 vn -0.577400 0.577400 -0.577400
vn 0.000000 0.000000 -1.000000
vn 0.000000 0.382700 -0.923900
vn 0.000000 0.990200 0.139900
vn 0.000000 0.707100 -0.707100
vn -0.729300 0.101700 -0.676600
vn 0.729300 0.101700 -0.676600
vn 0.526700 0.636900 -0.563000
vn -0.526700 0.636900 -0.563000
vn -0.110000 0.987800 -0.110000
vn 0.110000 0.987800 -0.110000
vn -0.574300 0.578900 -0.578900
vn -0.297100 -0.630200 -0.717300
vn 0.297100 -0.630200 -0.717300
vn 0.717300 -0.630200 -0.297100
vn 0.000000 0.898300 -0.439400
vn 0.000000 0.996800 -0.079900
vn 0.000000 -0.148700 -0.988900
vn 0.987800 0.110000 -0.110000
vn 0.574300 0.578900 -0.578900
vn 0.717300 -0.630300 -0.297100
vn -0.717300 -0.630200 -0.297100
vn 0.577400 -0.577400 0.577400
vn 0.000000 1.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 1.000000 0.000000 0.000000 vn 1.000000 0.000000 0.000000
vn -0.707100 -0.707100 0.000000 vn 0.923900 0.000000 0.382700
vn 0.707100 -0.707100 0.000000 vn -0.139900 -0.000000 0.990200
vn 0.000000 -1.000000 0.000000
vn 0.707100 0.000000 -0.707100
vn 0.707100 0.000000 0.707100 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 0.000000 1.000000
vn -0.707100 0.000000 0.707100 vn -0.000000 1.000000 0.000000
vn -0.707100 0.000000 -0.707100 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 g chair_Cylinder_colored
s 1 s 1
f 31/1/1 29/2/2 43/3/3 f 31/1/1 29/2/2 43/3/3

166
homedecor/models/homedecor_kitchen_chair.obj
View File

@ -1,85 +1,85 @@
# Blender v2.73 (sub 0) OBJ File: 'kitchen-chair.blend' # Blender v2.72 (sub 0) OBJ File: 'kitchen-chair.blend'
# www.blender.org # www.blender.org
o Cylinder o Cylinder
v 0.312500 -0.125000 0.187500 v -0.187500 -0.312500 -0.125000
v -0.312500 -0.125000 0.187500 v -0.187500 0.312500 -0.125000
v 0.312500 -0.500000 -0.312500 v 0.312500 -0.312500 -0.500000
v 0.312500 -0.500000 -0.187500 v 0.187500 -0.312500 -0.500000
v 0.187500 -0.500000 -0.187500 v 0.187500 -0.187500 -0.500000
v 0.187500 -0.500000 -0.312500 v 0.312500 -0.187500 -0.500000
v 0.312500 -0.125000 -0.312500 v 0.312500 -0.312500 -0.125000
v 0.312500 -0.125000 -0.187500 v 0.187500 -0.312500 -0.125000
v 0.187500 -0.125000 -0.187500 v 0.187500 -0.187500 -0.125000
v 0.187500 -0.125000 -0.312500 v 0.312500 -0.187500 -0.125000
v -0.187500 -0.500000 -0.312500 v 0.312500 0.187500 -0.500000
v -0.187500 -0.500000 -0.187500 v 0.187500 0.187500 -0.500000
v -0.312500 -0.500000 -0.187500 v 0.187500 0.312500 -0.500000
v -0.187500 -0.125000 -0.312500 v 0.312500 0.187500 -0.125000
v -0.187500 -0.125000 -0.187500 v 0.187500 0.187500 -0.125000
v -0.312500 -0.125000 -0.187500 v 0.187500 0.312500 -0.125000
v -0.312500 -0.125000 -0.312500 v 0.312500 0.312500 -0.125000
v 0.312500 -0.062500 0.187500 v -0.187500 -0.312500 -0.062500
v 0.312500 -0.062500 -0.312500 v 0.312500 -0.312500 -0.062500
v -0.312500 -0.062500 -0.312500 v 0.312500 0.312500 -0.062500
v 0.312500 0.000000 0.187500 v -0.187500 -0.312500 0.000000
v -0.312500 0.000000 0.187500 v -0.187500 0.312500 0.000000
v 0.312500 0.000000 -0.312500 v 0.312500 -0.312500 0.000000
v -0.312500 0.000000 -0.312500 v 0.312500 0.312500 0.000000
v 0.312500 0.500000 0.312500 v -0.312500 -0.312500 0.500000
v 0.312500 0.500000 0.187500 v -0.187500 -0.312500 0.500000
v 0.187500 0.500000 0.187500 v -0.187500 -0.187500 0.500000
v 0.187500 0.500000 0.312500 v -0.312500 -0.187500 0.500000
v -0.187500 0.500000 0.312500 v -0.312500 0.187500 0.500000
v -0.187500 0.500000 0.187500 v -0.187500 0.187500 0.500000
v -0.312500 0.500000 0.187500 v -0.187500 0.312500 0.500000
v -0.312500 0.500000 0.312500 v -0.312500 0.312500 0.500000
v -0.312500 -0.062500 0.187500 v -0.187500 0.312500 -0.062500
v 0.187500 0.437500 0.257812 v -0.257812 -0.187500 0.437500
v -0.187500 0.437500 0.257813 v -0.257813 0.187500 0.437500
v 0.187500 0.062500 0.257812 v -0.257812 -0.187500 0.062500
v -0.187500 0.062500 0.257813 v -0.257813 0.187500 0.062500
v 0.187500 0.437500 0.242187 v -0.242187 -0.187500 0.437500
v -0.187500 0.437500 0.242187 v -0.242187 0.187500 0.437500
v 0.187500 0.062500 0.242188 v -0.242188 -0.187500 0.062500
v -0.187500 0.062500 0.242188 v -0.242188 0.187500 0.062500
v -0.187500 -0.500000 -0.312500 v 0.312500 0.187500 -0.500000
v -0.187500 -0.500000 -0.187500 v 0.187500 0.187500 -0.500000
v -0.312500 -0.500000 -0.187500 v 0.187500 0.312500 -0.500000
v -0.312500 -0.500000 -0.312500 v 0.312500 0.312500 -0.500000
v -0.187500 -0.125000 -0.312500 v 0.312500 0.187500 -0.125000
v -0.312500 -0.125000 -0.187500 v 0.187500 0.312500 -0.125000
v -0.312500 -0.125000 -0.312500 v 0.312500 0.312500 -0.125000
v 0.312500 -0.500000 0.187500 v -0.187500 -0.312500 -0.500000
v 0.187500 -0.500000 0.312500 v -0.312500 -0.187500 -0.500000
v 0.187500 -0.500000 0.187500 v -0.187500 -0.187500 -0.500000
v 0.312500 0.500000 0.187500 v -0.187500 -0.312500 0.500000
v 0.187500 0.500000 0.312500 v -0.312500 -0.187500 0.500000
v 0.187500 0.500000 0.187500 v -0.187500 -0.187500 0.500000
v -0.187500 0.500000 0.187500 v -0.187500 0.187500 0.500000
v -0.312500 -0.500000 0.187500 v -0.187500 0.312500 -0.500000
v 0.312500 0.500000 0.312500 v -0.312500 -0.312500 0.500000
v 0.312500 0.500000 0.187500 v -0.187500 -0.312500 0.500000
v 0.187500 -0.500000 0.187500 v -0.187500 -0.187500 -0.500000
v 0.187500 -0.500000 0.312500 v -0.312500 -0.187500 -0.500000
v 0.312500 -0.500000 0.312500 v -0.312500 -0.312500 -0.500000
v 0.312500 -0.500000 0.187500 v -0.187500 -0.312500 -0.500000
v -0.312500 -0.500000 0.312500 v -0.312500 0.312500 -0.500000
v -0.187500 -0.500000 0.312500 v -0.312500 0.187500 -0.500000
v -0.187500 -0.500000 0.187500 v -0.187500 0.187500 -0.500000
v 0.187500 0.500000 0.312500 v -0.312500 -0.187500 0.500000
v -0.187500 0.500000 0.312500 v -0.312500 0.187500 0.500000
v -0.312500 0.500000 0.312500 v -0.312500 0.312500 0.500000
v -0.312500 0.500000 0.187500 v -0.187500 0.312500 0.500000
v -0.187500 -0.125000 0.187500 v -0.187500 0.187500 -0.125000
v -0.187500 0.000000 0.187500 v -0.187500 0.187500 0.000000
v 0.187500 -0.125000 0.187500 v -0.187500 -0.187500 -0.125000
v 0.187500 0.000000 0.187500 v -0.187500 -0.187500 0.000000
v -0.187500 -0.125000 0.312500 v -0.312500 0.187500 -0.125000
v -0.187500 0.000000 0.312500 v -0.312500 0.187500 0.000000
v 0.187500 -0.125000 0.312500 v -0.312500 -0.187500 -0.125000
v 0.187500 -0.062500 0.312500 v -0.312500 -0.187500 -0.062500
v 0.187500 0.000000 0.312500 v -0.312500 -0.187500 0.000000
v -0.187500 -0.062500 0.312500 v -0.312500 0.187500 -0.062500
vt 0.125000 0.375000 vt 0.125000 0.375000
vt 0.625000 0.375000 vt 0.625000 0.375000
vt 0.625000 0.437500 vt 0.625000 0.437500
@ -155,12 +155,12 @@ vt 0.750000 0.750000
vt 0.250000 0.750000 vt 0.250000 0.750000
vt 0.312500 0.625000 vt 0.312500 0.625000
vt 0.687500 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 -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
vn 0.000000 0.000000 1.000000 vn 0.000000 0.000000 1.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 -1.000000 0.000000
vn 0.000000 1.000000 0.000000
g Cylinder_Cylinder_wood g Cylinder_Cylinder_wood
s off s off
f 1/1/1 7/2/1 19/3/1 18/4/1 f 1/1/1 7/2/1 19/3/1 18/4/1

BIN
homedecor/textures/homedecor_armchair_inv.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
homedecor/textures/homedecor_chair_padded_inv.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
homedecor/textures/homedecor_chair_wood_inv.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB