diff --git a/homedecor/climate-control.lua b/homedecor/climate-control.lua index a99d231c..dc3dbc43 100644 --- a/homedecor/climate-control.lua +++ b/homedecor/climate-control.lua @@ -4,21 +4,13 @@ local S = homedecor.gettext homedecor.register("air_conditioner", { description = S("Air Conditioner"), - tiles = { 'homedecor_ac_tb.png', - 'homedecor_ac_tb.png', - 'homedecor_ac_sides.png', - 'homedecor_ac_sides.png', - 'homedecor_ac_back.png', - 'homedecor_ac_front.png'}, + mesh = "homedecor_ac.obj", + tiles = { + "homedecor_ac.png", + "default_glass.png" + }, groups = { snappy = 3 }, sounds = default.node_sound_leaves_defaults(), - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.124, 0.5 }, -- off by just a tad to force the adjoining faces to be drawn. - {-0.5, 0.125, -0.5, 0.5, 0.5, 0.5 }, - } - }, selection_box = { type="regular" }, }) diff --git a/homedecor/models/homedecor_ac.obj b/homedecor/models/homedecor_ac.obj new file mode 100644 index 00000000..959aa915 --- /dev/null +++ b/homedecor/models/homedecor_ac.obj @@ -0,0 +1,75 @@ +# Blender v2.73 (sub 0) OBJ File: 'ac.blend' +# www.blender.org +o Cylinder +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.125000 0.500000 +v -0.500000 0.125000 -0.500000 +v 0.500000 0.125000 -0.500000 +v 0.500000 0.125000 0.500000 +v -0.500000 0.125001 0.500000 +v -0.500000 0.125001 -0.500000 +v 0.500000 0.125001 -0.500000 +v 0.500000 0.125001 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 -0.500000 +v 0.500000 0.500000 -0.500000 +v 0.500000 0.500000 0.500000 +v -0.500000 0.374999 0.500000 +v -0.500000 0.250001 -0.500000 +v 0.500000 0.250001 -0.500000 +v 0.500000 0.250001 0.500000 +v -0.500000 0.250001 0.500000 +v -0.500000 0.374999 -0.500000 +v 0.500000 0.374999 -0.500000 +v 0.500000 0.374999 0.500000 +vt 1.000000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.687500 +vt 1.000000 0.687500 +vt 0.000000 1.000000 +vt 0.000000 0.687500 +vt 0.500000 0.375000 +vt 1.000000 0.375000 +vt 0.000000 0.187500 +vt 0.500000 0.187500 +vt 1.000000 0.125000 +vt 0.000000 0.125000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt -0.000000 0.750000 +vt -0.000000 0.625000 +vt 1.000000 0.625000 +vt 1.000000 0.750000 +vt -0.000000 0.875000 +vt 1.000000 0.875000 +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 +vn 0.000000 1.000000 0.000000 +g Cylinder_Cylinder_main +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 6/2/2 7/5/2 3/6/2 2/3/2 +f 7/1/3 8/2/3 4/3/3 3/4/3 +f 8/4/4 5/3/4 1/7/4 4/8/4 +f 1/6/5 2/9/5 3/10/5 4/3/5 +f 8/10/6 7/3/6 6/6/6 5/9/6 +g Cylinder_Cylinder_glass-tb +f 21/11/1 18/12/1 10/13/1 9/14/1 +f 18/11/2 19/12/2 11/13/2 10/14/2 +f 19/11/3 20/12/3 12/13/3 11/14/3 +f 20/11/4 21/12/4 9/13/4 12/14/4 +f 16/13/6 15/14/6 14/1/6 13/5/6 +f 24/15/3 20/16/3 19/17/3 23/18/3 +f 23/15/2 19/16/2 18/17/2 22/18/2 +f 22/15/1 18/16/1 21/17/1 17/18/1 +f 13/1/1 14/5/1 22/19/1 17/20/1 +f 14/1/2 15/5/2 23/19/2 22/20/2 +f 15/1/3 16/5/3 24/19/3 23/20/3 +f 16/1/4 13/5/4 17/19/4 24/20/4 +f 21/16/4 20/17/4 24/18/4 17/15/4 diff --git a/homedecor/textures/homedecor_ac.png b/homedecor/textures/homedecor_ac.png new file mode 100644 index 00000000..f7edf962 Binary files /dev/null and b/homedecor/textures/homedecor_ac.png differ diff --git a/homedecor/textures/homedecor_ac_back.png b/homedecor/textures/homedecor_ac_back.png deleted file mode 100644 index 9a1e976a..00000000 Binary files a/homedecor/textures/homedecor_ac_back.png and /dev/null differ diff --git a/homedecor/textures/homedecor_ac_front.png b/homedecor/textures/homedecor_ac_front.png deleted file mode 100644 index f377bb58..00000000 Binary files a/homedecor/textures/homedecor_ac_front.png and /dev/null differ diff --git a/homedecor/textures/homedecor_ac_sides.png b/homedecor/textures/homedecor_ac_sides.png deleted file mode 100644 index f95b9d13..00000000 Binary files a/homedecor/textures/homedecor_ac_sides.png and /dev/null differ diff --git a/homedecor/textures/homedecor_ac_tb.png b/homedecor/textures/homedecor_ac_tb.png deleted file mode 100644 index af0f3da6..00000000 Binary files a/homedecor/textures/homedecor_ac_tb.png and /dev/null differ