From 492f13fd8fba5f2518d7e6eac0fdac1b9d8949fa Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Thu, 25 Jun 2015 02:57:07 -0400 Subject: [PATCH] fix potted-flower model (re-derived it from the standard flowerpot) delete an obsolete texture. --- homedecor/misc-nodes.lua | 9 +- .../models/homedecor_flowerpot_small.obj | 510 ------------------ homedecor/models/homedecor_potted_plant.obj | 394 ++++++++++++++ homedecor/textures/homedecor_potted.png | Bin 340 -> 0 bytes 4 files changed, 399 insertions(+), 514 deletions(-) delete mode 100644 homedecor/models/homedecor_flowerpot_small.obj create mode 100644 homedecor/models/homedecor_potted_plant.obj delete mode 100644 homedecor/textures/homedecor_potted.png diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 5464de4d..3081ef87 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -97,17 +97,18 @@ for i in ipairs(flowers_list) do homedecor.register("potted_"..flower, { description = S("Potted flower ("..flowerdesc..")"), - mesh = "homedecor_flowerpot_small.obj", + mesh = "homedecor_potted_plant.obj", tiles = { - "flowers_"..flower..".png", - "homedecor_potted.png" + "homedecor_flower_pot_terracotta.png", + "default_dirt.png^[colorize:#000000:175", + "flowers_"..flower..".png" }, walkable = false, groups = {snappy = 3}, sounds = default.node_sound_glass_defaults(), selection_box = { type = "fixed", - fixed = { -0.2, -0.5, -0.2, 0.2, 0.4, 0.2 } + fixed = { -0.2, -0.5, -0.2, 0.2, 0.3, 0.2 } } }) diff --git a/homedecor/models/homedecor_flowerpot_small.obj b/homedecor/models/homedecor_flowerpot_small.obj deleted file mode 100644 index bd6e84d1..00000000 --- a/homedecor/models/homedecor_flowerpot_small.obj +++ /dev/null @@ -1,510 +0,0 @@ -# Blender v2.73 (sub 0) OBJ File: 'flowersplus_potted.blend' -# www.blender.org -o Plane_Plane_None -v -0.280963 0.570852 -0.280962 -v -0.280963 -0.122043 -0.280962 -v 0.280961 -0.122043 0.280962 -v 0.280961 0.570851 0.280962 -v 0.280961 0.570852 -0.280962 -v 0.280961 -0.122043 -0.280962 -v -0.280963 -0.122043 0.280962 -v -0.280963 0.570851 0.280962 -vt 0.000015 0.999998 -vt 0.000016 0.000012 -vt 0.999986 0.000012 -vt 0.999986 0.999990 -vn -0.707100 -0.000000 0.707100 -vn -0.707100 -0.000000 -0.707100 -g Plane_Plane_None_Plane_Plane_None_None -s off -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/1/2 6/2/2 7/3/2 8/4/2 -o Cylinder.001_Cylinder.001_None -v 0.039325 -0.147239 -0.197702 -v 0.039325 -0.096845 -0.197702 -v 0.111989 -0.096845 -0.167603 -v 0.111989 -0.147239 -0.167603 -v 0.167603 -0.096845 -0.111989 -v 0.167603 -0.147239 -0.111989 -v 0.197702 -0.096845 -0.039325 -v 0.197702 -0.147239 -0.039325 -v 0.197702 -0.096845 0.039325 -v 0.197702 -0.147239 0.039325 -v 0.167603 -0.096845 0.111989 -v 0.167603 -0.147239 0.111989 -v 0.111989 -0.096845 0.167604 -v 0.111989 -0.147239 0.167604 -v 0.039325 -0.096845 0.197702 -v 0.039325 -0.147239 0.197702 -v -0.039325 -0.096845 0.197702 -v -0.039325 -0.147239 0.197702 -v -0.111989 -0.096845 0.167604 -v -0.111989 -0.147239 0.167604 -v -0.167603 -0.096845 0.111989 -v -0.167603 -0.147239 0.111989 -v -0.197702 -0.096845 0.039325 -v -0.197702 -0.147239 0.039325 -v -0.197702 -0.096845 -0.039326 -v -0.197702 -0.147239 -0.039326 -v -0.167603 -0.096845 -0.111989 -v -0.167603 -0.147239 -0.111989 -v -0.111989 -0.096845 -0.167603 -v -0.111989 -0.147239 -0.167603 -v -0.039325 -0.147239 -0.197702 -v -0.039325 -0.096845 -0.197702 -v 0.098851 -0.499995 -0.019663 -v 0.000000 -0.499995 -0.000000 -v -0.083802 -0.499995 0.055994 -v 0.055995 -0.499995 -0.083802 -v 0.055995 -0.499995 0.083802 -v -0.098851 -0.499995 -0.019663 -v -0.055995 -0.499995 0.083802 -v -0.083802 -0.499995 -0.055995 -v -0.019663 -0.499995 0.098851 -v -0.055994 -0.499995 -0.083802 -v 0.019663 -0.499995 0.098851 -v 0.098851 -0.499995 0.019662 -v 0.083802 -0.499995 0.055994 -v 0.083802 -0.499995 -0.055995 -v -0.098851 -0.499995 0.019662 -v -0.019662 -0.499995 -0.098851 -v 0.097990 -0.122042 -0.146653 -v 0.097990 -0.096845 -0.146653 -v 0.172989 -0.122042 0.034410 -v 0.172989 -0.096845 0.034410 -v 0.146653 -0.122042 -0.097990 -v 0.146653 -0.096845 -0.097990 -v -0.034409 -0.122042 -0.172989 -v -0.034409 -0.096845 -0.172989 -v -0.172989 -0.122042 0.034410 -v -0.172989 -0.096845 0.034410 -v -0.146653 -0.122042 0.097990 -v -0.146653 -0.096845 0.097990 -v 0.172989 -0.122042 -0.034410 -v 0.172989 -0.096845 -0.034410 -v 0.146653 -0.122042 0.097990 -v 0.146653 -0.096845 0.097990 -v 0.034410 -0.122042 -0.172989 -v 0.034410 -0.096845 -0.172989 -v -0.146653 -0.122042 -0.097990 -v -0.146653 -0.096845 -0.097990 -v 0.034410 -0.122042 0.172989 -v 0.034410 -0.096845 0.172989 -v -0.172989 -0.122042 -0.034410 -v -0.172989 -0.096845 -0.034410 -v -0.034410 -0.122042 0.172989 -v -0.034410 -0.096845 0.172989 -v 0.097990 -0.122042 0.146653 -v 0.097990 -0.096845 0.146653 -v -0.097990 -0.122042 -0.146653 -v -0.097990 -0.096845 -0.146653 -v -0.097990 -0.122042 0.146653 -v -0.097990 -0.096845 0.146653 -v 0.000000 -0.122042 -0.000000 -v 0.019663 -0.499995 -0.098851 -v 0.034410 -0.147239 -0.172989 -v 0.097990 -0.147239 -0.146653 -v 0.146653 -0.147239 -0.097990 -v 0.172989 -0.147239 -0.034410 -v 0.172989 -0.147239 0.034410 -v 0.146653 -0.147239 0.097990 -v 0.097990 -0.147239 0.146653 -v 0.034410 -0.147239 0.172989 -v -0.034410 -0.147239 0.172989 -v -0.097990 -0.147239 0.146653 -v -0.146653 -0.147239 0.097990 -v -0.172989 -0.147239 0.034410 -v -0.172989 -0.147239 -0.034410 -v -0.146653 -0.147239 -0.097990 -v -0.097990 -0.147239 -0.146653 -v -0.034409 -0.147239 -0.172989 -vt 0.156250 0.593750 -vt 0.156250 0.375000 -vt 0.218750 0.375000 -vt 0.218750 0.593750 -vt 0.925348 0.807408 -vt 0.942592 0.824652 -vt 0.890625 0.859375 -vt 0.611122 0.768387 -vt 0.602441 0.755395 -vt 0.647502 0.736730 -vt 0.650550 0.752055 -vt 0.468750 0.656250 -vt 0.406250 0.656250 -vt 0.406250 0.625000 -vt 0.468750 0.625000 -vt 0.093750 0.656250 -vt 0.093750 0.625000 -vt 0.156250 0.625000 -vt 0.156250 0.656250 -vt 0.031250 0.656250 -vt 0.031250 0.625000 -vt 0.343750 0.656250 -vt 0.343750 0.625000 -vt 0.031250 0.593750 -vt 0.968750 0.593750 -vt 0.968750 0.375000 -vt 0.031250 0.375000 -vt 0.718750 0.656250 -vt 0.718750 0.625000 -vt 0.781250 0.625000 -vt 0.781250 0.656250 -vt 0.656250 0.656250 -vt 0.656250 0.625000 -vt 0.650550 0.966602 -vt 0.693226 0.966602 -vt 0.696274 0.981927 -vt 0.647501 0.981927 -vt 0.906250 0.656250 -vt 0.906250 0.625000 -vt 0.968750 0.625000 -vt 0.968750 0.656250 -vt 0.406250 0.593750 -vt 0.343750 0.593750 -vt 0.343750 0.375000 -vt 0.406250 0.375000 -vt 0.531250 0.656250 -vt 0.531250 0.625000 -vt 0.593750 0.625000 -vt 0.593750 0.656250 -vt 0.564614 0.837990 -vt 0.564614 0.880667 -vt 0.549289 0.883715 -vt 0.549289 0.834942 -vt 0.580946 0.798563 -vt 0.567954 0.789882 -vt 0.902818 0.798076 -vt 0.656250 0.593750 -vt 0.593750 0.593750 -vt 0.593750 0.375000 -vt 0.656250 0.375000 -vt 0.951924 0.847182 -vt 0.033364 0.838084 -vt 0.018040 0.835036 -vt 0.036704 0.789976 -vt 0.049696 0.798656 -vt 0.779161 0.837991 -vt 0.762830 0.798563 -vt 0.775821 0.789882 -vt 0.794486 0.834942 -vt 0.906250 0.593750 -vt 0.906250 0.375000 -vt 0.218750 0.625000 -vt 0.218750 0.656250 -vt 0.406250 0.859375 -vt 0.467016 0.950317 -vt 0.427588 0.966648 -vt 0.794486 0.883715 -vt 0.779161 0.880667 -vt 0.775821 0.928775 -vt 0.762830 0.920094 -vt 0.210084 0.755488 -vt 0.244571 0.789976 -vt 0.231580 0.798656 -vt 0.201403 0.768480 -vt 0.384912 0.966648 -vt 0.696274 0.736730 -vt 0.693226 0.752055 -vt 0.593750 0.687500 -vt 0.656250 0.687500 -vt 0.656250 0.703125 -vt 0.593750 0.703125 -vt 0.156250 0.687500 -vt 0.218750 0.687500 -vt 0.218750 0.703125 -vt 0.156250 0.703125 -vt 0.611122 0.950271 -vt 0.602441 0.963262 -vt 0.718750 0.687500 -vt 0.718750 0.703125 -vt 0.263236 0.883808 -vt 0.244571 0.928868 -vt 0.231580 0.920187 -vt 0.247911 0.880760 -vt 0.567954 0.928775 -vt 0.580946 0.920094 -vt 0.781250 0.687500 -vt 0.781250 0.703125 -vt 0.781250 0.593750 -vt 0.718750 0.593750 -vt 0.718750 0.375000 -vt 0.781250 0.375000 -vt 0.951924 0.871568 -vt 0.071191 0.755488 -vt 0.116251 0.736824 -vt 0.119300 0.752149 -vt 0.079872 0.768480 -vt 0.298977 0.838037 -vt 0.315308 0.798609 -vt 0.467016 0.768433 -vt 0.497192 0.798609 -vt 0.210084 0.963356 -vt 0.201403 0.950364 -vt 0.843750 0.687500 -vt 0.843750 0.703125 -vt 0.468750 0.687500 -vt 0.531250 0.687500 -vt 0.531250 0.703125 -vt 0.468750 0.703125 -vt 0.071192 0.963356 -vt 0.079872 0.950364 -vt 0.119300 0.966695 -vt 0.116252 0.982020 -vt 0.942592 0.894098 -vt 0.281250 0.687500 -vt 0.281250 0.703125 -vt 0.165024 0.982020 -vt 0.161976 0.966695 -vt 0.161976 0.752149 -vt 0.165024 0.736824 -vt 0.513523 0.838037 -vt 0.531250 0.593750 -vt 0.531250 0.375000 -vt 0.878432 0.920674 -vt 0.855901 0.911342 -vt 0.843750 0.656250 -vt 0.843750 0.625000 -vt 0.468750 0.593750 -vt 0.468750 0.375000 -vt 0.031250 0.687500 -vt 0.093750 0.687500 -vt 0.093750 0.703125 -vt 0.031250 0.703125 -vt 0.406250 0.687500 -vt 0.406250 0.703125 -vt 0.741334 0.963262 -vt 0.732653 0.950271 -vt 0.018040 0.883808 -vt 0.033364 0.880760 -vt 0.049696 0.920188 -vt 0.036704 0.928868 -vt 0.315308 0.920140 -vt 0.298977 0.880713 -vt 0.345485 0.768433 -vt 0.513523 0.880713 -vt 0.855902 0.807408 -vt 0.878432 0.798076 -vt 0.906250 0.687500 -vt 0.968750 0.687500 -vt 0.968750 0.703125 -vt 0.906250 0.703125 -vt 0.829326 0.871568 -vt 0.829326 0.847182 -vt 0.247911 0.838084 -vt 0.263236 0.835036 -vt 0.925348 0.911342 -vt 0.384912 0.752101 -vt 0.902818 0.920674 -vt 0.732653 0.768387 -vt 0.741334 0.755395 -vt 0.281250 0.625000 -vt 0.281250 0.656250 -vt 0.345485 0.950317 -vt 0.843750 0.593750 -vt 0.843750 0.375000 -vt 0.281250 0.593750 -vt 0.281250 0.375000 -vt 0.343750 0.687500 -vt 0.343750 0.703125 -vt 0.093750 0.593750 -vt 0.093750 0.375000 -vt 0.427588 0.752101 -vt 0.838658 0.894098 -vt 0.838658 0.824652 -vt 0.497192 0.920140 -vn 0.479200 -0.817200 0.320200 -vn 0.813000 -0.209500 0.543200 -vn 0.959000 -0.209500 0.190800 -vn 0.565300 -0.817200 0.112400 -vn 0.000000 -1.000000 0.000000 -vn -0.320200 -0.817200 -0.479200 -vn -0.414600 -0.665700 -0.620400 -vn -0.145600 -0.665700 -0.731900 -vn -0.112400 -0.817200 -0.565300 -vn 0.195100 0.000000 -0.980800 -vn 0.555600 0.000000 -0.831500 -vn 0.414600 -0.665700 -0.620400 -vn 0.145600 -0.665700 -0.731900 -vn 0.555600 0.000000 0.831500 -vn 0.414600 -0.665700 0.620400 -vn 0.620400 -0.665700 0.414600 -vn 0.831500 0.000000 0.555600 -vn 0.195100 0.000000 0.980800 -vn 0.145600 -0.665700 0.731900 -vn 0.831500 -0.000000 -0.555600 -vn 0.620400 -0.665700 -0.414600 -vn 0.112400 -0.817200 0.565300 -vn -0.112400 -0.817200 0.565300 -vn -0.190800 -0.209500 0.959000 -vn 0.190800 -0.209500 0.959000 -vn -0.980800 -0.000000 -0.195100 -vn -0.731900 -0.665700 -0.145600 -vn -0.731900 -0.665700 0.145600 -vn -0.980800 -0.000000 0.195100 -vn -0.831500 -0.000000 -0.555600 -vn -0.620400 -0.665700 -0.414600 -vn -0.145600 -0.665700 0.731900 -vn -0.555600 0.000000 0.831500 -vn -0.414600 -0.665700 0.620400 -vn -0.195100 0.000000 0.980800 -vn 0.320200 -0.817200 -0.479200 -vn 0.479200 -0.817200 -0.320200 -vn 0.813000 -0.209500 -0.543200 -vn 0.543200 -0.209500 -0.813000 -vn -0.195100 0.000000 -0.980800 -vn -0.555600 0.000000 -0.831500 -vn -0.565300 -0.817200 -0.112400 -vn -0.565300 -0.817200 0.112400 -vn -0.479200 -0.817200 -0.320200 -vn -0.543200 -0.209500 -0.813000 -vn -0.813000 -0.209500 -0.543200 -vn 0.644500 0.753700 -0.128200 -vn 0.000000 1.000000 0.000000 -vn 0.546400 0.753700 -0.365100 -vn 0.565300 -0.817200 -0.112400 -vn 0.731900 -0.665700 -0.145600 -vn -0.320200 -0.817200 0.479200 -vn -0.543200 -0.209500 0.813000 -vn 0.731900 -0.665700 0.145600 -vn 0.980800 0.000000 0.195100 -vn -0.546400 0.753700 -0.365100 -vn -0.365100 0.753700 -0.546400 -vn 0.112400 -0.817200 -0.565300 -vn -0.831500 0.000000 0.555600 -vn -0.546400 0.753700 0.365100 -vn -0.365100 0.753700 0.546400 -vn 0.980800 0.000000 -0.195100 -vn -0.644500 0.753700 0.128200 -vn -0.620400 -0.665700 0.414600 -vn -0.479200 -0.817200 0.320200 -vn -0.644500 0.753700 -0.128200 -vn -0.959000 -0.209500 -0.190800 -vn -0.959000 -0.209500 0.190800 -vn 0.128200 0.753700 -0.644500 -vn 0.365100 0.753700 -0.546400 -vn -0.128200 0.753700 0.644500 -vn 0.128200 0.753700 0.644500 -vn 0.365100 0.753700 0.546400 -vn 0.644500 0.753700 0.128200 -vn -0.128200 0.753700 -0.644500 -vn -0.190800 -0.209500 -0.959000 -vn 0.190800 -0.209500 -0.959000 -vn 0.320200 -0.817200 0.479200 -vn 0.546400 0.753700 0.365100 -vn -0.813000 -0.209500 0.543200 -vn 0.959000 -0.209500 -0.190800 -vn 0.543200 -0.209500 0.813000 -g Cylinder.001_Cylinder.001_None_Cylinder.001_Cylinder.001_None_None_flowers_potted.png -s 1 -f 96/5/3 53/6/4 52/7/5 95/8/6 -f 44/9/7 54/10/7 42/11/7 -f 105/12/8 38/13/9 39/14/10 106/15/11 -f 10/16/12 11/17/13 12/18/14 9/19/15 -f 21/20/16 22/21/17 20/22/18 19/23/19 -f 23/24/20 24/25/21 22/21/17 21/20/16 -f 13/26/22 14/27/23 12/18/14 11/17/13 -f 98/28/24 99/29/25 49/30/26 51/31/27 -f 33/32/28 34/33/29 32/34/30 31/35/31 -f 35/36/32 36/37/33 34/33/29 33/32/28 -f 99/38/25 98/39/24 24/40/21 26/41/34 -f 27/42/35 28/43/36 26/44/34 25/45/37 -f 92/46/38 93/47/39 54/48/40 44/49/41 -f 40/50/42 39/51/10 38/52/9 37/53/43 -f 103/54/44 102/55/45 32/56/30 34/57/29 -f 104/58/46 36/59/33 38/13/9 105/12/8 -f 90/60/7 44/9/7 42/11/7 -f 104/61/46 105/62/8 50/63/47 48/64/48 -f 54/10/7 41/65/7 42/11/7 -f 66/66/49 31/67/50 29/68/50 68/69/51 -f 94/70/52 93/71/39 14/72/23 16/73/53 -f 100/74/54 47/75/55 49/30/26 99/29/25 -f 19/23/19 20/22/18 18/76/56 17/77/57 -f 89/78/50 57/79/50 73/80/50 -f 94/70/52 16/73/53 18/81/56 95/82/6 -f 25/45/37 26/44/34 24/25/21 23/24/20 -f 95/82/6 18/81/56 20/83/18 96/84/3 -f 21/85/50 19/86/50 72/87/58 84/88/59 -f 63/89/50 89/78/50 73/80/50 -f 9/90/15 91/91/60 106/15/11 39/14/10 -f 57/92/35 61/93/61 62/94/62 58/95/63 -f 67/96/22 65/97/64 66/98/49 68/99/51 -f 100/100/54 99/38/25 26/41/34 28/101/36 -f 61/93/61 69/102/31 70/103/65 62/94/62 -f 15/104/50 13/105/50 62/106/62 70/107/65 -f 30/108/66 32/56/30 102/55/45 101/109/67 -f 59/110/28 60/111/68 70/103/65 69/102/31 -f 102/112/45 103/113/44 46/114/69 55/115/70 -f 41/65/7 52/116/7 42/11/7 -f 27/117/50 25/118/50 82/119/71 88/120/72 -f 89/78/50 65/121/50 67/122/50 -f 89/78/50 83/123/50 71/124/50 -f 11/125/50 58/126/63 62/106/62 13/105/50 -f 59/110/28 71/127/32 72/128/58 60/111/68 -f 63/129/20 73/130/37 74/131/73 64/132/74 -f 37/133/50 86/134/75 64/135/74 40/136/50 -f 52/116/7 53/137/7 42/11/7 -f 79/138/57 80/139/76 66/98/49 65/97/64 -f 10/140/50 74/141/73 58/126/63 11/125/50 -f 78/142/77 23/143/50 21/85/50 84/88/59 -f 89/78/50 71/124/50 59/144/50 -f 105/62/8 106/145/11 56/146/78 50/63/47 -f 49/147/7 47/148/7 42/11/7 -f 29/149/61 30/150/66 28/43/36 27/42/35 -f 56/146/78 106/145/11 91/151/60 90/152/79 -f 81/153/12 87/154/13 88/155/72 82/156/71 -f 9/19/15 39/51/10 40/50/42 10/16/12 -f 85/157/16 63/129/20 64/132/74 86/158/75 -f 20/83/18 22/159/17 97/160/80 96/84/3 -f 92/46/38 44/49/41 90/152/79 91/151/60 -f 33/161/50 80/162/76 76/163/81 35/164/50 -f 89/78/50 75/165/50 79/166/50 -f 89/78/50 67/122/50 87/167/50 -f 89/78/50 59/144/50 69/168/50 -f 50/169/7 56/170/7 42/11/7 -f 83/171/43 77/172/42 78/173/77 84/174/59 -f 77/172/42 81/153/12 82/156/71 78/173/77 -f 98/39/24 97/160/80 22/159/17 24/40/21 -f 55/175/7 46/176/7 42/11/7 -f 60/177/68 17/178/50 15/104/50 70/107/65 -f 45/179/7 42/11/7 53/137/7 -f 87/154/13 67/96/22 68/99/51 88/155/72 -f 28/101/36 30/108/66 101/109/67 100/100/54 -f 72/87/58 19/86/50 17/178/50 60/177/68 -f 40/136/50 64/135/74 74/141/73 10/140/50 -f 89/78/50 87/167/50 81/180/50 -f 51/181/7 49/147/7 42/11/7 -f 71/127/32 83/171/43 84/174/59 72/128/58 -f 31/35/31 32/34/30 30/150/66 29/149/61 -f 93/71/39 92/182/38 12/183/14 14/72/23 -f 92/182/38 91/91/60 9/90/15 12/183/14 -f 37/53/43 38/52/9 36/37/33 35/36/32 -f 17/77/57 18/76/56 16/184/53 15/185/64 -f 89/78/50 63/89/50 85/186/50 -f 90/60/7 42/11/7 56/170/7 -f 101/187/67 102/112/45 55/115/70 43/188/82 -f 93/47/39 94/189/52 41/190/83 54/48/40 -f 15/185/64 16/184/53 14/27/23 13/26/22 -f 89/78/50 79/166/50 65/121/50 -f 94/189/52 95/8/6 52/7/5 41/190/83 -f 75/191/19 76/192/81 80/139/76 79/138/57 -f 97/193/80 98/28/24 51/31/27 45/194/84 -f 104/58/46 103/54/44 34/57/29 36/59/33 -f 89/78/50 81/180/50 77/195/50 -f 85/157/16 86/158/75 76/192/81 75/191/19 -f 43/196/7 55/175/7 42/11/7 -f 104/61/46 48/64/48 46/114/69 103/113/44 -f 89/78/50 85/186/50 75/165/50 -f 47/148/7 43/196/7 42/11/7 -f 76/163/81 86/134/75 37/133/50 35/164/50 -f 100/74/54 101/187/67 43/188/82 47/75/55 -f 50/169/7 42/11/7 48/197/7 -f 89/78/50 77/195/50 83/123/50 -f 96/5/3 97/193/80 45/194/84 53/6/4 -f 89/78/50 69/168/50 61/198/50 -f 25/118/50 23/143/50 78/142/77 82/119/71 -f 48/197/7 42/11/7 46/176/7 -f 88/120/72 68/69/51 29/68/50 27/117/50 -f 66/66/49 80/162/76 33/161/50 31/67/50 -f 89/78/50 61/198/50 57/79/50 -f 51/181/7 42/11/7 45/179/7 -f 73/130/37 57/92/35 58/95/63 74/131/73 diff --git a/homedecor/models/homedecor_potted_plant.obj b/homedecor/models/homedecor_potted_plant.obj new file mode 100644 index 00000000..4e579665 --- /dev/null +++ b/homedecor/models/homedecor_potted_plant.obj @@ -0,0 +1,394 @@ +# Blender v2.73 (sub 0) OBJ File: 'potted-plant.blend' +# www.blender.org +o Cylinder.001 +v 0.048773 -0.062500 -0.245196 +v 0.048773 0.000000 -0.245196 +v -0.048772 -0.062500 -0.245196 +v -0.048772 0.000000 -0.245196 +v 0.138893 -0.062500 -0.207867 +v 0.138893 0.000000 -0.207867 +v -0.138892 -0.062500 -0.207868 +v -0.138892 0.000000 -0.207868 +v 0.207868 -0.062500 -0.138893 +v 0.207868 0.000000 -0.138893 +v -0.207867 -0.062500 -0.138893 +v -0.207867 0.000000 -0.138893 +v 0.245196 -0.062500 -0.048773 +v 0.245196 0.000000 -0.048773 +v -0.245196 -0.062500 -0.048773 +v -0.245196 0.000000 -0.048773 +v 0.245196 -0.062500 0.048773 +v 0.245196 0.000000 0.048773 +v -0.245196 -0.062500 0.048772 +v -0.245196 0.000000 0.048772 +v -0.042676 0.000000 0.214547 +v 0.042676 0.000000 0.214547 +v -0.121531 0.000000 0.181884 +v 0.207868 -0.062500 0.138893 +v 0.207868 0.000000 0.138893 +v -0.207867 -0.062500 0.138892 +v -0.207867 0.000000 0.138892 +v 0.121531 0.000000 0.181884 +v -0.181884 0.000000 0.121531 +v 0.181884 0.000000 0.121531 +v -0.214547 0.000000 0.042676 +v 0.214547 0.000000 0.042676 +v -0.214547 0.000000 -0.042676 +v 0.138893 -0.062500 0.207867 +v 0.138893 0.000000 0.207867 +v -0.138893 -0.062500 0.207867 +v -0.138893 0.000000 0.207867 +v 0.214547 0.000000 -0.042676 +v -0.181884 0.000000 -0.121531 +v 0.181884 0.000000 -0.121531 +v -0.121531 0.000000 -0.181884 +v 0.042676 0.000000 -0.214547 +v 0.121531 0.000000 -0.181884 +v -0.042676 0.000000 -0.214547 +v 0.048773 -0.062500 0.245196 +v 0.048773 0.000000 0.245196 +v -0.048773 -0.062500 0.245196 +v -0.048773 0.000000 0.245196 +v 0.024386 -0.500000 -0.122598 +v -0.024386 -0.500000 -0.122598 +v 0.069446 -0.500000 -0.103934 +v -0.069446 -0.500000 -0.103934 +v 0.103934 -0.500000 -0.069446 +v -0.103934 -0.500000 -0.069446 +v 0.122598 -0.500000 -0.024386 +v -0.122598 -0.500000 -0.024386 +v 0.122598 -0.500000 0.024386 +v -0.122598 -0.500000 0.024386 +v 0.103934 -0.500000 0.069446 +v -0.103934 -0.500000 0.069446 +v 0.069446 -0.500000 0.103934 +v -0.121531 -0.062500 0.181884 +v -0.069446 -0.500000 0.103934 +v 0.024386 -0.500000 0.122598 +v -0.024386 -0.500000 0.122598 +v 0.042676 -0.031250 -0.214547 +v 0.000000 -0.031250 -0.000000 +v -0.042676 -0.031250 -0.214547 +v 0.121531 -0.031250 -0.181884 +v -0.121531 -0.031250 -0.181884 +v 0.181884 -0.031250 -0.121531 +v -0.181884 -0.031250 -0.121531 +v 0.214547 -0.031250 -0.042676 +v -0.214547 -0.031250 -0.042676 +v 0.214547 -0.031250 0.042676 +v -0.214547 -0.031250 0.042676 +v 0.181884 -0.031250 0.121531 +v -0.181884 -0.031250 0.121531 +v 0.121531 -0.031250 0.181884 +v -0.121531 -0.031250 0.181884 +v 0.042676 -0.031250 0.214547 +v -0.042676 -0.031250 0.214547 +v 0.000000 -0.500000 -0.000000 +v -0.042676 -0.062500 0.214547 +v 0.042676 -0.062500 0.214547 +v 0.121531 -0.062500 0.181884 +v -0.181884 -0.062500 0.121531 +v 0.181884 -0.062500 0.121531 +v -0.214547 -0.062500 0.042676 +v 0.214547 -0.062500 0.042676 +v -0.214547 -0.062500 -0.042676 +v 0.214547 -0.062500 -0.042676 +v -0.181884 -0.062500 -0.121531 +v 0.181884 -0.062500 -0.121531 +v -0.121531 -0.062500 -0.181884 +v 0.042676 -0.062500 -0.214547 +v 0.121531 -0.062500 -0.181884 +v -0.042676 -0.062500 -0.214547 +v -0.156879 -0.031965 0.151496 +v -0.156879 0.404210 0.151496 +v 0.156879 -0.031965 -0.151497 +v 0.156879 0.404210 -0.151496 +v -0.151496 -0.031965 -0.156879 +v -0.151496 0.404210 -0.156879 +v 0.151497 -0.031965 0.156879 +v 0.151497 0.404210 0.156879 +vt 0.906250 0.500000 +vt 0.843750 0.500000 +vt 0.843750 0.437500 +vt 0.906250 0.437500 +vt 0.718750 0.500000 +vt 0.718750 0.531250 +vt 0.656250 0.531250 +vt 0.656250 0.500000 +vt 0.281250 0.500000 +vt 0.281250 0.437500 +vt 0.343750 0.437500 +vt 0.343750 0.500000 +vt 0.855851 0.705329 +vt 0.872056 0.744452 +vt 0.765612 0.765625 +vt 0.659168 0.786798 +vt 0.659168 0.744452 +vt 0.744439 0.872070 +vt 0.705316 0.855864 +vt 0.786785 0.659181 +vt 0.825908 0.675386 +vt 0.218750 0.500000 +vt 0.281250 0.531250 +vt 0.218750 0.531250 +vt 0.406250 0.500000 +vt 0.406250 0.531250 +vt 0.343750 0.531250 +vt 0.406250 0.437500 +vt 0.468750 0.437500 +vt 0.468750 0.500000 +vt 0.968750 0.437500 +vt 0.968750 0.500000 +vt 0.781250 0.500000 +vt 0.781250 0.531250 +vt 0.593750 0.500000 +vt 0.531250 0.500000 +vt 0.531250 0.437500 +vt 0.593750 0.437500 +vt 0.093750 0.500000 +vt 0.031250 0.500000 +vt 0.031250 0.437500 +vt 0.093750 0.437500 +vt 0.744439 0.659181 +vt 0.468750 0.531250 +vt 0.192029 0.978595 +vt 0.197322 0.951984 +vt 0.271428 0.951984 +vt 0.276721 0.978595 +vt 0.675373 0.825921 +vt 0.872056 0.786798 +vt 0.825908 0.855864 +vt 0.786785 0.872070 +vt 0.031250 0.531250 +vt 0.968750 0.531250 +vt 0.156250 0.500000 +vt 0.156250 0.531250 +vt 0.093750 0.531250 +vt 0.593750 0.531250 +vt 0.531250 0.531250 +vt 0.906250 0.531250 +vt 0.843750 0.531250 +vt 0.656250 0.437500 +vt 0.855851 0.825921 +vt 0.156250 0.437500 +vt 0.218750 0.437500 +vt 0.718750 0.437500 +vt 0.781250 0.437500 +vt 0.705316 0.675386 +vt 0.675373 0.705329 +vt 0.128857 0.923625 +vt 0.113784 0.946184 +vt 0.339893 0.923624 +vt 0.354967 0.946184 +vt 0.354967 0.585227 +vt 0.339893 0.607788 +vt 0.271428 0.579428 +vt 0.276721 0.552817 +vt 0.645043 0.946022 +vt 0.660117 0.923462 +vt 0.728582 0.951821 +vt 0.723288 0.978433 +vt 0.021486 0.808052 +vt 0.048097 0.802759 +vt 0.076457 0.871224 +vt 0.053897 0.886298 +vt 0.113783 0.585228 +vt 0.128857 0.607788 +vt 0.076456 0.660188 +vt 0.053897 0.645115 +vt 0.192029 0.552817 +vt 0.197322 0.579428 +vt 0.392293 0.871224 +vt 0.414853 0.886298 +vt 0.420653 0.802759 +vt 0.447264 0.808052 +vt 0.021486 0.723360 +vt 0.048097 0.728653 +vt 0.420653 0.728653 +vt 0.447264 0.723360 +vt 0.656250 0.000000 +vt 0.718750 0.000000 +vt 0.392293 0.660188 +vt 0.414853 0.645114 +vt 0.281250 0.000000 +vt 0.343750 0.000000 +vt 0.781250 0.000000 +vt 0.843750 0.000000 +vt 0.593750 0.000000 +vt 0.031250 0.000000 +vt 0.093750 0.000000 +vt 0.906250 0.000000 +vt 0.218750 0.000000 +vt 0.406250 0.000000 +vt 0.468750 0.000000 +vt 0.968750 0.000000 +vt 0.531250 0.000000 +vt 0.156250 0.000000 +vt 0.728582 0.579266 +vt 0.723289 0.552655 +vt 0.807981 0.552655 +vt 0.802687 0.579266 +vt 0.660117 0.607625 +vt 0.645043 0.585066 +vt 0.871152 0.607626 +vt 0.886226 0.585066 +vt 0.886226 0.946022 +vt 0.807981 0.978433 +vt 0.802687 0.951822 +vt 0.871152 0.923462 +vt 0.607716 0.660026 +vt 0.579357 0.728491 +vt 0.552746 0.723198 +vt 0.585156 0.644952 +vt 0.585156 0.886136 +vt 0.607716 0.871062 +vt 0.923553 0.660026 +vt 0.946113 0.644952 +vt 0.951912 0.728491 +vt 0.978523 0.723198 +vt 0.579357 0.802597 +vt 0.552746 0.807890 +vt 0.978523 0.807890 +vt 0.951912 0.802597 +vt 0.946113 0.886136 +vt 0.923553 0.871062 +vt 0.500000 0.500000 +vt 0.256938 0.136232 +vt 0.414648 0.070906 +vt 0.256939 0.863768 +vt 0.136232 0.743062 +vt 0.929094 0.414648 +vt 0.929094 0.585352 +vt 0.585352 0.070906 +vt 0.414649 0.929094 +vt 0.585352 0.929094 +vt 0.863768 0.743062 +vt 0.863768 0.256938 +vt 0.743062 0.863768 +vt 0.070907 0.585353 +vt 0.070906 0.414648 +vt 0.136232 0.256938 +vt 0.743062 0.136232 +vt 1.000000 -0.000000 +vt 1.000000 1.000000 +vt -0.000000 1.000000 +vt -0.000000 -0.000000 +g Cylinder.001_Cylinder.001_sides +s 1 +f 37/1 27/2 26/3 36/4 +f 73/5 38/6 40/7 71/8 +f 14/9 13/10 9/11 10/12 +f 53/13 55/14 83/15 +f 58/16 56/17 83/15 +f 65/18 63/19 83/15 +f 49/20 51/21 83/15 +f 76/22 74/9 33/23 31/24 +f 51/21 53/13 83/15 +f 70/25 41/26 39/27 72/12 +f 6/25 5/28 1/29 2/30 +f 37/1 36/4 47/31 48/32 +f 73/5 75/33 32/34 38/6 +f 8/35 4/36 3/37 7/38 +f 10/12 9/11 5/28 6/25 +f 35/39 46/40 45/41 34/42 +f 49/20 83/15 50/43 +f 70/25 68/30 44/44 41/26 +f 4/45 44/46 42/47 2/48 +f 63/19 60/49 83/15 +f 55/14 57/50 83/15 +f 61/51 64/52 83/15 +f 81/32 82/40 21/53 22/54 +f 80/39 78/55 29/56 23/57 +f 69/35 71/8 40/7 43/58 +f 68/30 66/36 42/59 44/44 +f 78/55 76/22 31/24 29/56 +f 79/1 28/60 30/61 77/2 +f 74/9 72/12 39/27 33/23 +f 8/35 7/38 11/62 12/8 +f 79/1 81/32 22/54 28/60 +f 61/51 83/15 59/63 +f 66/36 69/35 43/58 42/59 +f 57/50 59/63 83/15 +f 60/49 58/16 83/15 +f 82/40 80/39 23/57 21/53 +f 18/22 25/55 24/64 17/65 +f 12/8 11/62 15/66 16/5 +f 20/33 19/67 26/3 27/2 +f 50/43 83/15 52/68 +f 65/18 83/15 64/52 +f 54/69 52/68 83/15 +f 48/32 47/31 45/41 46/40 +f 20/33 16/5 15/66 19/67 +f 1/29 3/37 4/36 2/30 +f 14/9 18/22 17/65 13/10 +f 54/69 83/15 56/17 +f 75/33 77/2 30/61 32/34 +f 35/39 34/42 24/64 25/55 +f 41/70 44/46 4/45 8/71 +f 2/48 42/47 43/72 6/73 +f 35/74 28/75 22/76 46/77 +f 36/78 62/79 84/80 47/81 +f 16/82 33/83 39/84 12/85 +f 37/86 23/87 29/88 27/89 +f 37/86 48/90 21/91 23/87 +f 40/92 10/93 6/73 43/72 +f 38/94 14/95 10/93 40/92 +f 20/96 31/97 33/83 16/82 +f 38/94 32/98 18/99 14/95 +f 93/62 54/100 56/101 91/66 +f 27/89 29/88 31/97 20/96 +f 18/99 32/98 30/102 25/103 +f 12/85 39/84 41/70 8/71 +f 28/75 35/74 25/103 30/102 +f 48/90 46/77 22/76 21/91 +f 94/11 92/10 55/104 53/105 +f 89/67 58/106 60/107 87/3 +f 93/62 95/38 52/108 54/100 +f 86/42 85/41 64/109 61/110 +f 87/3 60/107 63/111 62/4 +f 90/65 57/112 55/104 92/10 +f 97/28 51/113 49/114 96/29 +f 84/31 65/115 64/109 85/41 +f 89/67 91/66 56/101 58/106 +f 50/116 98/37 96/29 49/114 +f 95/38 98/37 50/116 52/108 +f 97/28 94/11 53/105 51/113 +f 86/42 61/110 59/117 88/64 +f 84/31 62/4 63/111 65/115 +f 88/64 59/117 57/112 90/65 +f 98/118 3/119 1/120 96/121 +f 98/118 95/122 7/123 3/119 +f 97/124 96/121 1/120 5/125 +f 34/126 45/127 85/128 86/129 +f 93/130 91/131 15/132 11/133 +f 36/78 26/134 87/135 62/79 +f 94/136 97/124 5/125 9/137 +f 92/138 94/136 9/137 13/139 +f 89/140 19/141 15/132 91/131 +f 92/138 13/139 17/142 90/143 +f 89/140 87/135 26/134 19/141 +f 90/143 17/142 24/144 88/145 +f 93/130 11/133 7/123 95/122 +f 34/126 86/129 88/145 24/144 +f 45/127 47/81 84/80 85/128 +g Cylinder.001_Cylinder.001_dirt +s off +f 67/146 80/147 82/148 +f 67/146 70/149 72/150 +f 67/146 75/151 73/152 +f 67/146 82/148 81/153 +f 68/154 67/146 66/155 +f 67/146 73/152 71/156 +f 67/146 77/157 75/151 +f 67/146 71/156 69/158 +f 67/146 72/150 74/159 +f 67/146 68/154 70/149 +f 67/146 76/160 78/161 +f 67/146 78/161 80/147 +f 67/146 69/158 66/155 +f 67/146 74/159 76/160 +f 67/146 81/153 79/162 +f 67/146 79/162 77/157 +g Cylinder.001_Cylinder.001_plant +f 99/163 100/164 102/165 101/166 +f 103/163 104/164 106/165 105/166 diff --git a/homedecor/textures/homedecor_potted.png b/homedecor/textures/homedecor_potted.png deleted file mode 100644 index ab03d05d5c709388a5dde30e1764ea92194476d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|etpJ}8S0G(utz2fVkZUa0X0O_4 ztCD6QtH;k-XsVE5DC?*ssLaMH!Ne4AudZ{=*Bq$&si%u$h{y4kNxQiY8}PW^)eJDY zQvd30lhgmDvlV<7%wBNr!p>{%qJml1P1VYc+Li59te^Yc``vvyvvK>4CdU&CK7H@n z%&FL1#k~5!vTU6Nw+?6>Q(3TJJ