diff --git a/homedecor/blends/table_small_round.blend b/homedecor/blends/table_small_round.blend new file mode 100644 index 00000000..9f60259c Binary files /dev/null and b/homedecor/blends/table_small_round.blend differ diff --git a/homedecor/blends/table_small_round.blend1 b/homedecor/blends/table_small_round.blend1 new file mode 100644 index 00000000..96b5dc25 Binary files /dev/null and b/homedecor/blends/table_small_round.blend1 differ diff --git a/homedecor/blends/table_small_round.blend2 b/homedecor/blends/table_small_round.blend2 new file mode 100644 index 00000000..507119da Binary files /dev/null and b/homedecor/blends/table_small_round.blend2 differ diff --git a/homedecor/models/homedecor_table_small_round.mtl b/homedecor/models/homedecor_table_small_round.mtl new file mode 100644 index 00000000..3218ce0c --- /dev/null +++ b/homedecor/models/homedecor_table_small_round.mtl @@ -0,0 +1,11 @@ +# Blender MTL File: 'table_small_round.blend' +# Material Count: 1 + +newmtl None +Ns 0 +Ka 0.000000 0.000000 0.000000 +Kd 0.8 0.8 0.8 +Ks 0.8 0.8 0.8 +d 1 +illum 2 +map_Kd /home/vanessa/Minetest-related/mods/my_mods/homedecor_modpack/homedecor/textures/homedecor_glass_table_small_round.png diff --git a/homedecor/models/homedecor_table_small_round.obj b/homedecor/models/homedecor_table_small_round.obj new file mode 100644 index 00000000..31ea45d1 --- /dev/null +++ b/homedecor/models/homedecor_table_small_round.obj @@ -0,0 +1,240 @@ +# Blender v2.69 (sub 0) OBJ File: 'table_small_round.blend' +# www.blender.org +mtllib homedecor_table_small_round.mtl +o Cylinder +v 0.049009 -0.499000 -0.497592 +v 0.049009 -0.437500 -0.497592 +v 0.145142 -0.499000 -0.478470 +v 0.145142 -0.437500 -0.478470 +v 0.235698 -0.499000 -0.440960 +v 0.235698 -0.437500 -0.440961 +v 0.317197 -0.499000 -0.386505 +v 0.317197 -0.437500 -0.386505 +v 0.386505 -0.499000 -0.317197 +v 0.386505 -0.437500 -0.317197 +v 0.440961 -0.499000 -0.235698 +v 0.440961 -0.437500 -0.235698 +v 0.478470 -0.499000 -0.145142 +v 0.478470 -0.437500 -0.145142 +v 0.497592 -0.499000 -0.049008 +v 0.497592 -0.437500 -0.049008 +v 0.497592 -0.499000 0.049009 +v 0.497592 -0.437500 0.049009 +v 0.478470 -0.499000 0.145142 +v 0.478470 -0.437500 0.145142 +v 0.440961 -0.499000 0.235698 +v 0.440961 -0.437500 0.235698 +v 0.386505 -0.499000 0.317197 +v 0.386505 -0.437500 0.317197 +v 0.317197 -0.499000 0.386505 +v 0.317197 -0.437500 0.386505 +v 0.235698 -0.499000 0.440961 +v 0.235698 -0.437500 0.440961 +v 0.145142 -0.499000 0.478470 +v 0.145142 -0.437500 0.478470 +v 0.049008 -0.499000 0.497592 +v 0.049008 -0.437500 0.497592 +v -0.049009 -0.499000 0.497592 +v -0.049009 -0.437500 0.497592 +v -0.145143 -0.499000 0.478470 +v -0.145143 -0.437500 0.478470 +v -0.235699 -0.499000 0.440961 +v -0.235699 -0.437500 0.440961 +v -0.317197 -0.499000 0.386505 +v -0.317197 -0.437500 0.386505 +v -0.386505 -0.499000 0.317196 +v -0.386505 -0.437500 0.317196 +v -0.440961 -0.499000 0.235698 +v -0.440961 -0.437500 0.235698 +v -0.478470 -0.499000 0.145142 +v -0.478470 -0.437500 0.145142 +v -0.497592 -0.499000 0.049008 +v -0.497592 -0.437500 0.049008 +v -0.497592 -0.499000 -0.049009 +v -0.497592 -0.437500 -0.049009 +v -0.478470 -0.499000 -0.145143 +v -0.478470 -0.437500 -0.145143 +v -0.440960 -0.499000 -0.235699 +v -0.440960 -0.437500 -0.235699 +v -0.386505 -0.499000 -0.317197 +v -0.386505 -0.437500 -0.317197 +v -0.317196 -0.499000 -0.386506 +v -0.317196 -0.437500 -0.386506 +v -0.235698 -0.499000 -0.440961 +v -0.235698 -0.437500 -0.440961 +v -0.145142 -0.499000 -0.478470 +v -0.145142 -0.437500 -0.478470 +v -0.049008 -0.499000 -0.497592 +v -0.049008 -0.437500 -0.497592 +vt 0.277778 0.166667 +vt 0.277778 0.138889 +vt 0.333333 0.138889 +vt 0.333333 0.166667 +vt 0.388889 0.138889 +vt 0.388889 0.166667 +vt 0.444444 0.138889 +vt 0.444444 0.166667 +vt 0.500000 0.138889 +vt 0.500000 0.166667 +vt 0.555556 0.138889 +vt 0.555556 0.166667 +vt 0.611111 0.138889 +vt 0.611111 0.166667 +vt 0.666667 0.138889 +vt 0.666667 0.166667 +vt 0.722222 0.138889 +vt 0.722222 0.166667 +vt 0.277778 0.416667 +vt 0.277778 0.388889 +vt 0.333333 0.388889 +vt 0.333333 0.416667 +vt 0.388889 0.388889 +vt 0.388889 0.416667 +vt 0.444444 0.388889 +vt 0.444444 0.416667 +vt 0.500000 0.388889 +vt 0.500000 0.416667 +vt 0.555556 0.388889 +vt 0.555556 0.416667 +vt 0.611111 0.388889 +vt 0.611111 0.416667 +vt 0.666667 0.388889 +vt 0.666667 0.416667 +vt 0.722222 0.388889 +vt 0.722222 0.416667 +vt 0.277778 0.333333 +vt 0.277778 0.305556 +vt 0.333333 0.305556 +vt 0.333333 0.333333 +vt 0.388889 0.305556 +vt 0.388889 0.333333 +vt 0.444444 0.305556 +vt 0.444444 0.333333 +vt 0.500000 0.305556 +vt 0.500000 0.333333 +vt 0.555556 0.305556 +vt 0.555556 0.333333 +vt 0.611111 0.305556 +vt 0.611111 0.333333 +vt 0.666667 0.305556 +vt 0.666667 0.333333 +vt 0.722222 0.305556 +vt 0.722222 0.333333 +vt 0.277778 0.250000 +vt 0.277778 0.222222 +vt 0.333333 0.222222 +vt 0.333333 0.250000 +vt 0.388889 0.222222 +vt 0.388889 0.250000 +vt 0.444444 0.222222 +vt 0.444444 0.250000 +vt 0.500000 0.222222 +vt 0.500000 0.250000 +vt 0.555556 0.222222 +vt 0.555556 0.250000 +vt 0.611111 0.222222 +vt 0.611111 0.250000 +vt 0.184686 0.534688 +vt 0.227946 0.526084 +vt 0.272054 0.526084 +vt 0.315314 0.534689 +vt 0.356064 0.551568 +vt 0.392738 0.576073 +vt 0.423927 0.607262 +vt 0.448432 0.643936 +vt 0.465312 0.684686 +vt 0.473917 0.727946 +vt 0.473917 0.772054 +vt 0.465312 0.815314 +vt 0.448433 0.856064 +vt 0.423928 0.892738 +vt 0.392738 0.923927 +vt 0.356064 0.948432 +vt 0.315314 0.965312 +vt 0.272053 0.973917 +vt 0.227946 0.973917 +vt 0.184686 0.965311 +vt 0.143935 0.948432 +vt 0.107261 0.923927 +vt 0.076073 0.892738 +vt 0.051568 0.856064 +vt 0.034688 0.815314 +vt 0.026083 0.772054 +vt 0.026083 0.727946 +vt 0.034688 0.684686 +vt 0.051568 0.643936 +vt 0.076073 0.607261 +vt 0.107262 0.576073 +vt 0.143936 0.551568 +vt 0.666667 0.250000 +vt 0.666667 0.222222 +vt 0.722222 0.222222 +vt 0.722222 0.250000 +vt 0.727947 0.526084 +vt 0.684687 0.534689 +vt 0.643937 0.551568 +vt 0.607262 0.576073 +vt 0.576074 0.607262 +vt 0.551569 0.643936 +vt 0.534689 0.684686 +vt 0.526084 0.727946 +vt 0.526084 0.772054 +vt 0.534689 0.815315 +vt 0.551568 0.856065 +vt 0.576073 0.892739 +vt 0.607262 0.923928 +vt 0.643936 0.948433 +vt 0.684686 0.965312 +vt 0.727946 0.973917 +vt 0.772054 0.973917 +vt 0.815315 0.965311 +vt 0.856065 0.948432 +vt 0.892739 0.923927 +vt 0.923928 0.892738 +vt 0.948433 0.856063 +vt 0.965312 0.815312 +vt 0.973917 0.772052 +vt 0.973916 0.727945 +vt 0.965311 0.684685 +vt 0.948432 0.643935 +vt 0.923927 0.607261 +vt 0.892739 0.576073 +vt 0.856065 0.551568 +vt 0.815315 0.534689 +vt 0.772054 0.526084 +usemtl None +s off +f 1/1 2/2 4/3 3/4 +f 3/4 4/3 6/5 5/6 +f 5/6 6/5 8/7 7/8 +f 7/8 8/7 10/9 9/10 +f 9/10 10/9 12/11 11/12 +f 11/12 12/11 14/13 13/14 +f 13/14 14/13 16/15 15/16 +f 15/16 16/15 18/17 17/18 +f 17/19 18/20 20/21 19/22 +f 19/22 20/21 22/23 21/24 +f 21/24 22/23 24/25 23/26 +f 23/26 24/25 26/27 25/28 +f 25/28 26/27 28/29 27/30 +f 27/30 28/29 30/31 29/32 +f 29/32 30/31 32/33 31/34 +f 31/34 32/33 34/35 33/36 +f 33/37 34/38 36/39 35/40 +f 35/40 36/39 38/41 37/42 +f 37/42 38/41 40/43 39/44 +f 39/44 40/43 42/45 41/46 +f 41/46 42/45 44/47 43/48 +f 43/48 44/47 46/49 45/50 +f 45/50 46/49 48/51 47/52 +f 47/52 48/51 50/53 49/54 +f 49/55 50/56 52/57 51/58 +f 51/58 52/57 54/59 53/60 +f 53/60 54/59 56/61 55/62 +f 55/62 56/61 58/63 57/64 +f 57/64 58/63 60/65 59/66 +f 59/66 60/65 62/67 61/68 +f 4/69 2/70 64/71 62/72 60/73 58/74 56/75 54/76 52/77 50/78 48/79 46/80 44/81 42/82 40/83 38/84 36/85 34/86 32/87 30/88 28/89 26/90 24/91 22/92 20/93 18/94 16/95 14/96 12/97 10/98 8/99 6/100 +f 63/101 64/102 2/103 1/104 +f 61/68 62/67 64/102 63/101 +f 1/105 3/106 5/107 7/108 9/109 11/110 13/111 15/112 17/113 19/114 21/115 23/116 25/117 27/118 29/119 31/120 33/121 35/122 37/123 39/124 41/125 43/126 45/127 47/128 49/129 51/130 53/131 55/132 57/133 59/134 61/135 63/136 diff --git a/homedecor/tables.lua b/homedecor/tables.lua index 62aab390..916f1c9b 100644 --- a/homedecor/tables.lua +++ b/homedecor/tables.lua @@ -54,6 +54,7 @@ for i in ipairs(materials) do on_place = minetest.rotate_node }) +--[[ minetest.register_node('homedecor:'..m..'_table_small_square_t', { description = S(d.." Table (Small, Square)"), drawtype = 'nodebox', @@ -117,38 +118,23 @@ for i in ipairs(materials) do }, drop = 'homedecor:'..m..'_table_small_square_b' }) +]]-- -- small round tables minetest.register_node('homedecor:'..m..'_table_small_round_b', { description = S(d.." Table (Small, Round)"), - drawtype = 'nodebox', - tiles = { - 'homedecor_'..m..'_table_small_round_tb.png', - 'homedecor_'..m..'_table_small_round_tb.png', - 'homedecor_'..m..'_table_small_round_edges.png', - 'homedecor_'..m..'_table_small_round_edges.png', - 'homedecor_'..m..'_table_small_round_edges.png', - 'homedecor_'..m..'_table_small_round_edges.png' - }, - wield_image = 'homedecor_'..m..'_table_small_round_tb.png', - inventory_image = 'homedecor_'..m..'_table_small_round_tb.png', + drawtype = "mesh", + mesh = "homedecor_table_small_round.obj", + tiles = { "homedecor_"..m.."_table_small_round.png" }, + wield_image = 'homedecor_'..m..'_table_small_round_inv.png', + inventory_image = 'homedecor_'..m..'_table_small_round_inv.png', sunlight_propagates = true, paramtype = 'light', walkable = true, groups = { snappy = 3 }, sounds = s, paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.25, -0.5, -0.5, 0.25, -0.4375, 0.5 }, - { -0.375, -0.5, -0.4375, 0.375, -0.4375, 0.4375 }, - { -0.5, -0.5, -0.25, 0.5, -0.4375, 0.25 }, - { -0.4375, -0.5, -0.375, 0.4375, -0.4375, 0.375 }, - { -0.25, -0.5, -0.5, 0.25, -0.4375, 0.5 }, - } - }, selection_box = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, @@ -156,6 +142,8 @@ for i in ipairs(materials) do on_place = minetest.rotate_node }) + +--[[ minetest.register_node('homedecor:'..m..'_table_small_round_t', { description = S(d.." Table (Small, Round)"), drawtype = 'nodebox', @@ -223,6 +211,8 @@ for i in ipairs(materials) do }, drop = 'homedecor:'..m..'_table_small_round_b' }) +]]-- + -- Large square table pieces @@ -256,6 +246,7 @@ for i in ipairs(materials) do on_place = minetest.rotate_node }) +--[[ minetest.register_node('homedecor:'..m..'_table_large_t', { description = S(d.." Table Piece (large)"), drawtype = 'nodebox', @@ -316,6 +307,8 @@ for i in ipairs(materials) do drop = 'homedecor:'..m..'_table_large_b' }) +]]-- + minetest.register_alias('homedecor:'..m..'_table_large', 'homedecor:'..m..'_table_large_b') minetest.register_alias('homedecor:'..m..'_table_small_square', 'homedecor:'..m..'_table_small_square_b') minetest.register_alias('homedecor:'..m..'_table_small_round', 'homedecor:'..m..'_table_small_round_b') diff --git a/homedecor/textures/homedecor_glass_table_small_round.png b/homedecor/textures/homedecor_glass_table_small_round.png new file mode 100644 index 00000000..a2d7183f Binary files /dev/null and b/homedecor/textures/homedecor_glass_table_small_round.png differ diff --git a/homedecor/textures/homedecor_glass_table_small_round_edges.png b/homedecor/textures/homedecor_glass_table_small_round_edges.png deleted file mode 100644 index 29cc270c..00000000 Binary files a/homedecor/textures/homedecor_glass_table_small_round_edges.png and /dev/null differ diff --git a/homedecor/textures/homedecor_glass_table_small_round_inv.png b/homedecor/textures/homedecor_glass_table_small_round_inv.png new file mode 100644 index 00000000..ebab56c1 Binary files /dev/null and b/homedecor/textures/homedecor_glass_table_small_round_inv.png differ diff --git a/homedecor/textures/homedecor_glass_table_small_round_tb.png b/homedecor/textures/homedecor_glass_table_small_round_tb.png deleted file mode 100644 index 68b813b3..00000000 Binary files a/homedecor/textures/homedecor_glass_table_small_round_tb.png and /dev/null differ diff --git a/homedecor/textures/homedecor_wood_table_small_round.png b/homedecor/textures/homedecor_wood_table_small_round.png new file mode 100644 index 00000000..eb0f3e7c Binary files /dev/null and b/homedecor/textures/homedecor_wood_table_small_round.png differ diff --git a/homedecor/textures/homedecor_wood_table_small_round_edges.png b/homedecor/textures/homedecor_wood_table_small_round_edges.png deleted file mode 100644 index b4b8a1d9..00000000 Binary files a/homedecor/textures/homedecor_wood_table_small_round_edges.png and /dev/null differ diff --git a/homedecor/textures/homedecor_wood_table_small_round_inv.png b/homedecor/textures/homedecor_wood_table_small_round_inv.png new file mode 100644 index 00000000..a1ecad23 Binary files /dev/null and b/homedecor/textures/homedecor_wood_table_small_round_inv.png differ diff --git a/homedecor/textures/homedecor_wood_table_small_round_tb.png b/homedecor/textures/homedecor_wood_table_small_round_tb.png deleted file mode 100644 index 79ace231..00000000 Binary files a/homedecor/textures/homedecor_wood_table_small_round_tb.png and /dev/null differ