diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index da8dac0f..663da5d9 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -236,26 +236,11 @@ homedecor.register("cardboard_box", { homedecor.register("dvd_cd_cabinet", { description = "DVD/CD cabinet", + mesh = "homedecor_dvd_cabinet.obj", tiles = { - "homedecor_dvdcd_cabinet_top.png", - "homedecor_dvdcd_cabinet_top.png", - "homedecor_dvdcd_cabinet_sides.png", - "homedecor_dvdcd_cabinet_sides.png^[transformFX", - "homedecor_dvdcd_cabinet_back.png", + "default_wood.png", "homedecor_dvdcd_cabinet_front.png", - }, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0, -0.4375, 0.5, 0.5}, - {0.4375, -0.5, 0, 0.5, 0.5, 0.5}, - {-0.0625, -0.5, 0, 0.0625, 0.5, 0.5}, - {-0.5, 0.4375, 0, 0.5, 0.5, 0.5}, - {-0.5, -0.5, 0, 0.5, -0.4375, 0.5}, - {-0.5, -0.5, 0.0625, 0.5, 0.5, 0.4375}, - {-0.375, -0.5, 0.02756, -0.125, 0.5, 0.5}, - {0.125, -0.5, 0.01217, 0.375, 0.5, 0.5}, - } + "homedecor_dvdcd_cabinet_back.png" }, selection_box = homedecor.nodebox.slab_z(0.5), groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3}, diff --git a/homedecor/models/homedecor_dvd_cabinet.obj b/homedecor/models/homedecor_dvd_cabinet.obj new file mode 100644 index 00000000..09fc2920 --- /dev/null +++ b/homedecor/models/homedecor_dvd_cabinet.obj @@ -0,0 +1,137 @@ +# Blender v2.73 (sub 0) OBJ File: 'dvd-cabinet.blend' +# www.blender.org +o Cylinder +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.000000 +v 0.500000 -0.500000 0.000000 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.000000 +v 0.500000 0.500000 0.000000 +v 0.500000 0.500000 0.500000 +v 0.437500 -0.500000 0.000000 +v 0.437500 -0.500000 0.500000 +v 0.437500 0.500000 0.000000 +v 0.437500 0.500000 0.500000 +v -0.437500 -0.500000 0.500000 +v -0.437500 -0.500000 0.000000 +v -0.437500 0.500000 0.500000 +v -0.437500 0.500000 0.000000 +v -0.437500 0.437500 0.500000 +v -0.437500 0.437500 0.000000 +v 0.437500 0.437500 0.000000 +v 0.437500 0.437500 0.500000 +v 0.437500 -0.437500 0.000000 +v 0.437500 -0.437500 0.500000 +v -0.437500 -0.437500 0.500000 +v -0.437500 -0.437500 0.000000 +v -0.375000 0.437500 0.062500 +v -0.375000 -0.437500 0.062500 +v -0.437500 -0.437500 0.062500 +v 0.437500 -0.437500 0.062500 +v 0.437500 0.437500 0.062500 +v -0.437500 0.437500 0.062500 +v 0.062500 -0.437500 0.000000 +v 0.062500 0.437500 0.000000 +v -0.062500 -0.437500 0.000000 +v -0.062500 0.437500 0.000000 +v 0.375000 -0.437500 0.062500 +v 0.375000 0.437500 0.062500 +v -0.375000 0.437500 0.031250 +v -0.375000 -0.437500 0.031250 +v 0.375000 -0.437500 0.031250 +v 0.375000 0.437500 0.031250 +v 0.125000 -0.437500 0.031250 +v 0.125000 0.437500 0.031250 +v -0.125000 -0.437500 0.031250 +v -0.125000 0.437500 0.031250 +v 0.125000 -0.437500 0.062500 +v 0.125000 0.437500 0.062500 +v -0.125000 -0.437500 0.062500 +v -0.125000 0.437500 0.062500 +v 0.062500 -0.437500 0.062500 +v 0.062500 0.437500 0.062500 +v -0.062500 -0.437500 0.062500 +v -0.062500 0.437500 0.062500 +v 0.062500 0.437500 0.500000 +v 0.062500 -0.437500 0.500000 +v -0.062500 0.437500 0.500000 +v -0.062500 -0.437500 0.500000 +vt 1.000000 0.250000 +vt 1.000000 0.750000 +vt 0.000000 0.750000 +vt 0.000000 0.250000 +vt 0.937500 0.062500 +vt 0.562500 0.062500 +vt 0.437500 0.062500 +vt 0.062500 0.062500 +vt 0.062500 0.000000 +vt 0.937500 0.000000 +vt 0.000000 0.000000 +vt 0.062500 1.000000 +vt 0.000000 1.000000 +vt 0.937500 0.937500 +vt 0.937500 1.000000 +vt 0.062500 0.937500 +vt 0.437500 0.937500 +vt 0.562500 0.937500 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.875000 0.937500 +vt 0.875000 0.062500 +vt 0.125000 0.062500 +vt 0.125000 0.937500 +vt 0.625000 0.937500 +vt 0.625000 0.062500 +vt 0.375000 0.937500 +vt 0.375000 0.062500 +vt 0.812500 0.062500 +vt 0.812500 0.937500 +vt 0.187500 0.937500 +vt 0.187500 0.062500 +vt 0.312500 0.937500 +vt 0.312500 0.062500 +vt 0.687500 0.937500 +vt 0.687500 0.062500 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +g Cylinder_Cylinder_sides +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 7/3/2 8/4/2 4/1/2 3/2/2 +f 1/1/3 2/2/3 3/3/3 4/4/3 +f 8/1/4 7/2/4 6/3/4 5/4/4 +f 24/5/5 33/6/5 31/7/5 21/8/5 9/9/5 14/10/5 +f 3/11/5 9/9/5 11/12/5 7/13/5 +f 18/14/5 16/15/5 11/12/5 19/16/5 32/17/5 34/18/5 +f 2/19/5 6/20/5 16/15/5 14/10/5 +f 5/13/6 1/11/6 13/9/6 15/12/6 +f 4/19/6 8/20/6 12/15/6 10/10/6 +f 17/16/6 20/14/6 12/15/6 15/12/6 +f 23/8/6 13/9/6 10/10/6 22/5/6 +f 24/5/2 18/14/2 30/21/2 27/22/2 +f 19/16/1 21/8/1 28/23/1 29/24/1 +f 30/11/3 18/19/3 19/20/3 29/13/3 +f 24/11/4 27/19/4 28/20/4 21/13/4 +f 52/25/1 34/18/1 33/6/1 51/26/1 +f 33/6/5 34/18/5 32/17/5 31/7/5 +f 50/27/2 49/28/2 31/7/2 32/17/2 +f 56/7/6 54/6/6 53/18/6 55/17/6 +g Cylinder_Cylinder_front +f 27/5/5 30/14/5 25/21/5 26/22/5 +f 36/24/5 29/16/5 28/8/5 35/23/5 +f 37/21/1 38/22/1 26/29/1 25/30/1 +f 40/31/2 36/24/2 35/23/2 39/32/2 +f 42/27/5 40/24/5 39/23/5 41/28/5 +f 43/26/5 38/22/5 37/21/5 44/25/5 +f 46/33/1 42/27/1 41/28/1 45/34/1 +f 44/35/2 48/25/2 47/26/2 43/36/2 +f 50/17/5 46/27/5 45/28/5 49/7/5 +f 48/25/5 52/18/5 51/6/5 47/26/5 +g Cylinder_Cylinder_back +f 23/8/6 56/7/6 55/17/6 17/16/6 +f 54/6/6 22/5/6 20/14/6 53/18/6 diff --git a/homedecor/textures/homedecor_dvdcd_cabinet_back.png b/homedecor/textures/homedecor_dvdcd_cabinet_back.png index ac60f928..f9241083 100644 Binary files a/homedecor/textures/homedecor_dvdcd_cabinet_back.png and b/homedecor/textures/homedecor_dvdcd_cabinet_back.png differ diff --git a/homedecor/textures/homedecor_dvdcd_cabinet_front.png b/homedecor/textures/homedecor_dvdcd_cabinet_front.png index 0b63194a..b155633c 100644 Binary files a/homedecor/textures/homedecor_dvdcd_cabinet_front.png and b/homedecor/textures/homedecor_dvdcd_cabinet_front.png differ diff --git a/homedecor/textures/homedecor_dvdcd_cabinet_sides.png b/homedecor/textures/homedecor_dvdcd_cabinet_sides.png deleted file mode 100644 index 3dea0db3..00000000 Binary files a/homedecor/textures/homedecor_dvdcd_cabinet_sides.png and /dev/null differ diff --git a/homedecor/textures/homedecor_dvdcd_cabinet_top.png b/homedecor/textures/homedecor_dvdcd_cabinet_top.png deleted file mode 100644 index 22d1a382..00000000 Binary files a/homedecor/textures/homedecor_dvdcd_cabinet_top.png and /dev/null differ