diff --git a/homedecor/blends/table_small_square.blend b/homedecor/blends/table_small_square.blend new file mode 100644 index 00000000..d562cdbe Binary files /dev/null and b/homedecor/blends/table_small_square.blend differ diff --git a/homedecor/models/homedecor_table_small_square.obj b/homedecor/models/homedecor_table_small_square.obj new file mode 100644 index 00000000..467259e9 --- /dev/null +++ b/homedecor/models/homedecor_table_small_square.obj @@ -0,0 +1,48 @@ +# Blender v2.69 (sub 0) OBJ File: 'table_small_square.blend' +# www.blender.org +mtllib homedecor_table_small_square.mtl +o Cube +v 0.499000 -0.499000 -0.499000 +v 0.499000 -0.499000 0.499000 +v -0.499000 -0.499000 0.499000 +v -0.499000 -0.499000 -0.499000 +v 0.499000 -0.468750 -0.499000 +v 0.499000 -0.468750 0.499000 +v -0.499000 -0.468750 0.499000 +v -0.499000 -0.468750 -0.499000 +v 0.468750 -0.437500 -0.468750 +v 0.468750 -0.437500 0.468750 +v -0.468750 -0.437500 0.468750 +v -0.468750 -0.437500 -0.468750 +vt 0.500000 0.029412 +vt 0.970588 0.029412 +vt 0.970588 0.500000 +vt 0.500000 0.500000 +vt 0.014706 0.985294 +vt 0.014706 0.514706 +vt 0.029412 0.529412 +vt 0.029412 0.970588 +vt 0.985294 0.500000 +vt 0.985294 0.029412 +vt 0.500000 0.514706 +vt 0.970588 0.514706 +vt 0.485294 0.029412 +vt 0.485294 0.500000 +vt 0.970588 0.014706 +vt 0.500000 0.014706 +vt 0.470588 0.970588 +vt 0.470588 0.529412 +vt 0.485294 0.514706 +vt 0.485294 0.985294 +usemtl Material +s off +f 1/1 2/2 3/3 4/4 +f 8/5 7/6 11/7 12/8 +f 1/9 5/3 6/2 2/10 +f 2/11 6/4 7/3 3/12 +f 3/13 7/1 8/4 4/14 +f 5/15 1/2 4/1 8/16 +f 9/17 12/8 11/7 10/18 +f 7/6 6/19 10/18 11/7 +f 5/20 8/5 12/8 9/17 +f 6/19 5/20 9/17 10/18 diff --git a/homedecor/tables.lua b/homedecor/tables.lua index 950aedc8..68016b4d 100644 --- a/homedecor/tables.lua +++ b/homedecor/tables.lua @@ -22,15 +22,9 @@ for i in ipairs(materials) do minetest.register_node("homedecor:"..m.."_table_small_square", { description = S(d.." Table (Small, Square)"), - drawtype = 'nodebox', - tiles = { - 'homedecor_'..m..'_table_small_square_tb.png', - 'homedecor_'..m..'_table_small_square_tb.png', - 'homedecor_'..m..'_table_small_square_edges.png', - 'homedecor_'..m..'_table_small_square_edges.png', - 'homedecor_'..m..'_table_small_square_edges.png', - 'homedecor_'..m..'_table_small_square_edges.png' - }, + drawtype = 'mesh', + mesh = "homedecor_table_small_square.obj", + tiles = { 'homedecor_'..m..'_table_small_square.png' }, wield_image = 'homedecor_'..m..'_table_small_square_tb.png', inventory_image = 'homedecor_'..m..'_table_small_square_tb.png', sunlight_propagates = true, @@ -39,14 +33,6 @@ for i in ipairs(materials) do groups = { snappy = 3 }, sounds = s, paramtype2 = "facedir", - - node_box = { - type = "fixed", - fixed = { - { -0.4375, -0.5, -0.5, 0.4375, -0.4375, 0.5 }, - { -0.5, -0.5, -0.4375, 0.5, -0.4375, 0.4375 } - }, - }, selection_box = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, diff --git a/homedecor/textures/homedecor_glass_table_small_square.png b/homedecor/textures/homedecor_glass_table_small_square.png new file mode 100644 index 00000000..987f4e90 Binary files /dev/null and b/homedecor/textures/homedecor_glass_table_small_square.png differ diff --git a/homedecor/textures/homedecor_glass_table_small_square_edges.png b/homedecor/textures/homedecor_glass_table_small_square_edges.png deleted file mode 100644 index 29cc270c..00000000 Binary files a/homedecor/textures/homedecor_glass_table_small_square_edges.png and /dev/null differ diff --git a/homedecor/textures/homedecor_glass_table_small_square_tb.png b/homedecor/textures/homedecor_glass_table_small_square_tb.png deleted file mode 100644 index c4119f66..00000000 Binary files a/homedecor/textures/homedecor_glass_table_small_square_tb.png and /dev/null differ diff --git a/homedecor/textures/homedecor_wood_table_small_square.png b/homedecor/textures/homedecor_wood_table_small_square.png new file mode 100644 index 00000000..15ee7230 Binary files /dev/null and b/homedecor/textures/homedecor_wood_table_small_square.png differ diff --git a/homedecor/textures/homedecor_wood_table_small_square_edges.png b/homedecor/textures/homedecor_wood_table_small_square_edges.png deleted file mode 100644 index b4b8a1d9..00000000 Binary files a/homedecor/textures/homedecor_wood_table_small_square_edges.png and /dev/null differ diff --git a/homedecor/textures/homedecor_wood_table_small_square_tb.png b/homedecor/textures/homedecor_wood_table_small_square_tb.png deleted file mode 100644 index f7f4bd6e..00000000 Binary files a/homedecor/textures/homedecor_wood_table_small_square_tb.png and /dev/null differ