diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 0a4ed372..e2b789e2 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -498,36 +498,20 @@ homedecor.register("pool_table_2", { selection_box = homedecor.nodebox.null, }) +local trash_cbox = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0.125, 0.25 } +} + homedecor.register("trash_can", { - tiles = { - "homedecor_trashcan_tb.png", - "homedecor_trashcan_tb.png", - "homedecor_trashcan_sides.png", - "homedecor_trashcan_sides.png", - "homedecor_trashcan_sides.png", - "homedecor_trashcan_sides.png" - }, - inventory_image = "homedecor_trashcan_inv.png", + drawtype = "mesh", + mesh = "homedecor_trash_can.obj", + tiles = { "homedecor_trash_can.png" }, + inventory_image = "homedecor_trash_can_inv.png", description = "Trash Can", groups = {snappy=3}, - node_box = { - type = "fixed", - fixed = { - {-0.25, -0.5, -0.125, -0.1875, 0.125, 0.125}, -- NodeBox1 - {0.1875, -0.5, -0.125, 0.25, 0.125, 0.125}, -- NodeBox2 - {-0.125, -0.5, -0.25, 0.125, 0.125, -0.1875}, -- NodeBox3 - {-0.125, -0.5, 0.1875, 0.125, 0.125, 0.25}, -- NodeBox4 - {-0.1875, -0.5, 0.125, -0.125, 0.125, 0.1875}, -- NodeBox5 - {-0.1875, -0.5, -0.1875, -0.125, 0.125, -0.125}, -- NodeBox6 - {0.125, -0.5, -0.1875, 0.1875, 0.125, -0.125}, -- NodeBox7 - {0.125, -0.5, 0.125, 0.1875, 0.125, 0.1875}, -- NodeBox8 - {-0.1875, -0.5, -0.1875, 0.1875, -0.4375, 0.1875}, -- NodeBox9 - } - }, - selection_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0.125, 0.25 } - } + selection_box = trash_cbox, + collision_box = trash_cbox, }) homedecor.register("well_base", { diff --git a/homedecor/models/homedecor_trash_can.obj b/homedecor/models/homedecor_trash_can.obj new file mode 100644 index 00000000..9b461f90 --- /dev/null +++ b/homedecor/models/homedecor_trash_can.obj @@ -0,0 +1,316 @@ +# Blender v2.73 (sub 0) OBJ File: 'trash_can.blend' +# www.blender.org +o Circle +v -0.000000 -0.500000 -0.177250 +v -0.067831 -0.500000 -0.163757 +v -0.125334 -0.500000 -0.125334 +v -0.163757 -0.500000 -0.067831 +v -0.177250 -0.500000 -0.000000 +v -0.163757 -0.500000 0.067830 +v -0.125334 -0.500000 0.125334 +v -0.067830 -0.500000 0.163757 +v -0.000000 -0.500000 0.177249 +v 0.067830 -0.500000 0.163757 +v 0.125334 -0.500000 0.125334 +v 0.163757 -0.500000 0.067830 +v 0.177249 -0.500000 -0.000000 +v 0.163757 -0.500000 -0.067831 +v 0.125334 -0.500000 -0.125335 +v 0.067830 -0.500000 -0.163757 +v -0.000000 -0.000000 -0.250000 +v -0.095671 -0.000000 -0.230970 +v -0.176777 -0.000000 -0.176777 +v -0.230970 -0.000000 -0.095671 +v -0.250000 -0.000000 -0.000000 +v -0.230970 -0.000000 0.095671 +v -0.176777 -0.000000 0.176777 +v -0.095671 -0.000000 0.230970 +v 0.000000 -0.000000 0.250000 +v 0.095671 -0.000000 0.230970 +v 0.176777 -0.000000 0.176777 +v 0.230970 -0.000000 0.095671 +v 0.250000 -0.000000 -0.000000 +v 0.230970 -0.000000 -0.095671 +v 0.176776 -0.000000 -0.176777 +v 0.095671 -0.000000 -0.230970 +v -0.000000 -0.000000 -0.229034 +v -0.087647 -0.000000 -0.211600 +v -0.161951 -0.000000 -0.161951 +v -0.211600 -0.000000 -0.087648 +v -0.229034 -0.000000 -0.000000 +v -0.211600 -0.000000 0.087647 +v -0.161951 -0.000000 0.161951 +v -0.087647 -0.000000 0.211600 +v 0.000000 -0.000000 0.229034 +v 0.087648 -0.000000 0.211600 +v 0.161951 -0.000000 0.161951 +v 0.211600 -0.000000 0.087647 +v 0.229034 -0.000000 -0.000000 +v 0.211600 -0.000000 -0.087648 +v 0.161951 -0.000000 -0.161952 +v 0.087647 -0.000000 -0.211600 +v 0.069570 -0.468750 -0.167958 +v -0.181796 -0.468750 -0.000000 +v 0.128549 -0.468750 -0.128550 +v -0.167958 -0.468750 -0.069571 +v 0.167958 -0.468750 -0.069571 +v -0.128550 -0.468750 -0.128550 +v 0.181796 -0.468750 -0.000000 +v -0.069571 -0.468750 -0.167958 +v 0.167958 -0.468750 0.069570 +v -0.000000 -0.468750 -0.181797 +v -0.128468 -0.469123 0.128468 +v -0.167852 -0.469123 0.069526 +v 0.069526 -0.469123 -0.167852 +v -0.181682 -0.469123 -0.000000 +v 0.128468 -0.469123 -0.128469 +v -0.167852 -0.469123 -0.069527 +v 0.167852 -0.469123 -0.069527 +v -0.128468 -0.469123 -0.128468 +v 0.181682 -0.469123 -0.000000 +v -0.069527 -0.469123 -0.167852 +v 0.128549 -0.468750 0.128549 +v 0.069571 -0.468750 0.167958 +v 0.000000 -0.468750 0.181796 +v -0.069570 -0.468750 0.167958 +v -0.128550 -0.468750 0.128549 +v -0.167958 -0.468750 0.069570 +v 0.167852 -0.469123 0.069526 +v -0.000000 -0.469123 -0.181682 +v 0.128468 -0.469123 0.128468 +v 0.069527 -0.469123 0.167852 +v 0.000000 -0.469123 0.181681 +v -0.069527 -0.469123 0.167852 +v 0.226953 -0.029320 0.094007 +v -0.000000 -0.029320 -0.245652 +v 0.173702 -0.029320 0.173702 +v 0.094007 -0.029320 0.226953 +v 0.000000 -0.029320 0.245652 +v -0.094007 -0.029320 0.226953 +v -0.173702 -0.029320 0.173702 +v -0.226953 -0.029320 0.094007 +v 0.094007 -0.029320 -0.226953 +v -0.245652 -0.029320 -0.000000 +v 0.173702 -0.029320 -0.173703 +v -0.226953 -0.029320 -0.094007 +v 0.226953 -0.029320 -0.094007 +v -0.173702 -0.029320 -0.173702 +v 0.245652 -0.029320 -0.000000 +v -0.094007 -0.029320 -0.226953 +vt 0.875000 0.604167 +vt 0.812500 0.604167 +vt 0.812500 0.625000 +vt 0.875000 0.625000 +vt 0.250000 0.604167 +vt 0.187500 0.604167 +vt 0.187500 0.625000 +vt 0.250000 0.625000 +vt 0.625000 0.604167 +vt 0.562500 0.604167 +vt 0.562500 0.625000 +vt 0.625000 0.625000 +vt 0.937500 0.604167 +vt 0.937500 0.625000 +vt 0.312500 0.604167 +vt 0.312500 0.625000 +vt 0.687500 0.604167 +vt 0.687500 0.625000 +vt 1.000000 0.604167 +vt 1.000000 0.625000 +vt 0.375000 0.604167 +vt 0.375000 0.625000 +vt 0.750000 0.604167 +vt 0.750000 0.625000 +vt 0.437500 0.604167 +vt 0.437500 0.625000 +vt 0.062500 0.604167 +vt -0.000000 0.604167 +vt -0.000000 0.625000 +vt 0.062500 0.625000 +vt 0.500000 0.604167 +vt 0.500000 0.625000 +vt 0.125000 0.604167 +vt 0.125000 0.625000 +vt 0.562500 0.312500 +vt 0.500000 0.312500 +vt 0.562467 0.653596 +vt 0.623276 0.665691 +vt 0.674827 0.700137 +vt 0.709272 0.751688 +vt 0.721368 0.812497 +vt 0.709272 0.873305 +vt 0.674827 0.924857 +vt 0.623276 0.959302 +vt 0.562467 0.971397 +vt 0.501659 0.959302 +vt 0.450107 0.924857 +vt 0.415662 0.873305 +vt 0.403567 0.812497 +vt 0.415662 0.751688 +vt 0.450107 0.700137 +vt 0.501659 0.665692 +vt 0.187500 0.312500 +vt 0.125000 0.312500 +vt 0.875000 0.312500 +vt 0.812500 0.312500 +vt 0.437500 0.312500 +vt 0.062500 0.312500 +vt 0.750000 0.312500 +vt 0.375000 0.312500 +vt 0.687500 0.312500 +vt -0.000000 0.312500 +vt 0.312500 0.312500 +vt 0.625000 0.312500 +vt 1.000000 0.312500 +vt 0.937500 0.312500 +vt 0.250000 0.312500 +vt 0.562500 0.291667 +vt 0.500000 0.291667 +vt 0.250000 0.291667 +vt 0.187500 0.291667 +vt 1.000000 0.291667 +vt 0.937500 0.291667 +vt 0.625000 0.291667 +vt 0.312500 0.291667 +vt 0.062500 0.291667 +vt -0.000000 0.291667 +vt 0.687500 0.291667 +vt 0.375000 0.291667 +vt 0.750000 0.291667 +vt 0.125000 0.291667 +vt 0.437500 0.291667 +vt 0.812500 0.291667 +vt 0.875000 0.291667 +vt 0.187470 0.975468 +vt 0.125102 0.963062 +vt 0.072228 0.927733 +vt 0.036899 0.874860 +vt 0.024493 0.812491 +vt 0.036899 0.750122 +vt 0.072228 0.697249 +vt 0.125102 0.661920 +vt 0.187470 0.649514 +vt 0.249839 0.661920 +vt 0.302712 0.697249 +vt 0.338041 0.750123 +vt 0.350447 0.812491 +vt 0.338041 0.874860 +vt 0.302712 0.927733 +vt 0.249838 0.963062 +vt 0.437500 -0.000000 +vt 0.500000 -0.000000 +vt 0.500000 0.270833 +vt 0.437500 0.270833 +vt 0.812500 -0.000000 +vt 0.875000 -0.000000 +vt 0.875000 0.270833 +vt 0.812500 0.270833 +vt 0.937500 -0.000000 +vt 0.937500 0.270833 +vt 0.562500 -0.000000 +vt 0.562500 0.270833 +vt 0.187500 -0.000000 +vt 0.250000 -0.000000 +vt 0.250000 0.270833 +vt 0.187500 0.270833 +vt 1.000000 -0.000000 +vt 1.000000 0.270833 +vt 0.625000 -0.000000 +vt 0.625000 0.270833 +vt 0.312500 -0.000000 +vt 0.312500 0.270833 +vt -0.000000 -0.000000 +vt 0.062500 -0.000000 +vt 0.062500 0.270833 +vt -0.000000 0.270833 +vt 0.687500 -0.000000 +vt 0.687500 0.270833 +vt 0.375000 -0.000000 +vt 0.375000 0.270833 +vt 0.750000 -0.000000 +vt 0.750000 0.270833 +vt 0.125000 -0.000000 +vt 0.125000 0.270833 +s 1 +f 27/1 28/2 44/3 43/4 +f 21/5 22/6 38/7 37/8 +f 31/9 32/10 48/11 47/12 +f 26/13 27/1 43/4 42/14 +f 20/15 21/5 37/8 36/16 +f 30/17 31/9 47/12 46/18 +f 25/19 26/13 42/14 41/20 +f 19/21 20/15 36/16 35/22 +f 29/23 30/17 46/18 45/24 +f 18/25 19/21 35/22 34/26 +f 24/27 25/28 41/29 40/30 +f 28/2 29/23 45/24 44/3 +f 17/31 18/25 34/26 33/32 +f 23/33 24/27 40/30 39/34 +f 22/6 23/33 39/34 38/7 +f 32/10 49/35 58/36 17/31 +f 1/37 16/38 15/39 14/40 13/41 12/42 11/43 10/44 9/45 8/46 7/47 6/48 5/49 4/50 3/51 2/52 +f 23/33 22/6 74/53 73/54 +f 27/1 69/55 57/56 28/2 +f 17/31 58/36 56/57 18/25 +f 24/27 23/33 73/54 72/58 +f 28/2 57/56 55/59 29/23 +f 18/25 56/57 54/60 19/21 +f 29/23 55/59 53/61 30/17 +f 25/28 24/27 72/58 71/62 +f 19/21 54/60 52/63 20/15 +f 30/17 53/61 51/64 31/9 +f 26/13 25/19 71/65 70/66 +f 20/15 52/63 50/67 21/5 +f 31/9 51/64 49/35 32/10 +f 21/5 50/67 74/53 22/6 +f 16/68 1/69 58/36 49/35 +f 5/70 6/71 74/53 50/67 +f 9/72 10/73 70/66 71/65 +f 15/74 16/68 49/35 51/64 +f 4/75 5/70 50/67 52/63 +f 8/76 9/77 71/62 72/58 +f 14/78 15/74 51/64 53/61 +f 3/79 4/75 52/63 54/60 +f 13/80 14/78 53/61 55/59 +f 7/81 8/76 72/58 73/54 +f 2/82 3/79 54/60 56/57 +f 12/83 13/80 55/59 57/56 +f 6/71 7/81 73/54 74/53 +f 1/69 2/82 56/57 58/36 +f 11/84 12/83 57/56 69/55 +f 32/10 17/31 33/32 48/11 +f 27/1 26/13 70/66 69/55 +f 10/73 11/84 69/55 70/66 +f 58/85 56/86 54/87 52/88 50/89 74/90 73/91 72/92 71/93 70/94 69/95 57/96 55/97 53/98 51/99 49/100 +f 68/101 76/102 82/103 96/104 +f 75/105 77/106 83/107 81/108 +f 77/106 78/109 84/110 83/107 +f 76/102 61/111 89/112 82/103 +f 60/113 62/114 90/115 88/116 +f 78/109 79/117 85/118 84/110 +f 61/111 63/119 91/120 89/112 +f 62/114 64/121 92/122 90/115 +f 79/123 80/124 86/125 85/126 +f 63/119 65/127 93/128 91/120 +f 64/121 66/129 94/130 92/122 +f 65/127 67/131 95/132 93/128 +f 80/124 59/133 87/134 86/125 +f 66/129 68/101 96/104 94/130 +f 59/133 60/113 88/116 87/134 +f 67/131 75/105 81/108 95/132 +f 44/83 45/80 95/132 81/108 +f 38/71 39/81 87/134 88/116 +f 34/82 35/79 94/130 96/104 +f 39/81 40/76 86/125 87/134 +f 45/80 46/78 93/128 95/132 +f 35/79 36/75 92/122 94/130 +f 46/78 47/74 91/120 93/128 +f 40/76 41/77 85/126 86/125 +f 36/75 37/70 90/115 92/122 +f 47/74 48/68 89/112 91/120 +f 41/72 42/73 84/110 85/118 +f 37/70 38/71 88/116 90/115 +f 48/68 33/69 82/103 89/112 +f 42/73 43/84 83/107 84/110 +f 43/84 44/83 81/108 83/107 +f 33/69 34/82 96/104 82/103 diff --git a/homedecor/textures/homedecor_trash_can.png b/homedecor/textures/homedecor_trash_can.png new file mode 100644 index 00000000..176401e8 Binary files /dev/null and b/homedecor/textures/homedecor_trash_can.png differ diff --git a/homedecor/textures/homedecor_trash_can_inv.png b/homedecor/textures/homedecor_trash_can_inv.png new file mode 100644 index 00000000..7203765b Binary files /dev/null and b/homedecor/textures/homedecor_trash_can_inv.png differ diff --git a/homedecor/textures/homedecor_trashcan_inv.png b/homedecor/textures/homedecor_trashcan_inv.png deleted file mode 100644 index cb8e70bb..00000000 Binary files a/homedecor/textures/homedecor_trashcan_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_trashcan_sides.png b/homedecor/textures/homedecor_trashcan_sides.png deleted file mode 100644 index f96d9fe1..00000000 Binary files a/homedecor/textures/homedecor_trashcan_sides.png and /dev/null differ diff --git a/homedecor/textures/homedecor_trashcan_tb.png b/homedecor/textures/homedecor_trashcan_tb.png deleted file mode 100644 index 3a531632..00000000 Binary files a/homedecor/textures/homedecor_trashcan_tb.png and /dev/null differ