diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 43c2ccf9..735ea36a 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -687,7 +687,11 @@ for _, i in ipairs(n) do homedecor.register("picture_frame"..i, { description = S("Picture Frame"), mesh = "homedecor_picture_frame.obj", - tiles = { "homedecor_picture_frame"..i..".png" }, + tiles = { + "homedecor_picture_frame_image"..i..".png", + "homedecor_picture_frame_edges.png", + "homedecor_picture_frame_back.png", + }, inventory_image = "homedecor_picture_frame"..i.."_inv.png", wield_image = "homedecor_picture_frame"..i.."_inv.png", groups = {snappy = 3}, @@ -695,3 +699,4 @@ for _, i in ipairs(n) do collision_box = pframe_cbox, }) end + diff --git a/homedecor/models/homedecor_picture_frame.obj b/homedecor/models/homedecor_picture_frame.obj index 72ab2ded..46e9f153 100644 --- a/homedecor/models/homedecor_picture_frame.obj +++ b/homedecor/models/homedecor_picture_frame.obj @@ -1,214 +1,135 @@ -# Blender v2.69 (sub 0) OBJ File: '' +# Blender v2.73 (sub 0) OBJ File: 'pictureframe.blend' # www.blender.org -mtllib homedecor_picture_frame.mtl o Cube.001 -v -0.022553 -0.172506 0.023031 +v 0.173052 -0.495810 -0.052949 +v 0.172886 -0.499223 -0.033954 +v 0.171698 -0.092877 0.039032 +v 0.171864 -0.089465 0.020037 +v -0.167440 -0.093323 0.035990 +v -0.167274 -0.089911 0.016995 +v 0.147926 -0.118279 0.014651 +v 0.023980 -0.210277 0.016652 +v 0.148946 -0.467059 -0.047994 +v -0.143167 -0.118662 0.012041 +v -0.166085 -0.496255 -0.055991 +v -0.142147 -0.467441 -0.050606 +v 0.148849 -0.469041 -0.036961 +v -0.143264 -0.120644 0.023074 +v -0.142244 -0.469423 -0.039573 +v 0.023869 -0.172444 0.023448 +v 0.147829 -0.120261 0.025685 +v -0.166251 -0.499668 -0.036996 v -0.022442 -0.210337 0.016236 +v -0.022553 -0.172506 0.023031 v -0.047003 -0.499354 0.123450 v -0.047695 -0.499323 0.127967 v 0.052470 -0.498423 0.124796 v 0.051783 -0.498230 0.128805 -v 0.023980 -0.210277 0.016652 -v 0.023869 -0.172444 0.023448 -v 0.024826 -0.499417 -0.035282 -v 0.024992 -0.496005 -0.054278 -v 0.173052 -0.495810 -0.052949 -v 0.172886 -0.499223 -0.033954 -v 0.023637 -0.093072 0.037704 -v 0.171698 -0.092877 0.039032 -v 0.171864 -0.089465 0.020037 -v 0.023803 -0.089659 0.018709 -v -0.167208 -0.172696 0.021734 -v -0.167440 -0.093323 0.035990 -v -0.167274 -0.089911 0.016995 -v -0.167042 -0.169283 0.002739 -v 0.147926 -0.118279 0.014651 -v 0.019005 -0.118448 0.013496 -v 0.172096 -0.168838 0.005780 -v 0.171930 -0.172250 0.024776 -v 0.172041 -0.210082 0.017980 -v 0.172207 -0.206670 -0.001015 -v 0.148946 -0.467059 -0.047994 -v 0.148220 -0.218879 -0.003418 -v -0.143167 -0.118662 0.012041 -v -0.142968 -0.186790 -0.000196 -v -0.021430 -0.496065 -0.054694 -v -0.166085 -0.496255 -0.055991 -v -0.142147 -0.467441 -0.050606 -v -0.016650 -0.467276 -0.049480 -v 0.148849 -0.469041 -0.036961 -v 0.148124 -0.220862 0.007616 -v -0.143264 -0.120644 0.023074 -v -0.143064 -0.188772 0.010837 -v -0.142244 -0.469423 -0.039573 -v -0.016746 -0.469258 -0.038447 -v -0.167097 -0.210527 0.014938 -v -0.166931 -0.207115 -0.004057 -v 0.148125 -0.186407 0.002415 -v -0.142873 -0.219262 -0.006029 -v 0.148029 -0.188389 0.013448 -v 0.147829 -0.120261 0.025685 -v -0.142969 -0.221245 0.005005 -v -0.166251 -0.499668 -0.036996 -v -0.021596 -0.499478 -0.035699 -v -0.022785 -0.093133 0.037287 -v -0.022619 -0.089721 0.018293 -v -0.017670 -0.118497 0.013167 -v 0.020025 -0.467228 -0.049151 -v 0.019928 -0.469210 -0.038118 -v 0.018908 -0.120431 0.024529 -v 0.019108 -0.188560 0.012292 -v 0.019203 -0.221032 0.006459 -v -0.017766 -0.120479 0.024200 -v -0.017567 -0.188608 0.011963 -v -0.017472 -0.221080 0.006131 -vt 0.501028 0.253839 -vt 0.522837 0.253232 -vt 0.529388 0.423064 -vt 0.506548 0.424680 -vt 0.040595 0.269658 -vt 0.028355 0.439142 -vt 0.000067 0.442481 -vt 0.021036 0.268355 -vt 0.905674 0.007987 -vt 0.996736 0.012999 -vt 0.995537 0.034792 -vt 0.904486 0.029930 -vt 0.961764 0.388832 -vt 0.967403 0.243855 -vt 0.999837 0.249856 -vt 0.995315 0.415980 -vt 0.904395 0.420712 -vt 0.996485 0.437760 -vt 0.905479 0.442646 -vt 0.157375 0.262492 -vt 0.165313 0.435096 -vt 0.860851 0.423072 -vt 0.562582 0.394542 -vt 0.846349 0.396610 -vt 0.961877 0.061966 -vt 0.882528 0.055376 -vt 0.521755 0.200904 -vt 0.522270 0.027621 -vt 0.557648 0.057296 -vt 0.554710 0.205743 -vt 0.569145 0.387814 -vt 0.846059 0.384392 -vt 0.955485 0.068450 -vt 0.881669 0.067419 -vt 0.565073 0.064709 -vt 0.566719 0.205207 -vt 0.861708 0.005427 -vt 0.860891 0.027277 -vt 0.861420 0.444879 -vt 0.128201 0.264137 -vt 0.123050 0.437187 -vt 0.882630 0.395251 -vt 0.845988 0.053843 -vt 0.881867 0.383239 -vt 0.955417 0.382327 -vt 0.845494 0.066074 -vt 0.528554 0.000067 -vt 0.529388 0.444878 -vt 0.500231 0.201850 -vt 0.043155 0.230351 -vt 0.025024 0.230175 -vt 0.967458 0.203577 -vt 0.999933 0.197561 -vt 0.156333 0.232969 -vt 0.555492 0.246597 -vt 0.567662 0.246132 -vt 0.127537 0.233243 -vt 0.491809 0.031758 -vt 0.028724 0.083762 -vt 0.009467 0.085838 -vt 0.147240 0.067539 -vt 0.110271 0.075377 -vt 0.070443 0.696601 -vt 0.121137 0.696118 -vt 0.144469 0.720728 -vt 0.146695 0.716626 -vt 0.140408 0.724016 -vt 0.143128 0.727780 -vt 0.122972 0.748091 -vt 0.071612 0.750988 -vt 0.955263 0.243660 -vt 0.467946 0.893178 -vt 0.467577 0.995908 -vt 0.302208 0.994898 -vt 0.301838 0.893750 -vt 0.468122 0.843905 -vt 0.301064 0.844501 -vt 0.467588 0.462894 -vt 0.299684 0.463685 -vt 0.955312 0.203773 -vt 0.501387 0.893529 -vt 0.501006 0.996327 -vt 0.501498 0.844361 -vt 0.501892 0.461957 -vt 0.673024 0.896263 -vt 0.673812 0.995711 -vt 0.674346 0.846529 -vt 0.674949 0.460933 -usemtl Material.002 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 0.821100 0.491529 +vt 0.000000 0.491529 +vt 0.000000 0.444804 +vt 0.821099 0.444804 +vt 0.000000 0.937471 +vt 0.999521 0.937471 +vt 0.928722 0.995633 +vt 0.070799 0.995632 +vt 0.000000 0.933133 +vt 0.070799 0.874973 +vt 0.928725 0.874972 +vt 0.999524 0.933133 +vt 0.000000 0.852545 +vt 0.058161 0.781746 +vt 0.762937 0.781746 +vt 0.821097 0.852545 +vt 0.704776 0.373327 +vt 0.000000 0.373330 +vt 0.000002 0.346187 +vt 0.704777 0.346187 +vt 0.000000 0.569804 +vt 0.999524 0.569804 +vt 0.999523 0.616529 +vt 0.000002 0.616529 +vt 0.762938 0.758795 +vt 0.058162 0.758795 +vt 0.000000 0.687996 +vt 0.821099 0.687996 +vt 0.857926 0.408687 +vt 0.857927 0.435827 +vt 0.000000 0.435830 +vt 0.000001 0.408687 +vt 0.857924 0.404580 +vt 0.000000 0.404579 +vt 0.000000 0.377439 +vt 0.857924 0.377440 +vt 0.821097 0.554029 +vt 0.000000 0.554029 +vt 0.000000 0.507304 +vt 0.821097 0.507304 +vt 0.000002 0.342080 +vt 0.000000 0.314940 +vt 0.704775 0.314940 +vt 0.704777 0.342080 +vt 0.000002 0.632304 +vt 0.999525 0.632304 +vt 0.999526 0.679029 +vt 0.000000 0.679029 +vt 1.000000 0.794897 +vt 0.968292 0.716732 +vt 0.992429 0.003230 +vt 0.598091 1.000000 +vt 0.590222 0.998491 +vt 0.591098 0.768719 +vt 0.598091 0.770223 +vt 0.808277 0.000000 +vt 0.889066 0.000639 +vt 0.936493 0.711728 +vt 0.763359 0.711728 +vt 0.634221 0.001037 +vt 0.715008 0.000000 +vt 0.763359 0.768719 +vt 0.590222 0.768719 +vt 0.936493 0.078064 +vt 0.968292 0.000000 +vt 0.968292 0.793425 +vt 0.961698 0.791145 +vt 0.590222 0.925281 +vt 0.000002 0.925115 +vt 0.590222 0.000169 +vn 0.008600 0.176800 -0.984200 +vn -0.002900 0.984200 0.176800 +vn 0.002900 -0.984200 -0.176800 +vn -1.000000 -0.001300 -0.009000 +vn 1.000000 0.001300 0.009000 +vn -0.987400 0.025800 -0.156400 +vn 0.009900 -0.999600 0.027900 +vn 0.013700 -0.349500 -0.936800 +vn -0.010600 0.306600 0.951800 +vn 0.992400 0.052500 -0.111300 +vn -0.008600 -0.176800 0.984200 +g Cube.001_Cube.001_picture s off -f 9/1 10/2 11/3 12/4 -f 13/5 14/6 15/7 16/8 -f 17/9 18/10 19/11 20/12 -f 21/13 22/14 16/15 15/16 -f 23/17 15/16 14/18 24/19 -f 7/20 9/1 12/4 25/21 -f 26/22 11/3 27/23 28/24 -f 20/12 19/11 29/25 30/26 -f 31/27 32/28 33/29 34/30 -f 28/24 27/23 35/31 36/32 -f 30/26 29/25 37/33 38/34 -f 34/30 33/29 39/35 40/36 -f 41/37 17/9 20/12 42/38 -f 26/22 23/17 24/19 25/39 -f 13/5 8/40 24/41 14/6 -f 15/16 23/17 43/42 21/13 -f 42/38 20/12 30/26 44/43 -f 21/13 43/42 45/44 46/45 -f 44/43 30/26 38/34 47/46 -f 8/40 7/20 25/21 24/41 -f 23/17 26/22 28/24 43/42 -f 43/42 28/24 36/32 45/44 -f 48/47 41/37 42/38 32/28 -f 11/3 26/22 25/39 12/48 -f 32/28 42/38 44/43 33/29 -f 33/29 44/43 47/46 39/35 -f 49/49 31/27 10/2 9/1 -f 50/50 13/5 16/8 51/51 -f 22/14 52/52 51/53 16/15 -f 2/54 49/49 9/1 7/20 -f 11/3 10/2 53/55 27/23 -f 27/23 53/55 54/56 35/31 -f 50/50 1/57 8/40 13/5 -f 10/2 31/27 34/30 53/55 -f 53/55 34/30 40/36 54/56 -f 48/58 32/28 31/27 49/49 -f 18/59 50/50 51/51 19/60 -f 19/11 51/53 52/52 29/25 -f 41/61 48/58 49/49 2/54 -f 1/57 50/50 18/59 17/62 -f 2/54 1/57 17/62 41/61 -usemtl Material.003 -f 1/63 2/64 3/65 4/66 -f 4/66 3/65 5/67 6/68 -f 2/64 7/69 5/67 3/65 -f 8/70 1/63 4/66 6/68 -f 7/69 8/70 6/68 5/67 -usemtl Material.001 -f 22/14 21/13 46/45 55/71 -f 56/72 55/73 46/74 45/75 -f 57/76 56/72 45/75 36/77 -f 54/78 57/76 36/77 35/79 -f 52/52 22/14 55/71 58/80 -f 59/81 58/82 55/73 56/72 -f 60/83 59/81 56/72 57/76 -f 40/84 60/83 57/76 54/78 -f 29/25 52/52 58/80 37/33 -f 38/85 37/86 58/82 59/81 -f 47/87 38/85 59/81 60/83 -f 39/88 47/87 60/83 40/84 +f 14/1/1 17/2/1 13/3/1 15/4/1 +g Cube.001_Cube.001_frame +f 5/5/2 3/6/2 4/7/2 6/8/2 +f 11/9/1 6/10/1 10/11/1 12/12/1 +f 1/13/1 9/14/1 7/15/1 4/16/1 +f 11/17/1 12/18/1 9/19/1 1/20/1 +f 10/21/3 7/22/3 17/23/3 14/24/3 +f 18/25/4 5/26/4 6/27/4 11/28/4 +f 7/29/1 10/30/1 6/31/1 4/32/1 +f 9/33/4 13/34/4 17/35/4 7/36/4 +f 12/37/5 10/38/5 14/39/5 15/40/5 +f 2/41/3 18/42/3 11/43/3 1/44/3 +f 12/45/2 15/46/2 13/47/2 9/48/2 +f 1/49/5 4/50/5 3/51/5 2/52/5 +g Cube.001_Cube.001_back +f 20/53/6 19/54/6 21/55/6 22/4/6 +f 22/56/7 21/57/7 23/58/7 24/59/7 +f 19/60/8 8/61/8 23/62/8 21/63/8 +f 16/64/9 20/65/9 22/66/9 24/67/9 +f 8/68/10 16/69/10 24/70/10 23/71/10 +f 18/72/11 2/73/11 3/3/11 5/74/11 diff --git a/homedecor/textures/homedecor_picture_frame1.png b/homedecor/textures/homedecor_picture_frame1.png deleted file mode 100644 index e07854c2..00000000 Binary files a/homedecor/textures/homedecor_picture_frame1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_picture_frame1_inv.png b/homedecor/textures/homedecor_picture_frame1_inv.png index c984196b..4bdef43e 100644 Binary files a/homedecor/textures/homedecor_picture_frame1_inv.png and b/homedecor/textures/homedecor_picture_frame1_inv.png differ diff --git a/homedecor/textures/homedecor_picture_frame2.png b/homedecor/textures/homedecor_picture_frame2.png deleted file mode 100644 index 6917fbdd..00000000 Binary files a/homedecor/textures/homedecor_picture_frame2.png and /dev/null differ diff --git a/homedecor/textures/homedecor_picture_frame2_inv.png b/homedecor/textures/homedecor_picture_frame2_inv.png index e6fae20f..51494da5 100644 Binary files a/homedecor/textures/homedecor_picture_frame2_inv.png and b/homedecor/textures/homedecor_picture_frame2_inv.png differ diff --git a/homedecor/textures/homedecor_picture_frame_back.png b/homedecor/textures/homedecor_picture_frame_back.png new file mode 100644 index 00000000..800e1f44 Binary files /dev/null and b/homedecor/textures/homedecor_picture_frame_back.png differ diff --git a/homedecor/textures/homedecor_picture_frame_edges.png b/homedecor/textures/homedecor_picture_frame_edges.png new file mode 100644 index 00000000..a134b745 Binary files /dev/null and b/homedecor/textures/homedecor_picture_frame_edges.png differ diff --git a/homedecor/textures/homedecor_picture_frame_image1.png b/homedecor/textures/homedecor_picture_frame_image1.png new file mode 100644 index 00000000..ba3cb7e8 Binary files /dev/null and b/homedecor/textures/homedecor_picture_frame_image1.png differ diff --git a/homedecor/textures/homedecor_picture_frame_image2.png b/homedecor/textures/homedecor_picture_frame_image2.png new file mode 100644 index 00000000..ec13c2a9 Binary files /dev/null and b/homedecor/textures/homedecor_picture_frame_image2.png differ