diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index d1c598ac..da8dac0f 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -117,19 +117,10 @@ end homedecor.register("chimney", { description = "Chimney", + mesh = "homedecor_chimney.obj", tiles = { - "homedecor_chimney_top.png", - "homedecor_chimney_bottom.png", - "homedecor_chimney_sides.png", - }, - node_box = { - type = "fixed", - fixed = { - {-0.25, -0.5, -0.25, 0.25, 0.5, -0.1875}, - {-0.25, -0.5, 0.1875, 0.25, 0.5, 0.25}, - {-0.25, -0.5, -0.25, -0.1875, 0.5, 0.25}, - {0.1875, -0.5, -0.25, 0.25, 0.5, 0.25}, - } + "homedecor_chimney_tb.png", + "default_brick.png" }, selection_box = homedecor.nodebox.bar_y(0.25), groups = {cracky=3}, diff --git a/homedecor/models/homedecor_chimney.obj b/homedecor/models/homedecor_chimney.obj new file mode 100644 index 00000000..a73de3bd --- /dev/null +++ b/homedecor/models/homedecor_chimney.obj @@ -0,0 +1,72 @@ +# Blender v2.73 (sub 0) OBJ File: 'chimney.blend' +# www.blender.org +o Cylinder +v -0.250000 -0.500000 0.250000 +v -0.250000 -0.500000 -0.250000 +v 0.250000 -0.500000 -0.250000 +v 0.250000 -0.500000 0.250000 +v -0.250000 0.500000 0.250000 +v -0.250000 0.500000 -0.250000 +v 0.250000 0.500000 -0.250000 +v 0.250000 0.500000 0.250000 +v -0.187500 -0.500000 0.187500 +v -0.187500 0.500000 0.187500 +v 0.187500 -0.500000 0.187500 +v 0.187500 0.500000 0.187500 +v 0.187500 -0.500000 -0.187500 +v 0.187500 0.500000 -0.187500 +v -0.187500 -0.500000 -0.187500 +v -0.187500 0.500000 -0.187500 +v 0.250000 -0.500000 0.187500 +v 0.250000 0.500000 0.187500 +v 0.250000 -0.500000 -0.187500 +v 0.250000 0.500000 -0.187500 +v -0.250000 -0.500000 0.187500 +v -0.250000 0.500000 0.187500 +v -0.250000 -0.500000 -0.187500 +v -0.250000 0.500000 -0.187500 +vt 0.750000 0.687500 +vt 0.687500 0.687500 +vt 0.687500 0.312500 +vt 0.750000 0.312500 +vt 0.750000 0.250000 +vt 0.250000 0.312500 +vt 0.250000 0.250000 +vt 0.750000 0.750000 +vt 0.250000 0.750000 +vt 0.250000 0.687500 +vt 0.312500 0.687500 +vt 0.312500 0.312500 +vt 0.687500 1.000000 +vt 0.187500 1.000000 +vt 0.187500 0.000000 +vt 0.687500 0.000000 +vt 0.750000 0.000000 +vt 0.750000 1.000000 +vt 0.375000 1.000000 +vt 0.375000 0.000000 +vn 0.000000 1.000000 0.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 +g Cylinder_Cylinder_top-bottom +s off +f 20/1/1 14/2/1 12/3/1 18/4/1 +f 8/5/1 18/4/1 22/6/1 5/7/1 +f 20/1/1 7/8/1 6/9/1 24/10/1 +f 16/11/1 24/10/1 22/6/1 10/12/1 +f 23/6/2 15/12/2 9/11/2 21/10/2 +f 13/3/2 19/4/2 17/1/2 11/2/2 +f 17/1/2 4/8/2 1/9/2 21/10/2 +f 3/5/2 19/4/2 23/6/2 2/7/2 +g Cylinder_Cylinder_sides +f 5/13/3 6/14/3 2/15/3 1/16/3 +f 6/13/4 7/14/4 3/15/4 2/16/4 +f 7/13/5 8/14/5 4/15/5 3/16/5 +f 8/13/6 5/14/6 1/15/6 4/16/6 +f 11/17/3 12/18/3 14/19/3 13/20/3 +f 10/19/5 9/20/5 15/17/5 16/18/5 +f 9/17/4 10/18/4 12/19/4 11/20/4 +f 13/17/6 14/18/6 16/19/6 15/20/6 diff --git a/homedecor/textures/homedecor_chimney_bottom.png b/homedecor/textures/homedecor_chimney_bottom.png deleted file mode 100644 index 80161e6b..00000000 Binary files a/homedecor/textures/homedecor_chimney_bottom.png and /dev/null differ diff --git a/homedecor/textures/homedecor_chimney_sides.png b/homedecor/textures/homedecor_chimney_sides.png deleted file mode 100644 index 1426927d..00000000 Binary files a/homedecor/textures/homedecor_chimney_sides.png and /dev/null differ diff --git a/homedecor/textures/homedecor_chimney_tb.png b/homedecor/textures/homedecor_chimney_tb.png new file mode 100644 index 00000000..71726f0a Binary files /dev/null and b/homedecor/textures/homedecor_chimney_tb.png differ diff --git a/homedecor/textures/homedecor_chimney_top.png b/homedecor/textures/homedecor_chimney_top.png deleted file mode 100644 index 8359158e..00000000 Binary files a/homedecor/textures/homedecor_chimney_top.png and /dev/null differ