diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index 8bd4453b..4da2d2cf 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -90,7 +90,7 @@ minetest.register_craftitem("homedecor:steel_wire", { minetest.register_craftitem("homedecor:speaker_driver", { description = S("Speaker driver"), - inventory_image = "homedecor_speaker_driver.png" + inventory_image = "homedecor_speaker_driver_inv.png" }) minetest.register_craftitem("homedecor:fan_blades", { diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua index 02f5bb3d..b8d54fa8 100644 --- a/homedecor/electronics.lua +++ b/homedecor/electronics.lua @@ -13,9 +13,21 @@ homedecor.register("speaker", { sounds = default.node_sound_leaves_defaults(), }) +homedecor.register("speaker_open", { + description = S("Large Stereo Speaker, open front"), + mesh="homedecor_speaker_large_open.obj", + tiles = { + "homedecor_speaker_sides.png", + "homedecor_speaker_driver.png", + "homedecor_speaker_open_front.png", + }, + groups = { snappy = 3 }, + sounds = default.node_sound_leaves_defaults(), +}) + local spk_cbox = { type = "fixed", - fixed = { -3/16, -8/16, 1/16, 3/16, -2/16, 7/16 } + fixed = { -3/16, -8/16, 1/16, 3/16, -2/16, } } homedecor.register("speaker_small", { diff --git a/homedecor/models/homedecor_speaker_large_open.obj b/homedecor/models/homedecor_speaker_large_open.obj new file mode 100644 index 00000000..eed7dc51 --- /dev/null +++ b/homedecor/models/homedecor_speaker_large_open.obj @@ -0,0 +1,475 @@ +# Blender v2.73 (sub 0) OBJ File: 'speaker-large-open.blend' +# www.blender.org +o Cube +v 0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.500000 +v 0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v 0.500000 -0.500000 -0.437500 +v -0.500000 -0.500000 -0.437500 +v 0.500000 0.500000 -0.437500 +v -0.500000 0.500000 -0.437500 +v -0.000000 0.375000 -0.437500 +v -0.143506 0.346455 -0.437500 +v -0.265165 0.265165 -0.437500 +v -0.346455 0.143506 -0.437500 +v -0.375000 -0.000000 -0.437500 +v -0.346455 -0.143506 -0.437500 +v -0.265165 -0.265165 -0.437500 +v -0.143506 -0.346455 -0.437500 +v -0.000000 -0.375000 -0.437500 +v 0.143506 -0.346455 -0.437500 +v 0.265165 -0.265165 -0.437500 +v 0.346455 -0.143506 -0.437500 +v 0.375000 0.000000 -0.437500 +v 0.346455 0.143506 -0.437500 +v 0.265165 0.265165 -0.437500 +v 0.143506 0.346455 -0.437500 +v -0.000000 0.312499 -0.437500 +v -0.119588 0.288712 -0.437500 +v -0.220970 0.220970 -0.437500 +v -0.288712 0.119588 -0.437500 +v -0.312499 -0.000000 -0.437500 +v -0.288712 -0.119588 -0.437500 +v -0.220970 -0.220970 -0.437500 +v -0.119588 -0.288712 -0.437500 +v -0.000000 -0.312499 -0.437500 +v 0.119588 -0.288712 -0.437500 +v 0.220970 -0.220971 -0.437500 +v 0.288712 -0.119588 -0.437500 +v 0.312499 0.000000 -0.437500 +v 0.288712 0.119588 -0.437500 +v 0.220970 0.220971 -0.437500 +v 0.119588 0.288712 -0.437500 +v -0.000000 0.062500 -0.250000 +v -0.023918 0.057742 -0.250000 +v -0.044194 0.044194 -0.250000 +v 0.057742 -0.023918 -0.250000 +v 0.062500 0.000000 -0.250000 +v 0.057742 0.023918 -0.250000 +v 0.044194 0.044194 -0.250000 +v 0.023918 0.057742 -0.250000 +v -0.062500 0.000000 -0.250000 +v -0.057742 0.000000 -0.273918 +v -0.044194 0.000000 -0.294194 +v -0.023918 0.000000 -0.307742 +v -0.000000 0.000000 -0.312500 +v -0.057742 0.023918 -0.250000 +v -0.053347 0.022097 -0.273918 +v -0.040830 0.016912 -0.294194 +v -0.022097 0.009153 -0.307742 +v -0.040830 0.040830 -0.273918 +v -0.031250 0.031250 -0.294194 +v -0.016912 0.016912 -0.307742 +v -0.022097 0.053347 -0.273918 +v -0.016912 0.040830 -0.294194 +v -0.009153 0.022097 -0.307742 +v -0.000000 0.057742 -0.273918 +v -0.000000 0.044194 -0.294194 +v -0.000000 0.023918 -0.307742 +v 0.022097 0.053347 -0.273918 +v 0.016912 0.040830 -0.294194 +v 0.009153 0.022097 -0.307742 +v 0.040830 0.040830 -0.273918 +v 0.031250 0.031250 -0.294194 +v 0.016912 0.016912 -0.307742 +v 0.053347 0.022097 -0.273918 +v 0.040830 0.016912 -0.294194 +v 0.022097 0.009153 -0.307742 +v 0.057742 -0.000000 -0.273918 +v 0.044194 -0.000000 -0.294194 +v 0.023918 -0.000000 -0.307742 +v 0.053347 -0.022097 -0.273918 +v 0.040830 -0.016912 -0.294194 +v 0.022097 -0.009153 -0.307742 +v 0.044194 -0.044194 -0.250000 +v 0.040830 -0.040830 -0.273918 +v 0.031250 -0.031250 -0.294194 +v 0.016912 -0.016912 -0.307742 +v 0.023918 -0.057742 -0.250000 +v 0.022097 -0.053347 -0.273918 +v 0.016912 -0.040830 -0.294194 +v 0.009153 -0.022097 -0.307742 +v -0.000000 -0.062500 -0.250000 +v -0.000000 -0.057742 -0.273918 +v -0.000000 -0.044194 -0.294194 +v -0.000000 -0.023918 -0.307742 +v -0.023918 -0.057742 -0.250000 +v -0.022097 -0.053347 -0.273918 +v -0.016912 -0.040830 -0.294194 +v -0.009153 -0.022097 -0.307742 +v -0.044194 -0.044194 -0.250000 +v -0.040830 -0.040830 -0.273918 +v -0.031250 -0.031250 -0.294194 +v -0.016912 -0.016912 -0.307742 +v -0.057742 -0.023918 -0.250000 +v -0.053347 -0.022097 -0.273918 +v -0.040830 -0.016912 -0.294194 +v -0.022097 -0.009153 -0.307742 +vt 0.062500 -0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.062500 1.000000 +vt 0.000000 1.000000 +vt -0.000000 0.000000 +vt 0.625000 0.062500 +vt 0.625000 0.125000 +vt 0.500000 0.125000 +vt 0.500000 0.062500 +vt 0.250000 0.250000 +vt 0.250000 0.312500 +vt 0.125000 0.312500 +vt 0.125000 0.250000 +vt 0.875000 0.062500 +vt 0.875000 0.125000 +vt 0.750000 0.125000 +vt 0.750000 0.062500 +vt 0.500000 0.250000 +vt 0.500000 0.312500 +vt 0.375000 0.312500 +vt 0.375000 0.250000 +vt 0.750000 0.250000 +vt 0.750000 0.312500 +vt 0.625000 0.312500 +vt 0.625000 0.250000 +vt 0.875000 0.250000 +vt 1.000000 0.250000 +vt 1.000000 0.312500 +vt 0.875000 0.312500 +vt 0.125000 0.062500 +vt 0.250000 0.062500 +vt 0.250000 0.125000 +vt 0.125000 0.125000 +vt 0.375000 0.125000 +vt 0.375000 0.062500 +vt 0.000000 0.312500 +vt 0.000000 0.250000 +vt 0.000000 0.062500 +vt 0.000000 0.125000 +vt 1.000000 0.062500 +vt 1.000000 0.125000 +vt 0.193106 0.975742 +vt 0.288621 0.745148 +vt 0.312500 0.749898 +vt 0.312500 0.999491 +vt 0.024258 0.806894 +vt 0.254852 0.711379 +vt 0.268378 0.731622 +vt 0.091889 0.908111 +vt 0.336379 0.745148 +vt 0.431894 0.975742 +vt 0.024258 0.568106 +vt 0.254852 0.663621 +vt 0.250102 0.687500 +vt 0.000509 0.687500 +vt 0.356622 0.731622 +vt 0.533111 0.908111 +vt 0.860258 0.687500 +vt 0.900745 0.687500 +vt 0.894028 0.721270 +vt 0.856623 0.705776 +vt 0.927797 0.687500 +vt 0.919020 0.731622 +vt 0.937296 0.687500 +vt 0.927797 0.735258 +vt 0.874898 0.749898 +vt 0.846270 0.721270 +vt 0.894028 0.769027 +vt 0.846270 0.769027 +vt 0.830777 0.731622 +vt 0.856623 0.794021 +vt 0.812500 0.775745 +vt 0.812500 0.735258 +vt 0.812500 0.802797 +vt 0.778730 0.769027 +vt 0.794224 0.731622 +vt 0.768378 0.794021 +vt 0.750102 0.749898 +vt 0.778730 0.721270 +vt 0.730973 0.769027 +vt 0.730973 0.721270 +vt 0.768378 0.705776 +vt 0.705980 0.731622 +vt 0.724256 0.687500 +vt 0.764743 0.687500 +vt 0.697203 0.687500 +vt 0.730973 0.653730 +vt 0.768378 0.669224 +vt 0.705980 0.643378 +vt 0.750102 0.625102 +vt 0.778730 0.653730 +vt 0.730973 0.605973 +vt 0.778730 0.605973 +vt 0.794224 0.643378 +vt 0.768378 0.580980 +vt 0.724256 0.599256 +vt 0.764743 0.572203 +vt 0.812500 0.599256 +vt 0.812500 0.639742 +vt 0.812500 0.572203 +vt 0.812500 0.562703 +vt 0.846270 0.605973 +vt 0.830777 0.643378 +vt 0.856623 0.580980 +vt 0.860258 0.572203 +vt 0.874898 0.625102 +vt 0.846270 0.653730 +vt 0.894028 0.605973 +vt 0.900745 0.599256 +vt 0.894028 0.653730 +vt 0.856623 0.669224 +vt 0.919020 0.643378 +vt 0.927797 0.639743 +vt 0.812500 0.687500 +vt 0.091889 0.466889 +vt 0.268378 0.643378 +vt 0.312500 0.375509 +vt 0.312500 0.625102 +vt 0.288621 0.629852 +vt 0.193106 0.399258 +vt 0.431894 0.399258 +vt 0.533111 0.466889 +vt 0.356622 0.643378 +vt 0.336379 0.629852 +vt 0.600742 0.568106 +vt 0.624491 0.687500 +vt 0.374898 0.687500 +vt 0.370149 0.663621 +vt 0.370149 0.711379 +vt 0.600742 0.806894 +vt 0.900745 0.775745 +vt 0.860258 0.802797 +vt 0.812500 0.812297 +vt 0.764743 0.802797 +vt 0.724256 0.775745 +vt 0.697203 0.735257 +vt 0.687703 0.687500 +vt 0.697203 0.639742 +vt 0.846455 0.356494 +vt 0.765165 0.234835 +vt 0.643506 0.153545 +vt 0.846455 0.643506 +vt 0.765165 0.765165 +vt 0.643506 0.846455 +vt 0.356494 0.846455 +vt 0.234835 0.765165 +vt 0.153545 0.643506 +vt 0.153545 0.356494 +vt 0.234835 0.234835 +vt 0.356494 0.153545 +vt 0.125000 0.500000 +vt 0.875000 0.500000 +vt 0.500000 0.875000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.000000 -0.000000 1.000000 +vn -1.000000 -0.000000 -0.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.229600 -0.554300 -0.800000 +vn 0.099000 0.239100 -0.965900 +vn 0.000000 0.258800 -0.965900 +vn 0.000000 -0.600000 -0.800000 +vn -0.554300 -0.229600 -0.800000 +vn 0.239100 0.099000 -0.965900 +vn 0.183000 0.183000 -0.965900 +vn -0.424300 -0.424300 -0.800000 +vn -0.099000 0.239100 -0.965900 +vn 0.229600 -0.554300 -0.800000 +vn -0.554300 0.229600 -0.800000 +vn 0.239100 -0.099000 -0.965900 +vn 0.258800 0.000000 -0.965900 +vn -0.600000 -0.000000 -0.800000 +vn -0.183000 0.183000 -0.965900 +vn 0.424300 -0.424300 -0.800000 +vn -0.403100 0.000000 -0.915200 +vn -0.718800 0.000000 -0.695200 +vn -0.664100 0.275100 -0.695200 +vn -0.372400 0.154200 -0.915200 +vn -0.927300 0.000000 -0.374300 +vn -0.856700 0.354800 -0.374300 +vn -0.980800 -0.000000 -0.195100 +vn -0.239100 0.099000 -0.965900 +vn -0.508300 0.508300 -0.695200 +vn -0.285000 0.285000 -0.915200 +vn -0.655700 0.655700 -0.374300 +vn -0.275100 0.664100 -0.695200 +vn -0.154200 0.372400 -0.915200 +vn -0.354800 0.856700 -0.374300 +vn 0.000000 0.718800 -0.695200 +vn 0.000000 0.403100 -0.915200 +vn 0.000000 0.927300 -0.374300 +vn 0.275100 0.664100 -0.695200 +vn 0.154200 0.372400 -0.915200 +vn 0.354800 0.856700 -0.374300 +vn 0.508300 0.508300 -0.695200 +vn 0.285000 0.285000 -0.915200 +vn 0.655700 0.655700 -0.374300 +vn 0.664100 0.275100 -0.695200 +vn 0.372400 0.154200 -0.915200 +vn 0.856700 0.354800 -0.374300 +vn 0.718800 0.000000 -0.695200 +vn 0.403100 0.000000 -0.915200 +vn 0.927300 0.000000 -0.374300 +vn 0.664100 -0.275100 -0.695200 +vn 0.372400 -0.154200 -0.915200 +vn 0.856700 -0.354800 -0.374300 +vn 0.508300 -0.508300 -0.695200 +vn 0.285000 -0.285000 -0.915200 +vn 0.655700 -0.655700 -0.374300 +vn 0.275100 -0.664100 -0.695200 +vn 0.154200 -0.372400 -0.915200 +vn 0.354800 -0.856700 -0.374300 +vn 0.183000 -0.183000 -0.965900 +vn 0.375300 -0.906100 -0.195100 +vn 0.000000 -0.718800 -0.695200 +vn 0.000000 -0.403100 -0.915200 +vn 0.000000 -0.927300 -0.374300 +vn -0.000000 -0.980800 -0.195100 +vn -0.275100 -0.664100 -0.695200 +vn -0.154200 -0.372400 -0.915200 +vn -0.354800 -0.856700 -0.374300 +vn -0.375300 -0.906100 -0.195100 +vn -0.508300 -0.508300 -0.695200 +vn -0.285000 -0.285000 -0.915200 +vn -0.655700 -0.655700 -0.374300 +vn -0.693500 -0.693500 -0.195100 +vn -0.664100 -0.275100 -0.695200 +vn -0.372400 -0.154200 -0.915200 +vn -0.856700 -0.354800 -0.374300 +vn -0.906100 -0.375300 -0.195100 +vn -0.424300 0.424300 -0.800000 +vn 0.000000 0.600000 -0.800000 +vn -0.229600 0.554300 -0.800000 +vn 0.229600 0.554300 -0.800000 +vn 0.424300 0.424300 -0.800000 +vn 0.554300 0.229600 -0.800000 +vn 0.600000 0.000000 -0.800000 +vn 0.554300 -0.229600 -0.800000 +g Cube_Cube_speaker-wood +s off +f 5/1/1 1/2/1 2/3/1 6/4/1 +f 7/4/2 8/1/2 4/2/2 3/3/2 +f 5/4/3 7/1/3 3/2/3 1/3/3 +f 1/2/4 3/3/4 4/5/4 2/6/4 +f 2/2/5 4/3/5 8/4/5 6/1/5 +g Cube_Cube_speaker-driver +f 11/7/6 27/8/6 28/9/6 12/10/6 +f 22/11/6 38/12/6 39/13/6 23/14/6 +f 9/15/6 25/16/6 26/17/6 10/18/6 +f 20/19/6 36/20/6 37/21/6 21/22/6 +f 18/23/6 34/24/6 35/25/6 19/26/6 +f 17/27/6 16/28/6 32/29/6 33/30/6 +f 15/31/6 14/32/6 30/33/6 31/34/6 +f 12/10/6 28/9/6 29/35/6 13/36/6 +f 23/14/6 39/13/6 40/37/6 24/38/6 +f 10/18/6 26/17/6 27/8/6 11/7/6 +f 21/22/6 37/21/6 38/12/6 22/11/6 +f 19/26/6 35/25/6 36/20/6 20/19/6 +f 17/27/6 33/30/6 34/24/6 18/23/6 +f 16/39/6 15/31/6 31/34/6 32/40/6 +f 14/32/6 13/36/6 29/35/6 30/33/6 +f 24/41/6 40/42/6 25/16/6 9/15/6 +s 1 +f 40/43/7 48/44/8 41/45/9 25/46/10 +f 38/47/11 46/48/12 47/49/13 39/50/14 +f 25/46/10 41/45/9 42/51/15 26/52/16 +f 36/53/17 44/54/18 45/55/19 37/56/20 +f 39/50/14 47/49/13 48/44/8 40/43/7 +f 26/52/16 42/51/15 43/57/21 27/58/22 +f 37/56/20 45/55/19 46/48/12 38/47/11 +f 52/59/23 51/60/24 56/61/25 57/62/26 +f 51/60/24 50/63/27 55/64/28 56/61/25 +f 50/63/27 49/65/29 54/66/30 55/64/28 +f 57/62/26 56/61/25 59/67/31 60/68/32 +f 56/61/25 55/64/28 58/69/33 59/67/31 +f 60/68/32 59/67/31 62/70/34 63/71/35 +f 59/67/31 58/69/33 61/72/36 62/70/34 +f 63/71/35 62/70/34 65/73/37 66/74/38 +f 62/70/34 61/72/36 64/75/39 65/73/37 +f 66/74/38 65/73/37 68/76/40 69/77/41 +f 65/73/37 64/75/39 67/78/42 68/76/40 +f 69/77/41 68/76/40 71/79/43 72/80/44 +f 68/76/40 67/78/42 70/81/45 71/79/43 +f 72/80/44 71/79/43 74/82/46 75/83/47 +f 71/79/43 70/81/45 73/84/48 74/82/46 +f 75/83/47 74/82/46 77/85/49 78/86/50 +f 74/82/46 73/84/48 76/87/51 77/85/49 +f 78/86/50 77/85/49 80/88/52 81/89/53 +f 77/85/49 76/87/51 79/90/54 80/88/52 +f 81/89/53 80/88/52 84/91/55 85/92/56 +f 80/88/52 79/90/54 83/93/57 84/91/55 +f 85/92/56 84/91/55 88/94/58 89/95/59 +f 84/91/55 83/93/57 87/96/60 88/94/58 +f 83/93/57 82/97/61 86/98/62 87/96/60 +f 89/95/59 88/94/58 92/99/63 93/100/64 +f 88/94/58 87/96/60 91/101/65 92/99/63 +f 87/96/60 86/98/62 90/102/66 91/101/65 +f 93/100/64 92/99/63 96/103/67 97/104/68 +f 92/99/63 91/101/65 95/105/69 96/103/67 +f 91/101/65 90/102/66 94/106/70 95/105/69 +f 97/104/68 96/103/67 100/107/71 101/108/72 +f 96/103/67 95/105/69 99/109/73 100/107/71 +f 95/105/69 94/106/70 98/110/74 99/109/73 +f 101/108/72 100/107/71 104/111/75 105/112/76 +f 100/107/71 99/109/73 103/113/77 104/111/75 +f 99/109/73 98/110/74 102/114/78 103/113/77 +f 53/115/6 52/59/23 57/62/26 +f 53/115/6 57/62/26 60/68/32 +f 53/115/6 60/68/32 63/71/35 +f 53/115/6 63/71/35 66/74/38 +f 53/115/6 66/74/38 69/77/41 +f 53/115/6 69/77/41 72/80/44 +f 53/115/6 72/80/44 75/83/47 +f 53/115/6 75/83/47 78/86/50 +f 53/115/6 78/86/50 81/89/53 +f 53/115/6 81/89/53 85/92/56 +f 53/115/6 85/92/56 89/95/59 +f 53/115/6 89/95/59 93/100/64 +f 53/115/6 93/100/64 97/104/68 +f 53/115/6 97/104/68 101/108/72 +f 53/115/6 101/108/72 105/112/76 +f 53/115/6 105/112/76 52/59/23 +f 105/112/76 104/111/75 51/60/24 52/59/23 +f 104/111/75 103/113/77 50/63/27 51/60/24 +f 103/113/77 102/114/78 49/65/29 50/63/27 +f 35/116/79 82/117/61 44/54/18 36/53/17 +f 33/118/80 90/119/80 86/120/81 34/121/81 +f 32/122/82 31/123/83 98/124/83 94/125/82 +f 30/126/84 29/127/85 49/128/85 102/129/84 +f 27/58/22 43/57/21 54/130/30 28/131/86 +f 34/121/81 86/120/81 82/117/61 35/116/79 +f 33/118/80 32/122/82 94/125/82 90/119/80 +f 31/123/83 30/126/84 102/129/84 98/124/83 +f 28/131/86 54/130/30 49/128/85 29/127/85 +f 55/64/28 54/66/30 43/132/21 58/69/33 +f 58/69/33 43/132/21 42/133/15 61/72/36 +f 61/72/36 42/133/15 41/134/9 64/75/39 +f 64/75/39 41/134/9 48/135/8 67/78/42 +f 67/78/42 48/135/8 47/136/13 70/81/45 +f 70/81/45 47/136/13 46/137/12 73/84/48 +f 73/84/48 46/137/12 45/138/19 76/87/51 +f 76/87/51 45/138/19 44/139/18 79/90/54 +f 79/90/54 44/139/18 82/97/61 83/93/57 +g Cube_Cube_speaker-open-front +s off +f 14/140/6 15/141/6 6/2/6 +f 15/141/6 16/142/6 6/2/6 +f 12/143/6 8/3/6 11/144/6 +f 10/145/6 11/144/6 8/3/6 +f 24/146/6 7/5/6 23/147/6 +f 22/148/6 23/147/6 7/5/6 +f 20/149/6 5/6/6 19/150/6 +f 18/151/6 19/150/6 5/6/6 +f 20/149/6 21/152/6 5/6/6 +f 21/152/6 22/148/6 7/5/6 +f 7/5/6 5/6/6 21/152/6 +f 17/9/6 18/151/6 5/6/6 +f 16/142/6 17/9/6 6/2/6 +f 5/6/6 6/2/6 17/9/6 +f 14/140/6 6/2/6 13/153/6 +f 12/143/6 13/153/6 8/3/6 +f 8/3/6 13/153/6 6/2/6 +f 9/154/6 10/145/6 8/3/6 +f 8/3/6 7/5/6 9/154/6 +f 9/154/6 7/5/6 24/146/6 diff --git a/homedecor/textures/homedecor_speaker_driver.png b/homedecor/textures/homedecor_speaker_driver.png index 729c1d68..9c57d02e 100644 Binary files a/homedecor/textures/homedecor_speaker_driver.png and b/homedecor/textures/homedecor_speaker_driver.png differ diff --git a/homedecor/textures/homedecor_speaker_driver_inv.png b/homedecor/textures/homedecor_speaker_driver_inv.png new file mode 100644 index 00000000..729c1d68 Binary files /dev/null and b/homedecor/textures/homedecor_speaker_driver_inv.png differ diff --git a/homedecor/textures/homedecor_speaker_open_front.png b/homedecor/textures/homedecor_speaker_open_front.png new file mode 100644 index 00000000..c02286aa Binary files /dev/null and b/homedecor/textures/homedecor_speaker_open_front.png differ