diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 4253ce6..7bfdc85 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -531,64 +531,27 @@ homedecor.register("dartboard", { sounds = default.node_sound_defaults(), }) +local piano_cbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.125, 1.5, 0.5, 0.5 } +} + homedecor.register("piano_left", { + mesh = "homedecor_piano.obj", tiles = { - "homedecor_piano_top_left.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_front_left.png", + "homedecor_piano_keys.png", + "homedecor_tile_brass2.png", + "homedecor_piano_wood.png" }, inventory_image = "homedecor_piano_inv.png", description = "Piano", - groups = { snappy = 3 }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.1875, 0.5, 0.5, 0.5}, -- NodeBox1 - {-0.5, 0.0625, -0.125, -0.4375, 0.25, 0.1875}, -- NodeBox2 - {-0.5, -0.5, -0.125, -0.4375, -0.375, 0.1875}, -- NodeBox3 - {-0.5, -0.375, -0.0625, -0.4375, 0.0625, 0}, -- NodeBox4 - {-0.5, 0.0625, -0.0625, 0.5, 0.1875, 0.1875}, -- NodeBox5 - {-0.4375, 0.1875, 0.15, 0.5, 0.4375, 0.1875}, -- NodeBox6 - {0.3594, -0.5, 0, 0.4062, -0.46875, 0.25}, -- left-most pedal - {0.4844, -0.5, 0, 0.5, -0.46875, 0.25}, -- half of center pedal - } - }, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.125, 1.5, 0.5, 0.5 } - }, - expand = { right="homedecor:piano_right" }, + groups = { snappy = 3 }, + selection_box = piano_cbox, + collision_box = piano_cbox, + expand = { right="air" }, }) -homedecor.register("piano_right", { - tiles = { - "homedecor_piano_top_right.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_sides.png", - "homedecor_piano_front_right.png", - }, - groups = { snappy = 3, not_in_creative_inventory=1 }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.1875, 0.5, 0.5, 0.5}, -- NodeBox1 - {0.4375, -0.5, -0.125, 0.5, -0.375, 0.1875}, -- NodeBox2 - {0.4375, 0.0625, -0.125, 0.5, 0.25, 0.1875}, -- NodeBox3 - {0.4375, -0.375, -0.0625, 0.5, 0.0625, 0}, -- NodeBox4 - {-0.5, 0.0625, -0.0625, 0.4375, 0.1875, 0.1875}, -- NodeBox5 - {-0.5, 0.1875, 0.15, 0.4375, 0.4375, 0.1875}, -- NodeBox6 - {-0.5, -0.5, 0, -0.4688, -0.46875, 0.25}, -- half of center pedal - {-0.3905, -0.5, 0, -0.3438, -0.46875, 0.25}, -- right-most pedal - - } - }, - selection_box = homedecor.nodebox.null -}) +minetest.register_alias("homedecor:piano_right", "air") -- convert old pool tables into newer model diff --git a/homedecor/models/homedecor_piano.obj b/homedecor/models/homedecor_piano.obj new file mode 100644 index 0000000..77eff8c --- /dev/null +++ b/homedecor/models/homedecor_piano.obj @@ -0,0 +1,333 @@ +# Blender v2.73 (sub 0) OBJ File: 'piano.blend' +# www.blender.org +o keys_Cube.003 +v -1.437500 0.062500 -0.062500 +v 0.437500 0.062500 -0.062500 +v -1.437500 0.187500 0.187500 +v -1.437500 0.187500 -0.062500 +v 0.437500 0.187500 -0.062500 +v 0.437500 0.187500 0.187500 +v -0.500000 0.187500 -0.062500 +v -0.500000 0.062500 -0.062500 +v -0.500000 0.187500 0.187500 +vt 0.031250 0.625000 +vt 0.031250 0.437500 +vt 0.968750 0.437500 +vt 0.968750 0.625000 +vt 0.968750 0.781250 +vt 0.031250 0.781250 +vt 0.031250 0.656250 +vt 0.968750 0.656250 +vt 0.031250 0.312500 +vt 0.968750 0.312500 +vt 0.031250 0.968750 +vt 0.968750 0.968750 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +g keys_Cube.003_None +s off +f 9/1/1 7/2/1 4/3/1 3/4/1 +f 7/5/2 5/6/2 2/7/2 8/8/2 +f 4/3/2 7/2/2 8/9/2 1/10/2 +f 6/11/1 5/6/1 7/5/1 9/12/1 +o pedals_Cube.002 +v -0.609375 -0.437500 0.000000 +v -0.609375 -0.437500 0.187500 +v -0.484375 -0.437500 0.187500 +v -0.484375 -0.437500 0.000000 +v -0.531250 -0.437500 0.000000 +v -0.531250 -0.437500 0.187500 +v -0.484375 -0.460938 0.187500 +v -0.484375 -0.460938 0.000000 +v -0.359375 -0.460938 0.000000 +v -0.406250 -0.460938 0.000000 +v -0.406250 -0.460938 0.187500 +v -0.359375 -0.437500 0.187500 +v -0.359375 -0.437500 0.000000 +v -0.656250 -0.460938 0.187500 +v -0.406250 -0.437500 0.187500 +v -0.531250 -0.460938 0.000000 +v -0.656250 -0.460938 0.000000 +v -0.531250 -0.460938 0.187500 +v -0.609375 -0.460938 0.000000 +v -0.609375 -0.460938 0.187500 +v -0.359375 -0.460938 0.187500 +v -0.656250 -0.437500 0.187500 +v -0.656250 -0.437500 0.000000 +v -0.406250 -0.437500 0.000000 +vt 0.187500 1.000000 +vt 0.187500 0.312500 +vt 0.250000 0.312500 +vt 0.250000 1.000000 +vt 0.437500 0.312500 +vt 0.250000 0.250000 +vt 0.437500 0.250000 +vt 0.437500 1.000000 +vt 0.500000 0.312500 +vt 0.500000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.312500 +vn 1.000000 0.000000 0.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 pedals_Cube.002_None_homedecor_tile_brass2.png +s off +f 10/13/3 11/14/3 29/15/3 28/16/3 +f 32/17/4 10/15/4 28/18/4 26/19/4 +f 31/20/5 32/17/5 26/21/5 23/22/5 +f 23/23/6 26/24/6 28/14/6 29/13/6 +f 12/16/7 13/15/7 14/17/7 15/20/7 +f 27/14/6 25/13/6 17/23/6 16/24/6 +f 11/17/7 10/20/7 32/16/7 31/15/7 +f 21/16/7 22/15/7 33/17/7 24/20/7 +f 20/23/6 19/24/6 18/14/6 30/13/6 +f 15/20/5 14/17/5 25/21/5 27/22/5 +f 24/20/5 33/17/5 19/21/5 20/22/5 +f 33/17/4 22/15/4 18/18/4 19/19/4 +f 22/13/3 21/14/3 30/15/3 18/16/3 +f 14/18/4 13/19/4 17/17/4 25/15/4 +f 13/13/3 12/14/3 16/15/3 17/16/3 +o body_Cube.001 +v -1.500000 -0.500000 0.500000 +v -1.500000 -0.500000 0.187500 +v 0.500000 -0.500000 0.187500 +v 0.500000 -0.500000 0.500000 +v -1.500000 0.500000 0.500000 +v -1.500000 0.500000 0.187500 +v 0.500000 0.500000 0.187500 +v 0.500000 0.500000 0.500000 +v -1.437500 0.062500 0.187500 +v -1.437500 0.062500 -0.062500 +v 0.437500 0.062500 -0.062500 +v 0.437500 0.062500 0.187500 +v -1.437500 0.187500 0.187500 +v 0.437500 0.187500 0.187500 +v 0.437500 -0.500000 0.187500 +v 0.437500 -0.500000 -0.125000 +v 0.500000 -0.500000 -0.125000 +v 0.437500 -0.375000 0.187500 +v 0.437500 -0.375000 -0.125000 +v 0.500000 -0.375000 -0.125000 +v 0.500000 -0.375000 0.187500 +v 0.437500 0.062500 -0.125000 +v 0.500000 0.062500 -0.125000 +v 0.500000 0.062500 0.187500 +v 0.437500 0.250000 0.187500 +v 0.437500 0.250000 -0.125000 +v 0.500000 0.250000 -0.125000 +v 0.500000 0.250000 0.187500 +v 0.437500 -0.375000 0.000000 +v 0.437500 -0.375000 -0.062500 +v 0.500000 -0.375000 -0.062500 +v 0.500000 -0.375000 0.000000 +v 0.437500 0.062500 0.000000 +v 0.500000 0.062500 -0.062500 +v 0.500000 0.062500 0.000000 +v -1.500000 -0.500000 -0.125000 +v -1.437500 -0.500000 -0.125000 +v -1.437500 -0.500000 0.187500 +v -1.500000 -0.375000 0.187500 +v -1.500000 -0.375000 -0.125000 +v -1.437500 -0.375000 -0.125000 +v -1.437500 -0.375000 0.187500 +v -1.500000 0.062500 0.187500 +v -1.500000 0.062500 -0.125000 +v -1.437500 0.062500 -0.125000 +v -1.500000 0.250000 0.187500 +v -1.500000 0.250000 -0.125000 +v -1.437500 0.250000 -0.125000 +v -1.437500 0.250000 0.187500 +v -1.500000 -0.375000 0.000000 +v -1.500000 -0.375000 -0.062500 +v -1.437500 -0.375000 -0.062500 +v -1.437500 -0.375000 0.000000 +v -1.500000 0.062500 0.000000 +v -1.500000 0.062500 -0.062500 +v -1.437500 0.062500 0.000000 +v 0.437500 0.187500 0.156250 +v 0.437500 0.375000 0.156250 +v 0.437500 0.375000 0.187500 +v -1.437500 0.187500 0.156250 +v -1.437500 0.375000 0.187500 +v -1.437500 0.375000 0.156250 +v -1.500000 0.375000 0.187500 +v 0.500000 0.375000 0.187500 +v -0.500000 -0.500000 0.187500 +v -0.500000 -0.500000 0.500000 +v -0.500000 0.375000 0.187500 +v -0.500000 0.500000 0.187500 +v -0.500000 0.062500 -0.062500 +v -0.500000 0.062500 0.187500 +v -0.500000 0.375000 0.156250 +v -0.500000 -0.500000 0.187500 +v -0.500000 -0.375000 0.187500 +v -0.500000 0.062500 0.187500 +v -0.500000 -0.375000 0.187500 +v -0.500000 0.375000 0.187500 +v -0.500000 0.500000 0.500000 +v -0.500000 0.187500 0.156250 +vt 1.000000 1.000000 +vt 0.687500 1.000000 +vt 0.687500 0.000000 +vt 1.000000 0.000000 +vt 0.312500 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.312500 0.000000 +vt 0.000000 0.687500 +vt 0.000000 0.562500 +vt 1.000000 0.562500 +vt 1.000000 0.687500 +vt 1.000000 0.125000 +vt 1.000000 0.437500 +vt 0.000000 0.437500 +vt 0.000000 0.125000 +vt 0.843750 1.000000 +vt 0.781250 1.000000 +vt 0.781250 0.562500 +vt 0.843750 0.562500 +vt 0.718750 1.000000 +vt 0.718750 0.562500 +vt 0.250000 0.687500 +vt 0.187500 0.687500 +vt 0.187500 0.562500 +vt 0.250000 0.562500 +vt 1.000000 0.531250 +vt 0.062500 0.531250 +vt 0.062500 0.343750 +vt 1.000000 0.343750 +vt 0.687500 0.562500 +vt 0.375000 0.562500 +vt 0.375000 0.437500 +vt 0.687500 0.437500 +vt 0.187500 1.000000 +vt 0.250000 1.000000 +vt 0.062500 0.687500 +vt 0.000000 0.500000 +vt 0.062500 0.500000 +vt 0.375000 1.000000 +vt 0.375000 0.812500 +vt 0.687500 0.812500 +vt 0.062500 1.000000 +vt 0.343750 0.687500 +vt 0.281250 0.687500 +vt 0.281250 0.562500 +vt 0.343750 0.562500 +vt 0.687500 0.406250 +vt 0.375000 0.406250 +vt 0.375000 0.281250 +vt 0.687500 0.281250 +vt 0.281250 1.000000 +vt 0.343750 1.000000 +vt 0.687500 0.781250 +vt 0.375000 0.781250 +vt 0.375000 0.593750 +vt 0.687500 0.593750 +vt 0.156250 0.687500 +vt 0.093750 0.687500 +vt 0.093750 0.500000 +vt 0.156250 0.500000 +vt 0.906250 0.562500 +vt 0.906250 1.000000 +vt 0.093750 1.000000 +vt 0.156250 1.000000 +vt 0.250000 0.250000 +vt 0.187500 0.250000 +vt 0.968750 1.000000 +vt 0.968750 0.562500 +vt 0.000000 0.531250 +vt 0.937500 0.531250 +vt 0.937500 0.562500 +vt 0.062500 0.187500 +vt 0.000000 0.187500 +vt 0.343750 0.250000 +vt 0.281250 0.250000 +vt 0.156250 0.187500 +vt 0.093750 0.187500 +vt 0.750000 0.531250 +vt 0.718750 0.531250 +vt 0.718750 0.406250 +vt 0.750000 0.406250 +vt 0.812500 0.531250 +vt 0.781250 0.531250 +vt 0.781250 0.406250 +vt 0.812500 0.406250 +vt 1.000000 0.093750 +vt 0.062500 0.093750 +vt 0.796875 0.375000 +vt 0.796875 0.250000 +vt 0.859375 0.250000 +vt 0.859375 0.375000 +vt 0.718750 0.375000 +vt 0.718750 0.250000 +vt 0.781250 0.250000 +vt 0.781250 0.375000 +vt 0.937500 0.437500 +vt 0.062500 0.437500 +vt 0.062500 0.562500 +vt 0.937500 0.093750 +vt 0.937500 0.343750 +vt 0.000000 0.343750 +vt 0.000000 0.093750 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +g body_Cube.001_None_homedecor_piano_wood.png +s off +f 38/25/8 39/26/8 35/27/8 34/28/8 +f 40/29/9 41/30/9 37/31/9 36/32/9 +f 101/33/10 109/34/10 96/35/10 39/36/10 +f 99/37/11 98/38/11 36/39/11 37/40/11 +f 68/41/12 66/42/12 62/43/12 65/44/12 +f 67/42/9 68/45/9 65/46/9 64/43/9 +f 52/47/10 53/48/10 50/49/10 49/50/10 +f 104/51/10 91/52/10 90/53/10 111/54/10 +f 51/55/8 52/56/8 49/57/8 48/58/8 +f 54/59/13 53/48/13 52/47/13 51/60/13 +f 59/61/10 60/33/10 56/62/10 55/63/10 +f 60/26/9 61/64/9 57/65/9 56/66/9 +f 61/30/13 60/33/13 59/61/13 58/67/13 +f 89/43/12 87/44/12 83/41/12 86/42/12 +f 73/68/10 74/69/10 70/70/10 69/71/10 +f 74/72/9 75/73/9 71/74/9 70/75/9 +f 75/76/13 74/69/13 73/68/13 72/77/13 +f 79/78/8 80/79/8 77/80/8 76/81/8 +f 80/82/10 81/83/10 78/84/10 77/85/10 +f 87/44/8 88/86/8 84/87/8 83/41/8 +f 82/88/13 81/83/13 80/82/13 79/89/13 +f 48/90/11 49/50/11 50/49/11 36/91/11 +f 44/92/10 67/87/10 64/86/10 63/93/10 +f 104/94/13 95/95/13 94/96/13 100/34/13 +f 58/78/8 59/79/8 55/80/8 45/81/8 +f 53/72/9 54/73/9 36/74/9 50/75/9 +f 66/87/8 44/41/8 63/44/8 62/86/8 +f 45/97/11 55/63/11 56/62/11 57/98/11 +f 43/46/9 89/43/9 86/42/9 85/45/9 +f 72/55/8 73/56/8 69/57/8 35/58/8 +f 88/86/10 43/93/10 85/92/10 84/87/10 +f 35/99/11 69/71/11 70/70/11 71/100/11 +f 81/26/9 82/64/9 42/65/9 78/66/9 +f 76/101/11 77/85/11 78/84/11 42/102/11 +f 91/103/9 92/104/9 47/105/9 90/106/9 +f 94/107/8 95/108/8 93/109/8 46/110/8 +f 110/30/13 101/33/13 39/36/13 38/25/13 +f 103/111/11 102/54/11 44/53/11 45/112/11 +f 94/113/10 82/114/10 79/115/10 96/116/10 +f 97/117/10 61/118/10 58/119/10 92/120/10 +f 107/34/10 57/35/10 54/25/10 108/30/10 +f 105/39/10 71/121/10 75/96/10 106/34/10 +f 110/31/12 38/28/12 34/25/12 99/30/12 +f 41/31/12 110/28/12 99/25/12 37/30/12 +f 48/122/10 105/38/10 106/35/10 51/123/10 +f 76/34/10 107/35/10 108/25/10 72/30/10 +f 42/124/11 43/125/11 102/126/11 103/127/11 +f 41/30/13 40/33/13 101/36/13 110/25/13 +f 91/52/13 104/51/13 100/35/13 92/123/13 +f 95/95/10 104/94/10 111/126/10 93/125/10 +f 34/37/11 35/38/11 98/39/11 99/40/11 +f 40/33/10 97/34/10 109/35/10 101/36/10 diff --git a/homedecor/textures/homedecor_piano_front_left.png b/homedecor/textures/homedecor_piano_front_left.png deleted file mode 100644 index 9b0fb7f..0000000 Binary files a/homedecor/textures/homedecor_piano_front_left.png and /dev/null differ diff --git a/homedecor/textures/homedecor_piano_front_right.png b/homedecor/textures/homedecor_piano_front_right.png deleted file mode 100644 index 8e8b30a..0000000 Binary files a/homedecor/textures/homedecor_piano_front_right.png and /dev/null differ diff --git a/homedecor/textures/homedecor_piano_inv.png b/homedecor/textures/homedecor_piano_inv.png index 8146d02..c508b0f 100644 Binary files a/homedecor/textures/homedecor_piano_inv.png and b/homedecor/textures/homedecor_piano_inv.png differ diff --git a/homedecor/textures/homedecor_piano_keys.png b/homedecor/textures/homedecor_piano_keys.png new file mode 100644 index 0000000..8e6b761 Binary files /dev/null and b/homedecor/textures/homedecor_piano_keys.png differ diff --git a/homedecor/textures/homedecor_piano_sides.png b/homedecor/textures/homedecor_piano_sides.png deleted file mode 100644 index a81915e..0000000 Binary files a/homedecor/textures/homedecor_piano_sides.png and /dev/null differ diff --git a/homedecor/textures/homedecor_piano_top_left.png b/homedecor/textures/homedecor_piano_top_left.png deleted file mode 100644 index a00bc58..0000000 Binary files a/homedecor/textures/homedecor_piano_top_left.png and /dev/null differ diff --git a/homedecor/textures/homedecor_piano_top_right.png b/homedecor/textures/homedecor_piano_top_right.png deleted file mode 100644 index 440a459..0000000 Binary files a/homedecor/textures/homedecor_piano_top_right.png and /dev/null differ diff --git a/homedecor/textures/homedecor_piano_wood.png b/homedecor/textures/homedecor_piano_wood.png new file mode 100644 index 0000000..8a8cf90 Binary files /dev/null and b/homedecor/textures/homedecor_piano_wood.png differ