diff --git a/homedecor/bathroom_sanitation.lua b/homedecor/bathroom_sanitation.lua index d0b287c8..a51b7144 100644 --- a/homedecor/bathroom_sanitation.lua +++ b/homedecor/bathroom_sanitation.lua @@ -166,6 +166,7 @@ homedecor.register("shower_tray", { }) --Shower Head + local sh_cbox = { type = "fixed", fixed = { -0.2, -0.4, -0.05, 0.2, 0.1, 0.5 } @@ -174,7 +175,10 @@ local sh_cbox = { homedecor.register("shower_head", { drawtype = "mesh", mesh = "homedecor_shower_head.obj", - tiles = { "homedecor_shower_head.png" }, + tiles = { + "homedecor_generic_metal_neutral.png", + "homedecor_shower_head.png" + }, inventory_image = "homedecor_shower_head_inv.png", description = "Shower Head", groups = {snappy=3}, diff --git a/homedecor/models/homedecor_shower_head.obj b/homedecor/models/homedecor_shower_head.obj index c3e70d16..9e4aa568 100644 --- a/homedecor/models/homedecor_shower_head.obj +++ b/homedecor/models/homedecor_shower_head.obj @@ -86,135 +86,135 @@ v -0.182428 -0.359391 0.139864 v -0.092353 -0.335552 -0.014318 v -0.158293 -0.373155 0.228881 v -0.002279 -0.359391 0.139864 -vt 0.500000 0.812500 -vt 0.500000 0.968750 -vt 0.421875 0.968750 -vt 0.421875 0.812500 -vt 0.328125 0.968750 -vt 0.328125 0.812500 -vt 0.250000 0.968750 -vt 0.250000 0.812500 -vt 0.171875 0.968750 -vt 0.171875 0.812500 -vt 0.078125 0.968750 -vt 0.078125 0.812500 -vt 0.000000 0.968750 -vt 0.000000 0.812500 -vt 1.000000 0.812500 -vt 1.000000 0.968750 -vt 0.921875 0.968750 -vt 0.921875 0.812500 -vt 0.828125 0.968750 -vt 0.828125 0.812500 -vt 0.750000 0.968750 -vt 0.750000 0.812500 -vt 0.671875 0.968750 -vt 0.671875 0.812500 -vt 0.578125 0.968750 -vt 0.578125 0.812500 -vt 0.750000 0.031250 -vt 0.750000 0.140625 -vt 0.718750 0.140625 -vt 0.718750 0.031250 -vt 0.687500 0.140625 -vt 0.687500 0.031250 -vt 0.656250 0.140625 -vt 0.656250 0.031250 -vt 0.625000 0.140625 -vt 0.625000 0.031250 -vt 0.593750 0.140625 -vt 0.593750 0.031250 -vt 0.562500 0.140625 -vt 0.562500 0.031250 -vt 0.937500 0.031250 -vt 0.937500 0.140625 -vt 0.906250 0.140625 -vt 0.906250 0.031250 -vt 0.875000 0.140625 -vt 0.875000 0.031250 -vt 0.843750 0.140625 -vt 0.843750 0.031250 -vt 0.812500 0.140625 -vt 0.812500 0.031250 -vt 0.781250 0.140625 -vt 0.781250 0.031250 +vt 1.000000 0.500000 +vt 0.750000 0.500000 +vt 0.750000 0.437500 +vt 1.000000 0.437500 +vt 0.750000 0.375000 +vt 1.000000 0.375000 +vt 0.750000 0.312500 +vt 1.000000 0.312500 vt 0.750000 0.250000 -vt 0.718750 0.250000 -vt 0.687500 0.250000 -vt 0.656250 0.250000 -vt 0.625000 0.250000 -vt 0.593750 0.250000 +vt 1.000000 0.250000 +vt 0.750000 0.187500 +vt 1.000000 0.187500 +vt 0.750000 0.125000 +vt 1.000000 0.125000 +vt 1.000000 0.875000 +vt 0.750000 0.875000 +vt 0.750000 0.812500 +vt 1.000000 0.812500 +vt 0.750000 0.750000 +vt 1.000000 0.750000 +vt 0.750000 0.687500 +vt 1.000000 0.687500 +vt 0.750000 0.625000 +vt 1.000000 0.625000 +vt 0.750000 0.562500 +vt 1.000000 0.562500 +vt 0.562500 0.500000 +vt 0.562500 0.437500 +vt 0.562500 0.375000 +vt 0.562500 0.312500 vt 0.562500 0.250000 +vt 0.562500 0.187500 +vt 0.562500 0.125000 +vt 0.562500 0.875000 +vt 0.562500 0.812500 +vt 0.562500 0.750000 +vt 0.562500 0.687500 +vt 0.562500 0.625000 +vt 0.562500 0.562500 +vt 0.375000 0.500000 +vt 0.375000 0.437500 +vt 0.375000 0.375000 +vt 0.375000 0.312500 +vt 0.375000 0.250000 +vt 0.375000 0.187500 +vt 0.375000 0.125000 +vt 0.375000 0.875000 +vt 0.375000 0.812500 +vt 0.375000 0.750000 +vt 0.375000 0.687500 +vt 0.375000 0.625000 +vt 0.375000 0.562500 +vt 0.187500 0.500000 +vt 0.187500 0.437500 +vt 0.187500 0.375000 +vt 0.187500 0.312500 +vt 0.187500 0.250000 +vt 0.187500 0.187500 +vt 0.187500 0.125000 +vt 0.187500 0.875000 +vt 0.187500 0.812500 +vt 0.187500 0.750000 +vt 0.187500 0.687500 +vt 0.187500 0.625000 +vt 0.187500 0.562500 +vt 0.000000 0.500000 +vt 0.000000 0.437500 +vt 0.000000 0.375000 +vt 0.000000 0.312500 +vt 0.000000 0.250000 +vt 0.000000 0.187500 +vt 0.000000 0.125000 +vt 0.000000 0.875000 +vt 0.000000 0.812500 +vt 0.000000 0.750000 +vt 0.000000 0.687500 +vt 0.000000 0.625000 +vt 0.000000 0.562500 +vt 0.937500 0.312500 vt 0.937500 0.250000 -vt 0.906250 0.250000 -vt 0.875000 0.250000 -vt 0.843750 0.250000 vt 0.812500 0.250000 -vt 0.781250 0.250000 -vt 0.750000 0.359375 -vt 0.718750 0.359375 -vt 0.687500 0.359375 -vt 0.656250 0.359375 -vt 0.625000 0.359375 -vt 0.593750 0.359375 -vt 0.562500 0.359375 -vt 0.937500 0.359375 -vt 0.906250 0.359375 -vt 0.875000 0.359375 -vt 0.843750 0.359375 -vt 0.812500 0.359375 -vt 0.781250 0.359375 -vt 0.750000 0.468750 -vt 0.718750 0.468750 -vt 0.687500 0.468750 -vt 0.656250 0.468750 -vt 0.625000 0.468750 -vt 0.593750 0.468750 -vt 0.562500 0.468750 -vt 0.937500 0.468750 -vt 0.906250 0.468750 -vt 0.875000 0.468750 -vt 0.843750 0.468750 -vt 0.812500 0.468750 -vt 0.781250 0.468750 -vt 0.171875 0.765625 -vt 0.250000 0.765625 -vt 0.000000 0.765625 -vt 0.078125 0.765625 -vt 0.421875 0.765625 -vt 0.500000 0.765625 -vt 0.328125 0.765625 -vt 0.921875 0.765625 -vt 1.000000 0.765625 -vt 0.671875 0.765625 -vt 0.750000 0.765625 -vt 0.578125 0.765625 -vt 0.828125 0.765625 -vt 0.289605 0.468767 -vt 0.176278 0.438681 -vt 0.289063 0.242188 -vt 0.093171 0.355946 -vt 0.062552 0.242731 -vt 0.515574 0.241645 -vt 0.485498 0.355006 -vt 0.401847 0.045692 -vt 0.484955 0.128427 -vt 0.402787 0.438138 -vt 0.092627 0.129370 -vt 0.288518 0.015608 -vt 0.175338 0.046239 -vt 0.883933 0.636001 -vt 0.917481 0.627012 -vt 0.942039 0.602453 -vt 0.951028 0.568906 -vt 0.942039 0.535358 -vt 0.917481 0.510800 -vt 0.883933 0.501811 -vt 0.850386 0.510800 -vt 0.825828 0.535358 -vt 0.816839 0.568906 -vt 0.825828 0.602453 -vt 0.850386 0.627012 +vt 0.812500 0.312500 +vt 0.937500 0.187500 +vt 0.937500 0.125000 +vt 0.812500 0.125000 +vt 0.812500 0.187500 +vt 0.937500 0.500000 +vt 0.937500 0.437500 +vt 0.812500 0.437500 +vt 0.812500 0.500000 +vt 0.937500 0.375000 +vt 0.812500 0.375000 +vt 0.937500 0.875000 +vt 0.937500 0.812500 +vt 0.812500 0.812500 +vt 0.812500 0.875000 +vt 0.937500 0.687500 +vt 0.937500 0.625000 +vt 0.812500 0.625000 +vt 0.812500 0.687500 +vt 0.937500 0.562500 +vt 0.812500 0.562500 +vt 0.937500 0.750000 +vt 0.812500 0.750000 +vt 0.812500 0.624165 +vt 0.874583 0.607530 +vt 0.920030 0.562083 +vt 0.936665 0.500000 +vt 0.920030 0.437917 +vt 0.874583 0.392470 +vt 0.812500 0.375835 +vt 0.750417 0.392470 +vt 0.704970 0.437917 +vt 0.688335 0.500000 +vt 0.704970 0.562082 +vt 0.750417 0.607530 +vt 0.156336 0.843664 +vt 0.036267 0.635697 +vt 0.484375 0.515625 +vt 0.036266 0.395554 +vt 0.156337 0.187587 +vt 0.812414 0.843664 +vt 0.604445 0.963733 +vt 0.932484 0.395554 +vt 0.932484 0.635694 +vt 0.364304 0.963734 +vt 0.364305 0.067515 +vt 0.812412 0.187587 +vt 0.604446 0.067517 vn 0.000000 0.557000 -0.830500 vn 0.000000 0.711000 -0.703200 vn 0.414900 0.679400 -0.605100 @@ -300,6 +300,7 @@ vn -0.757200 -0.645000 -0.103200 vn -0.380900 -0.535400 -0.753800 vn -0.653400 -0.707700 0.268800 vn 0.000000 -0.988300 -0.152800 +g Cylinder_Cylinder_main s 1 f 1/1/1 2/2/2 3/3/3 4/4/4 f 4/4/4 3/3/3 5/5/5 6/6/6 @@ -313,76 +314,77 @@ f 18/20/18 17/19/17 19/21/19 20/22/20 f 20/22/20 19/21/19 21/23/21 22/24/22 f 22/24/22 21/23/21 23/25/23 24/26/24 f 2/2/2 1/1/1 24/26/24 23/25/23 -f 2/27/2 25/28/25 26/29/26 3/30/3 -f 3/30/3 26/29/26 27/31/27 5/32/5 -f 5/32/5 27/31/27 28/33/28 7/34/7 -f 7/34/7 28/33/28 29/35/29 9/36/9 -f 9/36/9 29/35/29 30/37/30 11/38/11 -f 11/38/11 30/37/30 31/39/31 13/40/13 -f 13/41/13 31/42/31 32/43/32 15/44/15 -f 15/44/15 32/43/32 33/45/33 17/46/17 -f 17/46/17 33/45/33 34/47/34 19/48/19 -f 19/48/19 34/47/34 35/49/35 21/50/21 -f 21/50/21 35/49/35 36/51/36 23/52/23 -f 23/52/23 36/51/36 25/28/25 2/27/2 -f 25/28/25 37/53/37 38/54/38 26/29/26 -f 26/29/26 38/54/38 39/55/39 27/31/27 -f 27/31/27 39/55/39 40/56/40 28/33/28 -f 28/33/28 40/56/40 41/57/41 29/35/29 -f 29/35/29 41/57/41 42/58/42 30/37/30 -f 30/37/30 42/58/42 43/59/43 31/39/31 -f 31/42/31 43/60/43 44/61/44 32/43/32 -f 32/43/32 44/61/44 45/62/45 33/45/33 -f 33/45/33 45/62/45 46/63/46 34/47/34 -f 34/47/34 46/63/46 47/64/47 35/49/35 -f 35/49/35 47/64/47 48/65/48 36/51/36 -f 36/51/36 48/65/48 37/53/37 25/28/25 -f 37/53/37 49/66/49 50/67/50 38/54/38 -f 38/54/38 50/67/50 51/68/51 39/55/39 -f 39/55/39 51/68/51 52/69/52 40/56/40 -f 40/56/40 52/69/52 53/70/53 41/57/41 -f 41/57/41 53/70/53 54/71/54 42/58/42 -f 42/58/42 54/71/54 55/72/55 43/59/43 -f 43/60/43 55/73/55 56/74/56 44/61/44 -f 44/61/44 56/74/56 57/75/57 45/62/45 -f 45/62/45 57/75/57 58/76/58 46/63/46 -f 46/63/46 58/76/58 59/77/59 47/64/47 -f 47/64/47 59/77/59 60/78/60 48/65/48 -f 48/65/48 60/78/60 49/66/49 37/53/37 -f 49/66/49 61/79/61 62/80/62 50/67/50 -f 50/67/50 62/80/62 63/81/63 51/68/51 -f 51/68/51 63/81/63 64/82/64 52/69/52 -f 52/69/52 64/82/64 65/83/65 53/70/53 -f 53/70/53 65/83/65 66/84/66 54/71/54 -f 54/71/54 66/84/66 67/85/67 55/72/55 -f 55/73/55 67/86/67 68/87/68 56/74/56 -f 56/74/56 68/87/68 69/88/69 57/75/57 -f 57/75/57 69/88/69 70/89/70 58/76/58 -f 58/76/58 70/89/70 71/90/71 59/77/59 -f 59/77/59 71/90/71 72/91/72 60/78/60 -f 60/78/60 72/91/72 61/79/61 49/66/49 -f 8/8/8 10/10/10 73/92/73 74/93/74 -f 12/12/12 14/14/14 75/94/75 76/95/76 -f 1/1/1 4/4/4 77/96/77 78/97/78 -f 6/6/6 8/8/8 74/93/74 79/98/79 -f 14/15/14 16/18/16 80/99/80 75/100/75 -f 20/22/20 22/24/22 81/101/81 82/102/82 -f 22/24/22 24/26/24 83/103/83 81/101/81 -f 10/10/10 12/12/12 76/95/76 73/92/73 -f 16/18/16 18/20/18 84/104/84 80/99/80 -f 24/26/24 1/1/1 78/97/78 83/103/83 -f 18/20/18 20/22/20 82/102/82 84/104/84 -f 4/4/4 6/6/6 79/98/79 77/96/77 -f 75/105/75 80/106/80 85/107/85 -f 84/108/84 82/109/82 85/107/85 -f 74/110/74 73/111/73 85/107/85 -f 77/112/77 79/113/79 85/107/85 -f 79/113/79 74/110/74 85/107/85 -f 76/114/76 75/105/75 85/107/85 -f 73/111/73 76/114/76 85/107/85 -f 82/109/82 81/115/81 85/107/85 -f 80/106/80 84/108/84 85/107/85 -f 78/116/78 77/112/77 85/107/85 -f 81/115/81 83/117/83 85/107/85 -f 83/117/83 78/116/78 85/107/85 -f 67/118/67 66/119/66 65/120/65 64/121/64 63/122/63 62/123/62 61/124/61 72/125/72 71/126/71 70/127/70 69/128/69 68/129/68 +f 2/2/2 25/27/25 26/28/26 3/3/3 +f 3/3/3 26/28/26 27/29/27 5/5/5 +f 5/5/5 27/29/27 28/30/28 7/7/7 +f 7/7/7 28/30/28 29/31/29 9/9/9 +f 9/9/9 29/31/29 30/32/30 11/11/11 +f 11/11/11 30/32/30 31/33/31 13/13/13 +f 13/16/13 31/34/31 32/35/32 15/17/15 +f 15/17/15 32/35/32 33/36/33 17/19/17 +f 17/19/17 33/36/33 34/37/34 19/21/19 +f 19/21/19 34/37/34 35/38/35 21/23/21 +f 21/23/21 35/38/35 36/39/36 23/25/23 +f 23/25/23 36/39/36 25/27/25 2/2/2 +f 25/27/25 37/40/37 38/41/38 26/28/26 +f 26/28/26 38/41/38 39/42/39 27/29/27 +f 27/29/27 39/42/39 40/43/40 28/30/28 +f 28/30/28 40/43/40 41/44/41 29/31/29 +f 29/31/29 41/44/41 42/45/42 30/32/30 +f 30/32/30 42/45/42 43/46/43 31/33/31 +f 31/34/31 43/47/43 44/48/44 32/35/32 +f 32/35/32 44/48/44 45/49/45 33/36/33 +f 33/36/33 45/49/45 46/50/46 34/37/34 +f 34/37/34 46/50/46 47/51/47 35/38/35 +f 35/38/35 47/51/47 48/52/48 36/39/36 +f 36/39/36 48/52/48 37/40/37 25/27/25 +f 37/40/37 49/53/49 50/54/50 38/41/38 +f 38/41/38 50/54/50 51/55/51 39/42/39 +f 39/42/39 51/55/51 52/56/52 40/43/40 +f 40/43/40 52/56/52 53/57/53 41/44/41 +f 41/44/41 53/57/53 54/58/54 42/45/42 +f 42/45/42 54/58/54 55/59/55 43/46/43 +f 43/47/43 55/60/55 56/61/56 44/48/44 +f 44/48/44 56/61/56 57/62/57 45/49/45 +f 45/49/45 57/62/57 58/63/58 46/50/46 +f 46/50/46 58/63/58 59/64/59 47/51/47 +f 47/51/47 59/64/59 60/65/60 48/52/48 +f 48/52/48 60/65/60 49/53/49 37/40/37 +f 49/53/49 61/66/61 62/67/62 50/54/50 +f 50/54/50 62/67/62 63/68/63 51/55/51 +f 51/55/51 63/68/63 64/69/64 52/56/52 +f 52/56/52 64/69/64 65/70/65 53/57/53 +f 53/57/53 65/70/65 66/71/66 54/58/54 +f 54/58/54 66/71/66 67/72/67 55/59/55 +f 55/60/55 67/73/67 68/74/68 56/61/56 +f 56/61/56 68/74/68 69/75/69 57/62/57 +f 57/62/57 69/75/69 70/76/70 58/63/58 +f 58/63/58 70/76/70 71/77/71 59/64/59 +f 59/64/59 71/77/71 72/78/72 60/65/60 +f 60/65/60 72/78/72 61/66/61 49/53/49 +f 8/79/8 10/80/10 73/81/73 74/82/74 +f 12/83/12 14/84/14 75/85/75 76/86/76 +f 1/87/1 4/88/4 77/89/77 78/90/78 +f 6/91/6 8/79/8 74/82/74 79/92/79 +f 14/93/14 16/94/16 80/95/80 75/96/75 +f 20/97/20 22/98/22 81/99/81 82/100/82 +f 22/98/22 24/101/24 83/102/83 81/99/81 +f 10/80/10 12/83/12 76/86/76 73/81/73 +f 16/94/16 18/103/18 84/104/84 80/95/80 +f 24/101/24 1/87/1 78/90/78 83/102/83 +f 18/103/18 20/97/20 82/100/82 84/104/84 +f 4/88/4 6/91/6 79/92/79 77/89/77 +f 67/105/67 66/106/66 65/107/65 64/108/64 63/109/63 62/110/62 61/111/61 72/112/72 71/113/71 70/114/70 69/115/69 68/116/68 +g Cylinder_Cylinder_outlet +f 75/117/75 80/118/80 85/119/85 +f 84/120/84 82/121/82 85/119/85 +f 74/122/74 73/123/73 85/119/85 +f 77/124/77 79/125/79 85/119/85 +f 79/125/79 74/122/74 85/119/85 +f 76/126/76 75/117/75 85/119/85 +f 73/123/73 76/126/76 85/119/85 +f 82/121/82 81/127/81 85/119/85 +f 80/118/80 84/120/84 85/119/85 +f 78/128/78 77/124/77 85/119/85 +f 81/127/81 83/129/83 85/119/85 +f 83/129/83 78/128/78 85/119/85 diff --git a/homedecor/textures/homedecor_shower_head.png b/homedecor/textures/homedecor_shower_head.png index b69658dc..180b504a 100644 Binary files a/homedecor/textures/homedecor_shower_head.png and b/homedecor/textures/homedecor_shower_head.png differ