Small updates, mostly to furniture

master
Nathan Salapat 2021-11-26 14:37:26 -06:00
parent 875ef5ec37
commit 05f356731f
38 changed files with 1404 additions and 15 deletions

View File

@ -46,3 +46,22 @@ for i in ipairs(dye_table) do
})
end
minetest.register_node('furniture:desk', {
description = 'Desk',
drawtype = 'mesh',
mesh = 'furniture_desk.obj',
tiles = {'furniture_desk.png'},
paramtype = 'light',
paramtype2 = 'colorfacedir',
palette = 'furniture_stain_palette.png',
selection_box = {
type = 'fixed',
fixed = {-.5, -.5, -.5, 1.5, .5, .5}
},
collision_box = {
type = 'fixed',
fixed = {-.5, -.5, -.5, 1.5, .5, .5}
},
groups = {oddly_breakable_by_hand = 2, choppy=3, stainable=1},
})

View File

@ -33,3 +33,15 @@ minetest.register_craft({
'furniture:lock'
}
})
minetest.register_craft({
type = 'shapeless',
output = 'furniture:railing_corner',
recipe = {'furniture:railing_straight', 'furniture:railing_straight'}
})
minetest.register_craft({
type = 'shapeless',
output = 'furniture:railing_straight 2',
recipe = {'furniture:railing_corner'}
})

View File

@ -53,6 +53,9 @@ end
function furniture.curtain_removal(pos, node, digger)
local nodename = node.name
local fdir = node.param2
if fdir >= 3 then
return
end
local posr = {x = pos.x + fdir_table[fdir+1][1], y=pos.y, z = pos.z + fdir_table[fdir+1][2]}
local posl = {x = pos.x - fdir_table[fdir+1][1], y=pos.y, z = pos.z - fdir_table[fdir+1][2]}
local noder = minetest.get_node(posr)
@ -215,6 +218,7 @@ for i in ipairs(dye_table) do
inventory_image = 'furniture_curtain_short_1.png^[multiply:'..hex,
paramtype = 'light',
paramtype2 = 'facedir',
walkable = false,
sunlight_propagates = true,
selection_box = {
type = 'fixed',
@ -273,6 +277,7 @@ for i in ipairs(dye_table) do
inventory_image = 'furniture_curtain_sl_1.png^[multiply:'..hex,
paramtype = 'light',
paramtype2 = 'facedir',
walkable = false,
sunlight_propagates = true,
drop = 'furniture:curtain_ss_'..name..'_1',
selection_box = {
@ -329,6 +334,7 @@ for i in ipairs(dye_table) do
inventory_image = 'furniture_curtain_sr_1.png^[multiply:'..hex,
paramtype = 'light',
paramtype2 = 'facedir',
walkable = false,
sunlight_propagates = true,
drop = 'furniture:curtain_ss_'..name..'_1',
selection_box = {
@ -385,6 +391,7 @@ for i in ipairs(dye_table) do
inventory_image = 'furniture_curtain_sc_1.png^[multiply:'..hex,
paramtype = 'light',
paramtype2 = 'facedir',
walkable = false,
sunlight_propagates = true,
drop = 'furniture:curtain_ss_'..name..'_1',
selection_box = {
@ -440,6 +447,7 @@ for i in ipairs(dye_table) do
inventory_image = 'furniture_curtain_tall_1.png^[multiply:'..hex,
paramtype = 'light',
paramtype2 = 'facedir',
walkable = false,
sunlight_propagates = true,
selection_box = {
type = 'fixed',
@ -498,6 +506,7 @@ for i in ipairs(dye_table) do
inventory_image = 'furniture_curtain_tl_1.png^[multiply:'..hex,
paramtype = 'light',
paramtype2 = 'facedir',
walkable = false,
sunlight_propagates = true,
drop = 'furniture:curtain_tl_'..name..'_1',
selection_box = {
@ -554,6 +563,7 @@ for i in ipairs(dye_table) do
inventory_image = 'furniture_curtain_tr_1.png^[multiply:'..hex,
paramtype = 'light',
paramtype2 = 'facedir',
walkable = false,
sunlight_propagates = true,
drop = 'furniture:curtain_tl_'..name..'_1',
selection_box = {
@ -610,6 +620,7 @@ for i in ipairs(dye_table) do
inventory_image = 'furniture_curtain_tc_1.png^[multiply:'..hex,
paramtype = 'light',
paramtype2 = 'facedir',
walkable = false,
sunlight_propagates = true,
drop = 'furniture:curtain_tl_'..name..'_1',
selection_box = {

View File

@ -11,6 +11,7 @@ dofile(minetest.get_modpath('furniture')..'/formspecs.lua') --Formspecs for the
dofile(minetest.get_modpath('furniture')..'/functions.lua') --Different functions to control stuff.
dofile(minetest.get_modpath('furniture')..'/library.lua') --Books things.
dofile(minetest.get_modpath('furniture')..'/lighting.lua') --Things that add light.
dofile(minetest.get_modpath('furniture')..'/misc.lua') --misc things
dofile(minetest.get_modpath('furniture')..'/seating.lua') --chairs, benches, stools
dofile(minetest.get_modpath('furniture')..'/stain.lua') --Brushes for coloring furniture
dofile(minetest.get_modpath('furniture')..'/storage.lua') --Chests, boxes, etc.

53
mods/furniture/misc.lua Normal file
View File

@ -0,0 +1,53 @@
minetest.register_node('furniture:railing_straight', {
description = 'Straight Railing',
drawtype = 'mesh',
mesh = 'furniture_railing_straight.obj',
tiles = {'furniture_railing.png'},
paramtype = 'light',
paramtype2 = 'facedir',
selection_box = {
type = 'fixed',
fixed = {-.5, -.5, .4375, .5, .4375, .5625},
},
collision_box = {
type = 'fixed',
fixed = {-.5, -.5, .4375, .5, 1, .5625},
},
groups = {oddly_breakable_by_hand = 2, choppy=3},
after_place_node = function(pos, placer)
if placer:get_player_control().sneak then
local node = minetest.get_node(pos)
local new_pos = {x = pos.x, y = pos.y+1, z = pos.z}
minetest.remove_node(pos)
minetest.add_node(new_pos, {name = 'furniture:railing_straight', param2 = node.param2})
end
end,
})
minetest.register_node('furniture:railing_corner', {
description = 'Corner Railing',
drawtype = 'mesh',
mesh = 'furniture_railing_corner.obj',
tiles = {'furniture_railing.png'},
paramtype = 'light',
paramtype2 = 'facedir',
selection_box = {
type = 'fixed',
fixed = {{-.5, -.5, .4375, .5, .4375, .5625},
{.5625, -.5, -.5, .4375, .4375, .5625}}
},
collision_box = {
type = 'fixed',
fixed = {{-.5, -.5, .4375, .5, .4375, .5625},
{.5625, -.5, -.5, .4375, .4375, .5625}}
},
groups = {oddly_breakable_by_hand = 2, choppy=3},
after_place_node = function(pos)
if placer:get_player_control().sneak then
local node = minetest.get_node(pos)
local new_pos = {x = pos.x, y = pos.y+1, z = pos.z}
minetest.remove_node(pos)
minetest.add_node(new_pos, {name = 'furniture:railing_corner', param2 = node.param2})
end
end,
})

View File

@ -0,0 +1,208 @@
# Blender v2.93.5 OBJ File: 'furniture.blend'
# www.blender.org
o Cabinet_counter_corner_Cube.036
v -0.500000 -0.375000 0.500000
v -0.500000 0.375000 0.500000
v -0.500000 -0.375000 -0.375000
v -0.500000 0.375000 -0.375000
v 0.500000 -0.375000 0.500000
v 0.500000 0.375000 0.500000
v 0.500000 -0.375000 -0.375000
v 0.500000 0.375000 -0.375000
v -0.500000 0.500000 0.500000
v -0.500000 0.500000 -0.375000
v 0.500000 0.500000 -0.375000
v 0.500000 0.500000 0.500000
v -0.500000 0.375000 -0.500000
v 0.500000 0.375000 -0.500000
v -0.500000 0.500000 -0.500000
v 0.500000 0.500000 -0.500000
v -0.250000 -0.500000 -0.375000
v -0.250000 -0.375000 -0.375000
v -0.375000 0.375000 -0.375000
v -0.375000 -0.375000 -0.375000
v -0.500000 -0.375000 -0.250000
v -0.500000 0.375000 -0.250000
v 0.500000 -0.375000 -0.250000
v 0.500000 0.375000 -0.250000
v -0.500000 0.500000 -0.250000
v 0.500000 0.500000 -0.250000
v -0.500000 -0.500000 0.500000
v 0.500000 -0.500000 0.500000
v -0.500000 -0.500000 -0.250000
v 0.500000 -0.500000 -0.250000
v -0.375000 -0.500000 0.500000
v -0.375000 -0.375000 0.500000
v -0.375000 0.375000 0.500000
v -0.375000 -0.500000 -0.250000
v -0.375000 -0.375000 -0.250000
v -0.375000 0.500000 -0.250000
v -0.375000 0.500000 -0.500000
v -0.375000 0.375000 -0.500000
v -0.375000 0.500000 0.500000
v -0.375000 0.500000 -0.375000
v -0.375000 0.375000 -0.375000
v -0.375000 -0.375000 -0.375000
v -0.250000 -0.500000 -0.500000
v -0.250000 -0.375000 -0.500000
v -0.375000 0.375000 -0.500000
v -0.375000 -0.375000 -0.500000
v 0.500000 -0.500000 -0.375000
v 0.500000 -0.375000 -0.500000
v 0.500000 -0.500000 -0.500000
v -0.250000 -0.500000 -0.250000
v -0.250000 -0.375000 -0.250000
v -0.250000 0.500000 -0.375000
v -0.250000 0.375000 -0.500000
v -0.250000 0.500000 -0.500000
v -0.250000 0.500000 -0.250000
v -0.250000 -0.500000 0.500000
v -0.250000 0.375000 0.500000
v -0.250000 0.500000 0.500000
v -0.250000 -0.375000 0.500000
vt 0.875000 0.562500
vt 0.875000 0.937500
vt 0.937500 0.937500
vt 0.937500 0.562500
vt 0.765625 0.593750
vt 0.765625 0.937500
vt 0.703125 0.937500
vt 0.703125 0.593750
vt 0.625000 0.562500
vt 0.625000 0.937500
vt 1.000000 0.937500
vt 1.000000 0.562500
vt 0.765625 0.937500
vt 0.828125 0.937500
vt 0.828125 1.000000
vt 0.765625 1.000000
vt 0.437500 0.625000
vt 0.500000 0.625000
vt 0.500000 1.000000
vt 0.437500 1.000000
vt 0.562500 0.937500
vt 0.562500 1.000000
vt 0.625000 1.000000
vt 0.546875 0.937500
vt 0.546875 1.000000
vt 0.875000 1.000000
vt 0.937500 0.937500
vt 1.000000 0.937500
vt 1.000000 1.000000
vt 0.937500 1.000000
vt 0.937500 1.000000
vt 0.500000 0.937500
vt 0.500000 1.000000
vt 0.375000 0.562500
vt -0.000000 0.562500
vt 0.000000 0.500000
vt 0.375000 0.500000
vt 1.000000 1.000000
vt 0.437500 0.562500
vt 0.500000 0.562500
vt 0.625000 0.500000
vt 0.562500 0.500000
vt 0.562500 0.562500
vt 0.546875 0.562500
vt 0.812500 0.062500
vt 0.750000 0.062500
vt 0.750000 0.000000
vt 0.812500 0.000000
vt 1.000000 0.500000
vt 0.875000 0.500000
vt 0.546875 0.500000
vt 0.812500 0.125000
vt 0.750000 0.125000
vt 0.500000 0.500000
vt 0.500000 0.562500
vt 0.375000 0.625000
vt 0.375000 1.000000
vt 0.875000 0.937500
vt 0.875000 1.000000
vt 0.437500 0.500000
vt 0.500000 0.500000
vt 1.000000 0.125000
vt 0.937500 0.125000
vt 0.937500 0.062500
vt 1.000000 0.062500
vt 0.937500 0.000000
vt 1.000000 0.000000
vt 0.500000 0.937500
vt 0.562500 0.937500
vt 0.562500 1.000000
vt 0.500000 0.562500
vt 0.562500 0.562500
vt 0.625000 0.562500
vt 0.562500 0.500000
vt 0.625000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.937500
vt 0.500000 0.500000
vt 0.828125 0.593750
vt 0.765625 0.593750
vt 0.875000 0.562500
vt 0.875000 0.500000
vt 0.875000 0.062500
vt 0.875000 0.000000
vt 0.875000 0.125000
vt 0.812500 0.125000
vt -0.000000 0.625000
vt 0.000000 1.000000
vt 0.937500 0.562500
vt 0.937500 0.937500
vn -1.0000 0.0000 0.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 0.0000 0.0000 1.0000
s off
f 21/1/1 22/2/1 4/3/1 3/4/1
f 20/5/1 19/6/1 45/7/1 46/8/1
f 23/9/2 24/10/2 6/11/2 5/12/2
f 41/13/3 4/14/3 13/15/3 38/16/3
f 36/17/4 25/18/4 9/19/4 39/20/4
f 24/10/2 8/21/2 11/22/2 26/23/2
f 22/2/1 2/24/1 9/25/1 25/26/1
f 38/27/5 13/28/5 15/29/5 37/30/5
f 4/3/1 10/31/1 15/29/1 13/28/1
f 11/22/2 8/21/2 14/32/2 16/33/2
f 52/34/4 11/35/4 16/36/4 54/37/4
f 4/3/1 22/2/1 25/26/1 10/31/1
f 6/11/2 24/10/2 26/23/2 12/38/2
f 40/39/4 10/40/4 25/18/4 36/17/4
f 23/9/2 30/41/2 47/42/2 7/43/2
f 1/44/1 2/24/1 22/2/1 21/1/1
f 18/45/1 44/46/1 43/47/1 17/48/1
f 23/9/2 5/12/2 28/49/2 30/41/2
f 1/44/1 21/1/1 29/50/1 27/51/1
f 20/52/3 46/53/3 44/46/3 18/45/3
f 7/43/2 47/42/2 49/54/2 48/55/2
f 55/56/4 36/17/4 39/20/4 58/57/4
f 53/58/5 38/27/5 37/30/5 54/59/5
f 10/40/4 40/39/4 37/60/4 15/61/4
f 52/34/4 40/39/4 36/17/4 55/56/4
f 3/62/3 42/63/3 35/64/3 21/65/3
f 21/65/5 35/64/5 34/66/5 29/67/5
f 9/19/6 2/68/6 33/69/6 39/70/6
f 1/71/6 32/72/6 33/69/6 2/68/6
f 59/73/6 32/72/6 31/74/6 56/75/6
f 58/76/6 57/77/6 6/11/6 12/38/6
f 59/73/6 5/12/6 6/11/6 57/77/6
f 32/72/6 1/71/6 27/78/6 31/74/6
f 3/79/5 4/14/5 41/13/5 42/80/5
f 23/9/2 7/43/2 8/21/2 24/10/2
f 8/21/2 7/43/2 48/55/2 14/32/2
f 44/81/5 48/55/5 49/54/5 43/82/5
f 34/66/5 35/64/5 51/83/5 50/84/5
f 17/48/1 50/84/1 51/83/1 18/45/1
f 18/45/3 51/83/3 35/85/3 42/86/3 20/52/3
f 32/72/6 59/73/6 57/77/6 33/69/6
f 39/70/6 33/69/6 57/77/6 58/76/6
f 5/12/6 59/73/6 56/75/6 28/49/6
f 11/35/4 52/34/4 55/56/4 26/87/4
f 14/32/5 53/58/5 54/59/5 16/33/5
f 26/87/4 55/56/4 58/57/4 12/88/4
f 40/39/4 52/34/4 54/37/4 37/60/4
f 46/89/5 45/90/5 38/27/5 53/58/5 44/81/5
f 14/32/5 48/55/5 44/81/5 53/58/5

View File

@ -0,0 +1,235 @@
# Blender v2.93.5 OBJ File: 'furniture.blend'
# www.blender.org
o Cabinet_counter_corner_outside_Cube.038
v 0.500000 -0.375000 0.500000
v 0.500000 0.375000 0.500000
v -0.375000 -0.375000 0.500000
v -0.375000 0.375000 0.500000
v 0.500000 0.375000 -0.500000
v -0.375000 0.375000 -0.500000
v 0.500000 0.500000 0.500000
v -0.375000 0.500000 0.500000
v -0.375000 0.500000 -0.500000
v 0.500000 0.500000 -0.500000
v -0.500000 0.375000 0.500000
v -0.500000 0.375000 -0.500000
v -0.500000 0.500000 0.500000
v -0.500000 0.500000 -0.500000
v -0.250000 -0.375000 0.500000
v -0.250000 0.375000 0.500000
v -0.250000 0.375000 -0.500000
v -0.250000 0.500000 0.500000
v -0.250000 0.500000 -0.500000
v 0.500000 -0.500000 0.500000
v -0.250000 0.375000 -0.375000
v -0.250000 -0.500000 0.500000
v 0.500000 0.500000 -0.250000
v -0.250000 -0.500000 0.500000
v 0.500000 -0.375000 -0.375000
v 0.500000 0.375000 -0.375000
v -0.375000 -0.375000 -0.250000
v -0.250000 -0.375000 -0.375000
v -0.250000 0.500000 -0.375000
v -0.500000 0.500000 -0.375000
v -0.500000 0.375000 -0.375000
v 0.500000 0.500000 -0.375000
v -0.375000 0.500000 -0.375000
v -0.375000 0.375000 -0.375000
v -0.375000 -0.375000 -0.375000
v -0.375000 0.500000 -0.250000
v -0.375000 0.375000 -0.250000
v -0.250000 -0.375000 -0.250000
v 0.500000 -0.375000 -0.250000
v -0.250000 0.500000 -0.250000
v -0.500000 0.500000 -0.250000
v -0.500000 0.375000 -0.250000
v 0.500000 0.375000 -0.250000
v 0.500000 -0.500000 -0.250000
v -0.250000 -0.500000 -0.250000
v 0.500000 -0.500000 -0.250000
v 0.406250 0.312500 -0.437500
v 0.406250 -0.312500 -0.437500
v -0.156250 -0.312500 -0.437500
v -0.156250 0.312500 -0.437500
v 0.406250 0.312500 -0.375000
v 0.406250 -0.312500 -0.375000
v -0.156250 0.312500 -0.375000
v -0.156250 -0.312500 -0.375000
v -0.375000 -0.312500 0.406250
v -0.375000 0.312500 0.406250
v -0.375000 -0.312500 -0.156250
v -0.375000 0.312500 -0.156250
v -0.437500 0.312500 0.406250
v -0.437500 -0.312500 0.406250
v -0.437500 -0.312500 -0.156250
v -0.437500 0.312500 -0.156250
vt 0.828125 0.062500
vt 0.828125 0.437500
vt 0.890625 0.437500
vt 0.890625 0.062500
vt 0.375000 1.000000
vt 0.375000 0.937500
vt 0.250000 0.937500
vt 0.250000 1.000000
vt 0.125000 0.375000
vt 0.500000 0.375000
vt 0.500000 0.437500
vt 0.125000 0.437500
vt 0.125000 0.625000
vt 0.500000 0.625000
vt 0.500000 1.000000
vt 0.125000 1.000000
vt 0.875000 0.937500
vt 0.937500 0.937500
vt 0.937500 1.000000
vt 0.875000 1.000000
vt 0.875000 0.937500
vt 0.546875 0.937500
vt 0.546875 1.000000
vt 0.875000 1.000000
vt 0.500000 0.500000
vt 0.125000 0.500000
vt 0.937500 0.937500
vt 0.937500 1.000000
vt 1.000000 1.000000
vt 1.000000 0.937500
vt 1.000000 0.937500
vt 1.000000 1.000000
vt 0.062500 0.562500
vt 0.000000 0.562500
vt 0.000000 0.500000
vt 0.062500 0.500000
vt 0.500000 0.937500
vt 0.500000 1.000000
vt 0.125000 0.562500
vt 0.500000 0.562500
vt 0.937500 0.062500
vt 1.000000 0.062500
vt 1.000000 0.437500
vt 0.937500 0.437500
vt 0.500000 0.062500
vt 0.500000 0.437500
vt 0.828125 0.000000
vt 0.500000 0.000000
vt 0.625000 0.125000
vt 0.625000 0.500000
vt 0.562500 0.500000
vt 0.562500 0.125000
vt 0.000000 0.375000
vt 0.062500 0.375000
vt 0.062500 0.437500
vt 0.000000 0.437500
vt 0.000000 0.625000
vt 0.062500 0.625000
vt 0.062500 1.000000
vt 0.000000 1.000000
vt 0.562500 0.062500
vt 0.625000 0.062500
vt 0.562500 0.062500
vt 0.562500 0.125000
vt 0.937500 0.125000
vt -0.000000 0.937500
vt 0.062500 0.437500
vt -0.000000 0.437500
vt -0.000000 0.500000
vt 0.062500 0.500000
vt 0.609375 0.062500
vt 0.609375 -0.000000
vt 0.937500 -0.000000
vt -0.000000 1.000000
vt 0.062500 1.000000
vt 1.000000 0.125000
vt 1.000000 0.062500
vt 0.500000 0.500000
vt 0.562500 0.500000
vt 0.500000 0.125000
vt 0.937500 0.500000
vt 1.000000 0.500000
vt 0.609375 0.437500
vt 0.500000 0.937500
vt 0.937500 -0.000000
vt 0.562500 -0.000000
vt 0.625000 0.000000
vt 1.000000 0.000000
vt 0.390625 0.343750
vt 0.078125 0.343750
vt 0.078125 0.312500
vt 0.390625 0.312500
vt 0.078125 0.000000
vt 0.390625 0.000000
vt 0.390625 0.031250
vt 0.078125 0.031250
vt 0.421875 0.031250
vt 0.421875 0.312500
vt 0.046875 0.312500
vt 0.046875 0.031250
vt 0.078125 0.031250
vt 0.390625 0.031250
vt 0.390625 0.312500
vt 0.078125 0.312500
vt 0.046875 0.312500
vt 0.046875 0.031250
vt 0.421875 0.031250
vt 0.421875 0.312500
vt 0.078125 0.000000
vt 0.390625 0.000000
vt 0.390625 0.343750
vt 0.078125 0.343750
vn 0.0000 0.0000 1.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 -0.0000
vn 0.0000 0.0000 -1.0000
vn -1.0000 0.0000 -0.0000
s off
f 15/1/1 16/2/1 4/3/1 3/4/1
f 23/5/2 43/6/2 26/7/2 32/8/2
f 37/9/3 4/10/3 11/11/3 42/12/3
f 40/13/4 18/14/4 7/15/4 23/16/4
f 17/17/5 6/18/5 9/19/5 19/20/5
f 16/21/1 2/22/1 7/23/1 18/24/1
f 42/12/6 11/11/6 13/25/6 41/26/6
f 4/27/1 8/28/1 13/29/1 11/30/1
f 9/19/5 6/18/5 12/31/5 14/32/5
f 33/33/4 9/34/4 14/35/4 30/36/4
f 4/27/1 16/21/1 18/24/1 8/28/1
f 5/37/5 17/17/5 19/20/5 10/38/5
f 36/39/4 8/40/4 18/14/4 40/13/4
f 39/41/2 25/42/2 26/43/2 43/44/2
f 1/45/1 2/46/1 16/2/1 15/1/1
f 1/45/1 15/1/1 22/47/1 20/48/1
f 27/49/6 37/50/6 34/51/6 35/52/6
f 6/53/3 34/54/3 31/55/3 12/56/3
f 19/57/4 29/58/4 32/59/4 10/60/4
f 12/56/6 31/55/6 30/36/6 14/35/6
f 36/39/4 33/33/4 30/36/4 41/26/4
f 9/34/4 33/33/4 29/58/4 19/57/4
f 27/49/3 35/52/3 28/61/3 38/62/3
f 39/41/3 38/63/3 28/64/3 25/65/3
f 32/8/2 26/7/2 5/66/2 10/60/2
f 34/67/3 6/68/3 17/69/3 21/70/3
f 39/41/2 1/71/2 20/72/2 44/73/2
f 17/69/3 5/74/3 26/75/3 21/70/3
f 3/76/3 27/49/3 38/62/3 15/77/3
f 34/78/5 21/79/5 28/64/5 35/80/5
f 26/81/5 25/65/5 28/64/5 21/79/5
f 8/40/4 36/39/4 41/26/4 13/25/4
f 3/76/6 4/82/6 37/50/6 27/49/6
f 1/71/2 39/41/2 43/44/2 2/83/2
f 33/33/4 36/39/4 40/13/4 29/58/4
f 31/55/6 42/12/6 41/26/6 30/36/6
f 29/58/4 40/13/4 23/16/4 32/59/4
f 34/54/3 37/9/3 42/12/3 31/55/3
f 7/15/2 2/84/2 43/6/2 23/5/2
f 38/63/5 39/41/5 46/85/5 45/86/5
f 15/77/6 38/62/6 45/87/6 24/88/6
f 51/89/2 52/90/2 48/91/2 47/92/2
f 54/93/6 53/94/6 50/95/6 49/96/6
f 53/97/4 51/98/4 47/92/4 50/95/4
f 52/99/3 54/100/3 49/96/3 48/91/3
f 49/96/5 50/95/5 47/92/5 48/91/5
f 60/101/6 59/102/6 62/103/6 61/104/6
f 57/105/3 55/106/3 60/101/3 61/104/3
f 56/107/4 58/108/4 62/103/4 59/102/4
f 55/109/1 56/110/1 59/102/1 60/101/1
f 58/111/5 57/112/5 61/104/5 62/103/5

View File

@ -0,0 +1,152 @@
# Blender v2.91.2 OBJ File: 'furniture.blend'
# www.blender.org
o Desk_Cube.001
v -1.437500 0.437500 0.500000
v -1.437500 0.437500 -0.437500
v -1.437500 -0.500000 -0.437500
v 0.500000 0.437500 0.500000
v 0.500000 0.437500 -0.500000
v -1.437500 -0.500000 0.500000
v 0.500000 0.500000 -0.500000
v 0.500000 0.500000 0.500000
v -1.500000 0.437500 0.500000
v -1.500000 0.437500 -0.500000
v -1.500000 0.500000 0.500000
v -1.500000 0.500000 -0.500000
v -1.500000 -0.500000 0.500000
v -1.500000 -0.500000 -0.437500
v -1.500000 0.437500 -0.437500
v -0.500000 -0.500000 0.500000
v -0.500000 0.437500 0.500000
v -0.500000 -0.500000 -0.437500
v -0.500000 0.437500 -0.437500
v 0.500000 -0.500000 0.500000
v 0.500000 -0.500000 -0.437500
v 0.500000 0.437500 -0.437500
v -1.437500 0.000000 0.500000
v -1.437500 0.312500 0.500000
v -1.437500 0.000000 0.437500
v -1.437500 0.312500 0.437500
v -0.500000 0.000000 0.500000
v -0.500000 0.312500 0.500000
v -0.500000 0.000000 0.437500
v -0.500000 0.312500 0.437500
v -0.437500 0.000000 -0.437500
v -0.437500 0.375000 -0.437500
v -0.437500 0.000000 -0.468750
v -0.437500 0.375000 -0.468750
v 0.437500 0.000000 -0.437500
v 0.437500 0.375000 -0.437500
v 0.437500 0.000000 -0.468750
v 0.437500 0.375000 -0.468750
v -0.437500 -0.437500 -0.437500
v -0.437500 -0.062500 -0.437500
v -0.437500 -0.437500 -0.468750
v -0.437500 -0.062500 -0.468750
v 0.437500 -0.437500 -0.437500
v 0.437500 -0.062500 -0.437500
v 0.437500 -0.437500 -0.468750
v 0.437500 -0.062500 -0.468750
vt 0.250000 0.468750
vt 0.015625 0.468750
vt 0.015625 0.234375
vt 0.250000 0.234375
vt 0.234375 0.234375
vt 0.234375 0.000000
vt 0.484375 0.000000
vt 0.484375 0.234375
vt 0.000000 0.234375
vt 0.000000 0.000000
vt 0.265625 0.468750
vt 0.265625 0.234375
vt 0.484375 0.468750
vt 0.484375 0.718750
vt 0.468750 0.718750
vt 0.468750 0.468750
vt 0.484375 1.000000
vt 0.484375 0.984375
vt 0.984375 0.984375
vt 0.984375 1.000000
vt 0.484375 0.734375
vt 0.984375 0.734375
vt 0.000000 0.468750
vt 0.000000 0.234375
vt 0.984375 0.468750
vt 0.984375 0.718750
vt 1.000000 0.468750
vt 1.000000 0.718750
vt 0.718750 0.000000
vt 0.718750 0.234375
vt 0.500000 0.468750
vt 0.500000 0.234375
vt 0.968750 0.000000
vt 0.968750 0.234375
vt 0.007812 0.781250
vt 0.007812 0.875000
vt 0.000000 0.875000
vt 0.000000 0.781250
vt 0.234375 0.687500
vt 0.234375 0.765625
vt 0.000000 0.765625
vt 0.000000 0.687500
vt 0.226562 0.781250
vt 0.226562 0.875000
vt 0.000000 0.671875
vt 0.000000 0.593750
vt 0.234375 0.593750
vt 0.234375 0.671875
vt 0.000000 0.578125
vt 0.234375 0.578125
vt 0.234375 0.898438
vt 0.234375 0.992188
vt 0.226562 0.992188
vt 0.226562 0.898438
vt 0.007812 0.992188
vt 0.007812 0.898438
vt 0.000000 0.992188
vt 0.000000 0.898438
vt 0.234375 0.781250
vt 0.234375 0.875000
vt 0.007812 0.890625
vt 0.226562 0.890625
vt 0.226562 1.000000
vt 0.007812 1.000000
vt 0.007812 0.773438
vt 0.226562 0.773438
vt 0.226562 0.882812
vt 0.007812 0.882812
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 1.0000
vn 0.0000 1.0000 0.0000
vn 0.0000 -1.0000 0.0000
s off
f 14/1/1 13/2/1 9/3/1 15/4/1
f 18/5/2 19/6/2 22/7/2 21/8/2
f 16/9/1 17/10/1 19/6/1 18/5/1
f 3/11/2 14/1/2 15/4/2 2/12/2
f 4/13/3 5/14/3 7/15/3 8/16/3
f 4/17/4 8/18/4 11/19/4 9/20/4
f 7/21/5 12/22/5 11/19/5 8/18/5
f 6/23/4 1/24/4 9/3/4 13/2/4
f 5/14/6 4/13/6 9/25/6 10/26/6
f 10/26/1 9/25/1 11/27/1 12/28/1
f 21/8/3 22/7/3 4/29/3 20/30/3
f 6/31/3 3/11/3 2/12/3 1/32/3
f 5/14/2 10/26/2 12/22/2 7/21/2
f 20/30/4 4/29/4 17/33/4 16/34/4
f 45/35/3 46/36/3 44/37/3 43/38/3
f 25/39/2 26/40/2 30/41/2 29/42/2
f 41/43/2 42/44/2 46/36/2 45/35/2
f 27/45/4 28/46/4 24/47/4 23/48/4
f 25/39/6 29/42/6 27/45/6 23/48/6
f 30/49/5 26/50/5 24/47/5 28/46/5
f 31/51/1 32/52/1 34/53/1 33/54/1
f 33/54/2 34/53/2 38/55/2 37/56/2
f 37/56/3 38/55/3 36/57/3 35/58/3
f 39/59/1 40/60/1 42/44/1 41/43/1
f 33/54/6 37/56/6 35/61/6 31/62/6
f 38/55/5 34/53/5 32/63/5 36/64/5
f 41/43/6 45/35/6 43/65/6 39/66/6
f 46/36/5 42/44/5 40/67/5 44/68/5

View File

@ -0,0 +1,355 @@
# Blender v2.93.5 OBJ File: 'furniture.blend'
# www.blender.org
o Cube.004_Cube.043
v -0.437500 -0.687500 0.437500
v -0.437500 0.375000 0.437500
v -0.437500 -0.687500 0.562500
v -0.437500 0.375000 0.562500
v -0.562500 -0.687500 0.437500
v -0.562500 0.375000 0.437500
v -0.562500 -0.687500 0.562500
v -0.562500 0.375000 0.562500
v 0.500000 -0.687500 0.437500
v 0.500000 0.375000 0.437500
v 0.500000 -0.687500 0.562500
v 0.500000 0.375000 0.562500
v 0.437500 -0.687500 0.437500
v 0.437500 0.375000 0.437500
v 0.437500 -0.687500 0.562500
v 0.437500 0.375000 0.562500
v 0.500000 0.437500 0.437500
v -0.437500 0.437500 0.437500
v 0.500000 0.437500 0.562500
v -0.562500 0.437500 0.562500
v 0.500000 0.375000 0.437500
v -0.437500 0.375000 0.437500
v 0.500000 0.375000 0.562500
v -0.562500 0.375000 0.562500
v 0.437500 -0.312500 0.437500
v -0.437500 -0.312500 0.437500
v 0.437500 -0.312500 0.562500
v -0.437500 -0.312500 0.562500
v 0.437500 -0.375000 0.437500
v -0.437500 -0.375000 0.437500
v 0.437500 -0.375000 0.562500
v -0.437500 -0.375000 0.562500
v 0.312500 -0.312500 0.468750
v 0.312500 0.375000 0.468750
v 0.312500 -0.312500 0.531250
v 0.312500 0.375000 0.531250
v 0.250000 -0.312500 0.468750
v 0.250000 0.375000 0.468750
v 0.250000 -0.312500 0.531250
v 0.250000 0.375000 0.531250
v -0.312500 0.375000 0.531250
v -0.312500 -0.312500 0.531250
v -0.312500 0.375000 0.468750
v -0.312500 -0.312500 0.468750
v -0.250000 0.375000 0.531250
v -0.250000 -0.312500 0.531250
v -0.250000 0.375000 0.468750
v -0.250000 -0.312500 0.468750
v -0.062500 -0.312500 0.468750
v -0.062500 0.375000 0.468750
v -0.062500 -0.312500 0.531250
v -0.062500 0.375000 0.531250
v -0.125000 -0.312500 0.468750
v -0.125000 0.375000 0.468750
v -0.125000 -0.312500 0.531250
v -0.125000 0.375000 0.531250
v 0.125000 -0.312500 0.468750
v 0.125000 0.375000 0.468750
v 0.125000 -0.312500 0.531250
v 0.125000 0.375000 0.531250
v 0.062500 -0.312500 0.468750
v 0.062500 0.375000 0.468750
v 0.062500 -0.312500 0.531250
v 0.062500 0.375000 0.531250
v -0.437500 -0.687500 -0.437500
v -0.437500 0.375000 -0.437500
v -0.562500 -0.687500 -0.437500
v -0.562500 0.375000 -0.437500
v -0.437500 -0.687500 -0.500000
v -0.437500 0.375000 -0.500000
v -0.562500 -0.687500 -0.500000
v -0.562500 0.375000 -0.500000
v -0.437500 0.437500 0.437500
v -0.437500 0.437500 -0.500000
v -0.562500 0.437500 0.562500
v -0.562500 0.437500 -0.500000
v -0.437500 0.375000 0.437500
v -0.437500 0.375000 -0.500000
v -0.562500 0.375000 0.562500
v -0.562500 0.375000 -0.500000
v -0.437500 -0.312500 0.437500
v -0.437500 -0.312500 -0.437500
v -0.562500 -0.312500 0.437500
v -0.562500 -0.312500 -0.437500
v -0.437500 -0.375000 0.437500
v -0.437500 -0.375000 -0.437500
v -0.562500 -0.375000 0.437500
v -0.562500 -0.375000 -0.437500
v -0.468750 -0.312500 0.312500
v -0.468750 0.375000 0.312500
v -0.531250 -0.312500 0.312500
v -0.531250 0.375000 0.312500
v -0.468750 -0.312500 0.250000
v -0.468750 0.375000 0.250000
v -0.531250 -0.312500 0.250000
v -0.531250 0.375000 0.250000
v -0.531250 0.375000 -0.312500
v -0.531250 -0.312500 -0.312500
v -0.468750 0.375000 -0.312500
v -0.468750 -0.312500 -0.312500
v -0.531250 0.375000 -0.250000
v -0.531250 -0.312500 -0.250000
v -0.468750 0.375000 -0.250000
v -0.468750 -0.312500 -0.250000
v -0.468750 -0.312500 -0.062500
v -0.468750 0.375000 -0.062500
v -0.531250 -0.312500 -0.062500
v -0.531250 0.375000 -0.062500
v -0.468750 -0.312500 -0.125000
v -0.468750 0.375000 -0.125000
v -0.531250 -0.312500 -0.125000
v -0.531250 0.375000 -0.125000
v -0.468750 -0.312500 0.125000
v -0.468750 0.375000 0.125000
v -0.531250 -0.312500 0.125000
v -0.531250 0.375000 0.125000
v -0.468750 -0.312500 0.062500
v -0.468750 0.375000 0.062500
v -0.531250 -0.312500 0.062500
v -0.531250 0.375000 0.062500
vt 0.468750 0.062500
vt 0.468750 0.593750
vt 0.406250 0.593750
vt 0.406250 0.062500
vt 0.656250 0.062500
vt 0.656250 0.593750
vt 0.593750 0.593750
vt 0.593750 0.062500
vt 0.531250 0.593750
vt 0.531250 0.062500
vt 0.593750 0.000000
vt 0.656250 0.000000
vt 0.031250 0.062500
vt 0.000000 0.062500
vt 0.000000 -0.000000
vt 0.031250 -0.000000
vt 0.265625 0.062500
vt 0.265625 0.593750
vt 0.203125 0.593750
vt 0.203125 0.062500
vt 0.390625 0.062500
vt 0.390625 0.593750
vt 0.359375 0.593750
vt 0.359375 0.062500
vt 0.296875 0.593750
vt 0.296875 0.062500
vt 0.359375 -0.000000
vt 0.390625 -0.000000
vt 0.093750 0.062500
vt 0.093750 0.531250
vt 0.031250 0.593750
vt 0.000000 0.593750
vt 0.187500 0.062500
vt 0.187500 0.593750
vt 0.125000 0.531250
vt 0.125000 0.062500
vt 0.671875 0.000000
vt 0.671875 0.437500
vt 0.609375 0.437500
vt 0.609375 0.000000
vt 0.796875 0.000000
vt 0.796875 0.437500
vt 0.765625 0.437500
vt 0.765625 0.000000
vt 0.703125 0.437500
vt 0.703125 0.000000
vt 0.703125 0.906250
vt 0.359375 0.906250
vt 0.359375 0.875000
vt 0.703125 0.875000
vt 0.703125 1.000000
vt 0.359375 1.000000
vt 0.359375 0.968750
vt 0.703125 0.968750
vt 0.359375 0.937500
vt 0.703125 0.937500
vt 0.703125 0.796875
vt 0.359375 0.796875
vt 0.359375 0.765625
vt 0.703125 0.765625
vt 0.703125 0.859375
vt 0.359375 0.859375
vt 0.359375 0.828125
vt 0.703125 0.828125
vt 0.359375 0.734375
vt 0.703125 0.734375
vt 0.343750 0.906250
vt 0.000000 0.906250
vt 0.000000 0.875000
vt 0.343750 0.875000
vt 0.343750 1.000000
vt 0.000000 1.000000
vt 0.000000 0.968750
vt 0.343750 0.968750
vt 0.000000 0.937500
vt 0.343750 0.937500
vt 0.343750 0.765625
vt 0.000000 0.765625
vt 0.000000 0.734375
vt 0.343750 0.734375
vt 0.343750 0.859375
vt 0.000000 0.859375
vt 0.000000 0.828125
vt 0.343750 0.828125
vt 0.000000 0.796875
vt 0.343750 0.796875
vt 0.062500 0.062500
vt 0.062500 0.593750
vt 0.000000 0.593750
vt 0.000000 0.062500
vt 0.187500 0.062500
vt 0.187500 0.593750
vt 0.156250 0.593750
vt 0.156250 0.062500
vt 0.093750 0.593750
vt 0.093750 0.062500
vt 0.156250 -0.000000
vt 0.187500 -0.000000
vt 0.359375 -0.000000
vt 0.390625 -0.000000
vt 0.390625 0.062500
vt 0.359375 0.062500
vt 0.296875 0.531250
vt 0.296875 0.062500
vt 0.359375 0.593750
vt 0.390625 0.593750
vt 0.203125 0.593750
vt 0.203125 0.062500
vt 0.265625 0.062500
vt 0.265625 0.531250
vt 0.875000 0.000000
vt 0.875000 0.437500
vt 0.812500 0.437500
vt 0.812500 0.000000
vt 1.000000 0.000000
vt 1.000000 0.437500
vt 0.968750 0.437500
vt 0.968750 0.000000
vt 0.906250 0.437500
vt 0.906250 0.000000
vt 0.703125 0.906250
vt 0.359375 0.906250
vt 0.359375 0.875000
vt 0.703125 0.875000
vt 0.703125 1.000000
vt 0.359375 1.000000
vt 0.359375 0.968750
vt 0.703125 0.968750
vt 0.359375 0.937500
vt 0.703125 0.937500
vt 0.703125 0.796875
vt 0.359375 0.796875
vt 0.359375 0.765625
vt 0.703125 0.765625
vt 0.703125 0.859375
vt 0.359375 0.859375
vt 0.359375 0.828125
vt 0.703125 0.828125
vt 0.359375 0.734375
vt 0.703125 0.734375
vt 0.343750 0.906250
vt 0.000000 0.906250
vt 0.000000 0.875000
vt 0.343750 0.875000
vt 0.343750 1.000000
vt 0.000000 1.000000
vt 0.000000 0.968750
vt 0.343750 0.968750
vt 0.000000 0.937500
vt 0.343750 0.937500
vt 0.343750 0.765625
vt 0.000000 0.765625
vt 0.000000 0.734375
vt 0.343750 0.734375
vt 0.343750 0.859375
vt 0.000000 0.859375
vt 0.000000 0.828125
vt 0.343750 0.828125
vt 0.000000 0.796875
vt 0.343750 0.796875
vn 1.0000 0.0000 -0.0000
vn 0.0000 0.0000 1.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 0.0000 -1.0000 0.0000
vn -0.0000 1.0000 -0.0000
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 8/7/2 7/8/2
f 7/8/3 8/7/3 6/9/3 5/10/3
f 5/10/4 6/9/4 2/2/4 1/1/4
f 3/5/5 7/8/5 5/11/5 1/12/5
f 19/13/1 23/14/1 21/15/1 17/16/1
f 9/17/1 10/18/1 12/19/1 11/20/1
f 11/21/2 12/22/2 16/23/2 15/24/2
f 15/24/3 16/23/3 14/25/3 13/26/3
f 13/26/4 14/25/4 10/18/4 9/17/4
f 11/21/5 15/24/5 13/27/5 9/28/5
f 17/29/6 18/30/6 20/31/6 19/13/6
f 19/13/2 20/31/2 24/32/2 23/14/2
f 23/33/5 24/34/5 22/35/5 21/36/5
f 21/36/4 22/35/4 18/30/4 17/29/4
f 25/37/6 26/38/6 28/39/6 27/40/6
f 27/41/2 28/42/2 32/43/2 31/44/2
f 31/44/5 32/43/5 30/45/5 29/46/5
f 29/46/4 30/45/4 26/38/4 25/37/4
f 33/47/1 34/48/1 36/49/1 35/50/1
f 35/51/2 36/52/2 40/53/2 39/54/2
f 39/54/3 40/53/3 38/55/3 37/56/3
f 37/56/4 38/55/4 34/48/4 33/47/4
f 44/57/4 43/58/4 47/59/4 48/60/4
f 46/61/2 45/62/2 41/63/2 42/64/2
f 48/60/1 47/59/1 45/65/1 46/66/1
f 42/64/3 41/63/3 43/58/3 44/57/3
f 49/67/1 50/68/1 52/69/1 51/70/1
f 51/71/2 52/72/2 56/73/2 55/74/2
f 55/74/3 56/73/3 54/75/3 53/76/3
f 53/76/4 54/75/4 50/68/4 49/67/4
f 57/77/1 58/78/1 60/79/1 59/80/1
f 59/81/2 60/82/2 64/83/2 63/84/2
f 63/84/3 64/83/3 62/85/3 61/86/3
f 61/86/4 62/85/4 58/78/4 57/77/4
f 65/87/2 66/88/2 68/89/2 67/90/2
f 67/91/3 68/92/3 72/93/3 71/94/3
f 71/94/4 72/93/4 70/95/4 69/96/4
f 69/96/1 70/95/1 66/88/1 65/87/1
f 67/91/5 71/94/5 69/97/5 65/98/5
f 74/99/4 78/100/4 80/101/4 76/102/4
f 73/103/6 74/104/6 76/102/6 75/105/6
f 75/105/3 76/102/3 80/101/3 79/106/3
f 79/107/5 80/108/5 78/109/5 77/110/5
f 77/110/1 78/109/1 74/104/1 73/103/1
f 81/111/6 82/112/6 84/113/6 83/114/6
f 83/115/3 84/116/3 88/117/3 87/118/3
f 87/118/5 88/117/5 86/119/5 85/120/5
f 85/120/1 86/119/1 82/112/1 81/111/1
f 89/121/2 90/122/2 92/123/2 91/124/2
f 91/125/3 92/126/3 96/127/3 95/128/3
f 95/128/4 96/127/4 94/129/4 93/130/4
f 93/130/1 94/129/1 90/122/1 89/121/1
f 100/131/1 99/132/1 103/133/1 104/134/1
f 102/135/3 101/136/3 97/137/3 98/138/3
f 104/134/2 103/133/2 101/139/2 102/140/2
f 98/138/4 97/137/4 99/132/4 100/131/4
f 105/141/2 106/142/2 108/143/2 107/144/2
f 107/145/3 108/146/3 112/147/3 111/148/3
f 111/148/4 112/147/4 110/149/4 109/150/4
f 109/150/1 110/149/1 106/142/1 105/141/1
f 113/151/2 114/152/2 116/153/2 115/154/2
f 115/155/3 116/156/3 120/157/3 119/158/3
f 119/158/4 120/157/4 118/159/4 117/160/4
f 117/160/1 118/159/1 114/152/1 113/151/1

View File

@ -0,0 +1,198 @@
# Blender v2.93.5 OBJ File: 'furniture.blend'
# www.blender.org
o Cube.001_Cube.040
v 0.437500 -0.687500 0.562500
v 0.437500 0.375000 0.562500
v 0.437500 -0.687500 0.437500
v 0.437500 0.375000 0.437500
v 0.500000 -0.687500 0.562500
v 0.500000 0.375000 0.562500
v 0.500000 -0.687500 0.437500
v 0.500000 0.375000 0.437500
v -0.500000 -0.687500 0.562500
v -0.500000 0.375000 0.562500
v -0.500000 -0.687500 0.437500
v -0.500000 0.375000 0.437500
v -0.437500 -0.687500 0.562500
v -0.437500 0.375000 0.562500
v -0.437500 -0.687500 0.437500
v -0.437500 0.375000 0.437500
v -0.500000 0.437500 0.562500
v 0.500000 0.437500 0.562500
v -0.500000 0.437500 0.437500
v 0.500000 0.437500 0.437500
v -0.500000 0.375000 0.562500
v 0.500000 0.375000 0.562500
v -0.500000 0.375000 0.437500
v 0.500000 0.375000 0.437500
v -0.437500 -0.312500 0.562500
v 0.437500 -0.312500 0.562500
v -0.437500 -0.312500 0.437500
v 0.437500 -0.312500 0.437500
v -0.437500 -0.375000 0.562500
v 0.437500 -0.375000 0.562500
v -0.437500 -0.375000 0.437500
v 0.437500 -0.375000 0.437500
v -0.312500 -0.312500 0.531250
v -0.312500 0.375000 0.531250
v -0.312500 -0.312500 0.468750
v -0.312500 0.375000 0.468750
v -0.250000 -0.312500 0.531250
v -0.250000 0.375000 0.531250
v -0.250000 -0.312500 0.468750
v -0.250000 0.375000 0.468750
v 0.312500 0.375000 0.468750
v 0.312500 -0.312500 0.468750
v 0.312500 0.375000 0.531250
v 0.312500 -0.312500 0.531250
v 0.250000 0.375000 0.468750
v 0.250000 -0.312500 0.468750
v 0.250000 0.375000 0.531250
v 0.250000 -0.312500 0.531250
v 0.062500 -0.312500 0.531250
v 0.062500 0.375000 0.531250
v 0.062500 -0.312500 0.468750
v 0.062500 0.375000 0.468750
v 0.125000 -0.312500 0.531250
v 0.125000 0.375000 0.531250
v 0.125000 -0.312500 0.468750
v 0.125000 0.375000 0.468750
v -0.125000 -0.312500 0.531250
v -0.125000 0.375000 0.531250
v -0.125000 -0.312500 0.468750
v -0.125000 0.375000 0.468750
v -0.062500 -0.312500 0.531250
v -0.062500 0.375000 0.531250
v -0.062500 -0.312500 0.468750
v -0.062500 0.375000 0.468750
vt 0.062500 0.062500
vt 0.062500 0.593750
vt 0.000000 0.593750
vt 0.000000 0.062500
vt 0.187500 0.062500
vt 0.187500 0.593750
vt 0.156250 0.593750
vt 0.156250 0.062500
vt 0.093750 0.593750
vt 0.093750 0.062500
vt 0.156250 -0.000000
vt 0.187500 -0.000000
vt 0.437500 0.062500
vt 0.406250 0.062500
vt 0.406250 -0.000000
vt 0.437500 -0.000000
vt 0.265625 0.062500
vt 0.265625 0.593750
vt 0.203125 0.593750
vt 0.203125 0.062500
vt 0.390625 0.062500
vt 0.390625 0.593750
vt 0.359375 0.593750
vt 0.359375 0.062500
vt 0.296875 0.593750
vt 0.296875 0.062500
vt 0.359375 -0.000000
vt 0.390625 -0.000000
vt 0.437500 0.625000
vt 0.406250 0.625000
vt 0.406250 0.562500
vt 0.437500 0.562500
vt 0.500000 0.062500
vt 0.500000 0.562500
vt 0.593750 0.062500
vt 0.593750 0.562500
vt 0.531250 0.562500
vt 0.531250 0.062500
vt 0.671875 0.062500
vt 0.671875 0.500000
vt 0.609375 0.500000
vt 0.609375 0.062500
vt 0.796875 0.062500
vt 0.796875 0.500000
vt 0.765625 0.500000
vt 0.765625 0.062500
vt 0.703125 0.500000
vt 0.703125 0.062500
vt 0.703125 0.906250
vt 0.359375 0.906250
vt 0.359375 0.875000
vt 0.703125 0.875000
vt 0.703125 1.000000
vt 0.359375 1.000000
vt 0.359375 0.968750
vt 0.703125 0.968750
vt 0.359375 0.937500
vt 0.703125 0.937500
vt 0.703125 0.796875
vt 0.359375 0.796875
vt 0.359375 0.765625
vt 0.703125 0.765625
vt 0.703125 0.859375
vt 0.359375 0.859375
vt 0.359375 0.828125
vt 0.703125 0.828125
vt 0.359375 0.734375
vt 0.703125 0.734375
vt 0.343750 0.906250
vt 0.000000 0.906250
vt 0.000000 0.875000
vt 0.343750 0.875000
vt 0.343750 1.000000
vt 0.000000 1.000000
vt 0.000000 0.968750
vt 0.343750 0.968750
vt 0.000000 0.937500
vt 0.343750 0.937500
vt 0.343750 0.765625
vt 0.000000 0.765625
vt 0.000000 0.734375
vt 0.343750 0.734375
vt 0.343750 0.859375
vt 0.000000 0.859375
vt 0.000000 0.828125
vt 0.343750 0.828125
vt 0.000000 0.796875
vt 0.343750 0.796875
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 1.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
s off
f 1/1/1 2/2/1 4/3/1 3/4/1
f 3/5/2 4/6/2 8/7/2 7/8/2
f 7/8/3 8/7/3 6/9/3 5/10/3
f 5/10/4 6/9/4 2/2/4 1/1/4
f 3/5/5 7/8/5 5/11/5 1/12/5
f 19/13/1 23/14/1 21/15/1 17/16/1
f 9/17/1 10/18/1 12/19/1 11/20/1
f 11/21/2 12/22/2 16/23/2 15/24/2
f 15/24/3 16/23/3 14/25/3 13/26/3
f 13/26/4 14/25/4 10/18/4 9/17/4
f 11/21/5 15/24/5 13/27/5 9/28/5
f 18/29/3 22/30/3 24/31/3 20/32/3
f 17/33/6 18/34/6 20/32/6 19/13/6
f 19/13/2 20/32/2 24/31/2 23/14/2
f 23/35/5 24/36/5 22/37/5 21/38/5
f 21/38/4 22/37/4 18/34/4 17/33/4
f 25/39/6 26/40/6 28/41/6 27/42/6
f 27/43/2 28/44/2 32/45/2 31/46/2
f 31/46/5 32/45/5 30/47/5 29/48/5
f 29/48/4 30/47/4 26/40/4 25/39/4
f 33/49/1 34/50/1 36/51/1 35/52/1
f 35/53/2 36/54/2 40/55/2 39/56/2
f 39/56/3 40/55/3 38/57/3 37/58/3
f 37/58/4 38/57/4 34/50/4 33/49/4
f 44/59/4 43/60/4 47/61/4 48/62/4
f 46/63/2 45/64/2 41/65/2 42/66/2
f 48/62/1 47/61/1 45/67/1 46/68/1
f 42/66/3 41/65/3 43/60/3 44/59/3
f 49/69/1 50/70/1 52/71/1 51/72/1
f 51/73/2 52/74/2 56/75/2 55/76/2
f 55/76/3 56/75/3 54/77/3 53/78/3
f 53/78/4 54/77/4 50/70/4 49/69/4
f 57/79/1 58/80/1 60/81/1 59/82/1
f 59/83/2 60/84/2 64/85/2 63/86/2
f 63/86/3 64/85/3 62/87/3 61/88/3
f 61/88/4 62/87/4 58/80/4 57/79/4

View File

@ -261,6 +261,102 @@ minetest.register_node('furniture:cabinet_counter', {
on_metadata_inventory_take = furniture.inv_take,
})
minetest.register_node('furniture:cabinet_counter_corner_inside', {
description = 'Cabinet with Countertop',
drawtype = 'mesh',
mesh = 'furniture_cabinet_counter_corner_inside.obj',
tiles = {'furniture_cabinet_counter.png'},
paramtype = 'light',
paramtype2 = 'colorfacedir',
palette = 'furniture_stain_palette.png',
selection_box = {
type = 'fixed',
fixed = {-.5, -.5, -.5, .5, .5, .5},
},
collision_box = {
type = 'fixed',
fixed = {-.5, -.5, -.5, .5, .5, .5},
},
groups = {oddly_breakable_by_hand = 2, choppy=3, stainable=1},
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string('formspec', furniture.storage_24_form(pos, ''))
local inv = meta:get_inventory()
inv:set_size('main', 24)
end,
can_dig = function(pos,player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
return inv:is_empty('main')
end,
on_receive_fields = function(pos, formname, fields, sender)
local player_name = sender:get_player_name()
if minetest.is_protected(pos, player_name) and not minetest.check_player_privs(sender, 'protection_bypass') then
return
end
local meta = minetest.get_meta(pos)
if fields ['save'] then
meta:set_string('infotext', fields.description)
meta:set_string('formspec', furniture.storage_24_form(pos, fields.description))
elseif fields ['sort'] then
furniture.sort_inventory(meta:get_inventory())
end
end,
allow_metadata_inventory_put = furniture.inv_take_put,
allow_metadata_inventory_take = furniture.inv_take_put,
allow_metadata_inventory_move = furniture.inv_manipulate,
on_metadata_inventory_put = furniture.inv_put,
on_metadata_inventory_take = furniture.inv_take,
})
minetest.register_node('furniture:cabinet_counter_corner_outside', {
description = 'Cabinet with Countertop',
drawtype = 'mesh',
mesh = 'furniture_cabinet_counter_corner_outside.obj',
tiles = {'furniture_cabinet_counter.png'},
paramtype = 'light',
paramtype2 = 'colorfacedir',
palette = 'furniture_stain_palette.png',
selection_box = {
type = 'fixed',
fixed = {-.5, -.5, -.5, .5, .5, .5},
},
collision_box = {
type = 'fixed',
fixed = {-.5, -.5, -.5, .5, .5, .5},
},
groups = {oddly_breakable_by_hand = 2, choppy=3, stainable=1},
on_construct = function(pos)
local meta = minetest.get_meta(pos)
meta:set_string('formspec', furniture.storage_24_form(pos, ''))
local inv = meta:get_inventory()
inv:set_size('main', 24)
end,
can_dig = function(pos,player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
return inv:is_empty('main')
end,
on_receive_fields = function(pos, formname, fields, sender)
local player_name = sender:get_player_name()
if minetest.is_protected(pos, player_name) and not minetest.check_player_privs(sender, 'protection_bypass') then
return
end
local meta = minetest.get_meta(pos)
if fields ['save'] then
meta:set_string('infotext', fields.description)
meta:set_string('formspec', furniture.storage_24_form(pos, fields.description))
elseif fields ['sort'] then
furniture.sort_inventory(meta:get_inventory())
end
end,
allow_metadata_inventory_put = furniture.inv_take_put,
allow_metadata_inventory_take = furniture.inv_take_put,
allow_metadata_inventory_move = furniture.inv_manipulate,
on_metadata_inventory_put = furniture.inv_put,
on_metadata_inventory_take = furniture.inv_take,
})
local bookshelf_formspec =
"size[8,7;]" ..
"list[context;books;0,0.3;8,2;]" ..

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 188 KiB

View File

@ -1 +1,2 @@
name=simplecrafting_lib
optional-depends = awards, default, intllib, hopper, pipeworks, wool, sfinv, unified_inventory

View File

@ -2,7 +2,6 @@ local MP = minetest.get_modpath(minetest.get_current_modname())
local S, NS = dofile(MP.."/intllib.lua")
local modpath_default = minetest.get_modpath("default")
local modpath_awards = minetest.get_modpath('awards')
-- table_def can have the following:
--{
@ -227,9 +226,6 @@ local on_metadata_inventory_take = function(pos, list_name, index, stack, player
end
end
simplecrafting_lib.craft_stack(craft_type, stack, inv, "input", player:get_inventory(), "main", player)
if modpath_awards then
awards.increment_item_counter(awards.players[player:get_player_name()], "craft", ItemStack(stack):get_name(), ItemStack(stack):get_count())
end
end
refresh_inv(pos, meta)
end

View File

@ -1,4 +1,16 @@
local news = {
'11/26/21',
'Added in new furniture from Traitor.',
'',
'9/26/21',
'Fixed locked jewelry stations.',
'',
'9/21/21',
'Updated a bunch of deprecated code.',
'',
'08/16/21',
'Added the Beautiful Flowers mod.',
'',
'1/15/21',
'Updated curtain toggling function. You can now click on any curtain to toggle all connected curtains.',
'Added some new woodflooring.',

View File

@ -311,7 +311,7 @@ minetest.register_node('stations:jewelry_locked', {
end,
on_receive_fields = function(pos, formname, fields, sender)
local player_name = sender:get_player_name()
if not minetest.is_protected(pos, player_name) and minetest.check_player_privs(sender, 'protection_bypass') then
if not minetest.is_protected(pos, player_name) and not minetest.check_player_privs(sender, 'protection_bypass') then
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory(pos)
local output = inv:get_stack('output', 1)

View File

@ -94,6 +94,43 @@ stations.dual_register_recipe('woodworking', {
output = 'furniture:cabinet_counter',
})
stations.dual_register_recipe('woodworking', {
input = {
['group:wood'] = 2,
['darkage:iron_stick'] = 1,
},
output = 'furniture:railing_straight',
})
stations.dual_register_recipe('woodworking', {
input = {
['group:wood'] = 4,
['darkage:iron_stick'] = 2,
},
output = 'furniture:railing_corner',
})
stations.dual_register_recipe('woodworking', {
input = {
['group:wood'] = 5,
},
output = 'furniture:cabinet_counter_corner_inside',
})
stations.dual_register_recipe('woodworking', {
input = {
['group:wood'] = 5,
},
output = 'furniture:cabinet_counter_corner_outside',
})
stations.dual_register_recipe('woodworking', {
input = {
['group:wood'] = 4,
},
output = 'furniture:desk',
})
stations.dual_register_recipe('woodworking', {
input = {
['group:wood'] = 4,

View File

@ -140,7 +140,7 @@ function tpad.command(playername, param)
local pads = tpad._get_stored_pads(playername)
local shortest_distance = nil
local closest_pad = nil
local playerpos = player:get_pos()
local playerpos = player:getpos()
for strpos, pad in pairs(pads) do
local pos = minetest.string_to_pos(strpos)
local distance = vector.distance(pos, playerpos)
@ -204,7 +204,7 @@ function tpad.on_place(itemstack, placer, pointed_thing)
itemstack = minetest.rotate_node(itemstack, placer, pointed_thing)
local placed = minetest.get_node_or_nil(pos)
if placed and placed.name == tpad.nodename then
local meta = minetest:get_meta(pos)
local meta = minetest.env:get_meta(pos)
local playername = placer:get_player_name()
meta:set_string("owner", playername)
meta:set_string("infotext", "TPAD Station by " .. playername .. " - right click to interact")
@ -339,7 +339,7 @@ function submit.teleport(form)
return
end
local player = minetest.get_player_by_name(form.playername)
player:move_to(pad.pos, false)
player:moveto(pad.pos, false)
local padname = form.globalnet and pad.global_fullname or pad.local_fullname
notify(form.playername, "Teleported to " .. padname)
@ -463,9 +463,12 @@ end
function tpad.on_rightclick(clicked_pos, node, clicker)
local playername = clicker:get_player_name()
local clicked_meta = minetest:get_meta(clicked_pos)
local clicked_meta = minetest.get_meta(clicked_pos)
local ownername = clicked_meta:get_string("owner")
local pad = tpad.get_pad_data(clicked_pos)
if ownername then
print ('owner is '..ownername..' and clicker is '..playername)
end
if not pad or not ownername then
notify.err(playername, "Error! Missing pad data!")
@ -528,7 +531,7 @@ function tpad.on_rightclick(clicked_pos, node, clicker)
end
function tpad.can_dig(pos, player)
local meta = minetest:get_meta(pos)
local meta = minetest.env:get_meta(pos)
local ownername = meta:get_string("owner")
local playername = player:get_player_name()
if ownername == "" or ownername == nil or playername == ownername
@ -540,7 +543,7 @@ function tpad.can_dig(pos, player)
end
function tpad.on_destruct(pos)
local meta = minetest:get_meta(pos)
local meta = minetest.env:get_meta(pos)
local ownername = meta:get_string("owner")
tpad.del_pad(ownername, pos)
end
@ -646,7 +649,7 @@ function tpad.decorate_pad_data(pos, pad, ownername)
end
function tpad.get_pad_data(pos)
local meta = minetest:get_meta(pos)
local meta = minetest.env:get_meta(pos)
local ownername = meta:get_string("owner")
local pads = tpad._get_stored_pads(ownername)
local strpos = minetest.pos_to_string(pos)
@ -656,7 +659,7 @@ function tpad.get_pad_data(pos)
end
function tpad.set_pad_data(pos, padname, padtype)
local meta = minetest:get_meta(pos)
local meta = minetest.env:get_meta(pos)
local ownername = meta:get_string("owner")
local pads = tpad._get_stored_pads(ownername)
local strpos = minetest.pos_to_string(pos)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 300 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 259 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 268 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 KiB

View File

@ -9,7 +9,7 @@ function tpad._get_all_pads()
if parts[1] == "pads" then
local pads = minetest.deserialize(value)
if type(pads) == "table" then
allpads[parts[2]] = pads
allpads[parts[2]] = pads
end
end
end
@ -30,7 +30,7 @@ function tpad._storage_sanity_check()
local storage_version = storage:get_string("_version")
local storage_path = minetest.get_worldpath() .. "/mod_storage/"
if storage_version == "1.1" then
tpad._copy_file(storage_path .. tpad.mod_name, storage_path .. tpad.mod_name .. ".1.1.backup")
tpad._copy_file(storage_path .. tpad.mod_name, storage_path .. tpad.mod_name .. ".1.1.backup")
tpad._convert_storage_1_1()
elseif storage_version ~= "" and storage_version ~= tpad.version then
error("Mod storage version not supported, aborting to prevent data corruption")

Binary file not shown.