diff --git a/homedecor/kitchen_furniture.lua b/homedecor/kitchen_furniture.lua index 960f1015..1ac82d29 100644 --- a/homedecor/kitchen_furniture.lua +++ b/homedecor/kitchen_furniture.lua @@ -53,7 +53,12 @@ homedecor.register("kitchen_cabinet_half", { homedecor.register("kitchen_cabinet_with_sink", { description = S("Kitchen Cabinet with sink"), mesh = "homedecor_kitchen_sink.obj", - tiles = { "homedecor_kitchen_sink.png" }, + tiles = { + "homedecor_kitchen_sink_top.png", + "homedecor_kitchen_cabinet_front.png", + "homedecor_kitchen_cabinet_sides.png", + "homedecor_kitchen_cabinet_bottom.png" + }, groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), infotext=S("Under-sink cabinet"), diff --git a/homedecor/models/homedecor_kitchen_sink.obj b/homedecor/models/homedecor_kitchen_sink.obj index 3244b2a5..d3126d0b 100644 --- a/homedecor/models/homedecor_kitchen_sink.obj +++ b/homedecor/models/homedecor_kitchen_sink.obj @@ -1,6 +1,5 @@ -# Blender v2.69 (sub 0) OBJ File: 'kitchen_sink.blend' +# Blender v2.73 (sub 0) OBJ File: 'kitchen_sink.blend' # www.blender.org -mtllib homedecor_kitchen_sink.mtl o Cube v -0.500000 -0.500000 -0.500000 v 0.500000 -0.500000 -0.500000 @@ -26,83 +25,80 @@ v 0.062500 0.312500 0.062500 v 0.062500 0.312500 -0.062500 v -0.062500 0.312500 0.062500 v -0.062500 0.312500 -0.062500 -vt 0.020833 0.270833 -vt 0.354167 0.270833 -vt 0.354167 0.604167 -vt 0.020833 0.604167 -vt 0.312500 0.937500 +vt 0.468750 0.906250 +vt 0.468750 0.531250 +vt 0.531250 0.468750 +vt 0.531250 0.968750 +vt 0.031250 0.968750 +vt 0.093750 0.906250 +vt 0.031250 0.468750 +vt 0.093750 0.531250 +vt 0.812500 0.500000 +vt 0.812500 0.937500 +vt 0.781250 0.937500 +vt 0.781250 0.500000 +vt 0.687500 0.500000 +vt 0.718750 0.500000 +vt 0.718750 0.937500 +vt 0.687500 0.937500 +vt 0.906250 0.500000 +vt 0.906250 0.937500 +vt 0.875000 0.937500 +vt 0.875000 0.500000 +vt 0.593750 0.500000 +vt 0.625000 0.500000 +vt 0.625000 0.937500 +vt 0.593750 0.937500 +vt 0.312500 0.750000 vt 0.312500 0.687500 -vt 0.354167 0.645833 -vt 0.354167 0.979167 -vt 0.020833 0.979167 -vt 0.062500 0.937500 -vt 0.020833 0.645833 -vt 0.062500 0.687500 -vt 0.395833 0.270833 -vt 0.729167 0.270833 -vt 0.729167 0.604167 -vt 0.395833 0.604167 -vt 0.395833 0.645833 -vt 0.729167 0.645833 -vt 0.729167 0.979167 -vt 0.395833 0.979167 -vt 0.916667 0.666667 -vt 0.916667 0.958333 -vt 0.895833 0.958333 -vt 0.895833 0.666667 -vt 0.833333 0.666667 -vt 0.854167 0.666667 -vt 0.854167 0.958333 -vt 0.833333 0.958333 -vt 0.979167 0.666667 -vt 0.979167 0.958333 -vt 0.958333 0.958333 -vt 0.958333 0.666667 -vt 0.770833 0.666667 -vt 0.791667 0.666667 -vt 0.791667 0.958333 -vt 0.770833 0.958333 -vt 0.207755 0.832755 -vt 0.207755 0.792245 -vt 0.167245 0.792245 -vt 0.167245 0.832755 -vt 0.770833 0.604167 -vt 0.770833 0.562500 -vt 0.791667 0.562500 -vt 0.791667 0.604167 -vt 0.791667 0.625000 -vt 0.833333 0.604167 -vt 0.833333 0.625000 -vt 0.833333 0.562500 -vt 0.854167 0.562500 -vt 0.854167 0.604167 -vt 0.791667 0.541667 -vt 0.833333 0.541667 -vt 0.166667 0.791667 -vt 0.208333 0.791667 -vt 0.208333 0.833333 -vt 0.166667 0.833333 -usemtl Material +vt 0.250000 0.687500 +vt 0.250000 0.750000 +vt 0.218750 0.375000 +vt 0.218750 0.312500 +vt 0.250000 0.312500 +vt 0.250000 0.375000 +vt 0.250000 0.406250 +vt 0.312500 0.375000 +vt 0.312500 0.406250 +vt 0.312500 0.312500 +vt 0.343750 0.312500 +vt 0.343750 0.375000 +vt 0.250000 0.281250 +vt 0.312500 0.281250 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 -0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +g Cube_Cube_top s off -f 1/1 2/2 3/3 4/4 -f 9/5 10/6 6/7 5/8 -f 5/8 8/9 12/10 9/5 -f 7/11 6/7 10/6 11/12 -f 8/9 7/11 11/12 12/10 -f 1/13 4/14 5/15 6/16 -f 2/17 1/18 6/19 7/20 -f 2/14 7/15 8/16 3/13 -f 4/13 3/14 8/15 5/16 -f 15/21 16/22 12/23 11/24 -f 16/25 13/26 9/27 12/28 -f 13/29 14/30 10/31 9/32 -f 14/33 15/34 11/35 10/36 -f 13/6 16/5 18/37 20/38 -f 19/39 14/12 13/6 20/38 -f 17/40 15/10 14/12 19/39 -f 16/5 15/10 17/40 18/37 -f 17/41 22/42 21/43 18/44 -f 18/45 21/44 23/46 20/47 -f 20/46 23/48 24/49 19/50 -f 19/43 24/51 22/52 17/48 -f 24/53 23/54 21/55 22/56 +f 9/1/1 10/2/1 6/3/1 5/4/1 +f 5/4/1 8/5/1 12/6/1 9/1/1 +f 7/7/1 6/3/1 10/2/1 11/8/1 +f 8/5/1 7/7/1 11/8/1 12/6/1 +f 15/9/2 16/10/2 12/11/2 11/12/2 +f 16/13/3 13/14/3 9/15/3 12/16/3 +f 13/17/4 14/18/4 10/19/4 9/20/4 +f 14/21/5 15/22/5 11/23/5 10/24/5 +f 13/2/1 16/1/1 18/25/1 20/26/1 +f 19/27/1 14/8/1 13/2/1 20/26/1 +f 17/28/1 15/6/1 14/8/1 19/27/1 +f 16/1/1 15/6/1 17/28/1 18/25/1 +f 17/29/2 22/30/2 21/31/2 18/32/2 +f 18/33/3 21/32/3 23/34/3 20/35/3 +f 20/34/4 23/36/4 24/37/4 19/38/4 +f 19/31/5 24/39/5 22/40/5 17/36/5 +f 24/27/1 23/26/1 21/25/1 22/28/1 +g Cube_Cube_front +f 2/41/3 1/42/3 6/43/3 7/44/3 +g Cube_Cube_sides +f 1/41/2 4/42/2 5/43/2 6/44/2 +f 2/42/4 7/43/4 8/44/4 3/41/4 +f 4/41/5 3/42/5 8/43/5 5/44/5 +g Cube_Cube_bottom +f 1/43/6 2/44/6 3/41/6 4/42/6 diff --git a/homedecor/textures/homedecor_kitchen_sink.png b/homedecor/textures/homedecor_kitchen_sink.png deleted file mode 100644 index 7f30406a..00000000 Binary files a/homedecor/textures/homedecor_kitchen_sink.png and /dev/null differ diff --git a/homedecor/textures/homedecor_kitchen_sink_top.png b/homedecor/textures/homedecor_kitchen_sink_top.png new file mode 100644 index 00000000..82d185c4 Binary files /dev/null and b/homedecor/textures/homedecor_kitchen_sink_top.png differ