From 72e58b01580bffbbb8fc3b0b79d51cb15f1c55d4 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sun, 26 Apr 2015 22:52:11 -0400
Subject: [PATCH] use mesh node for chimney

---
 homedecor/misc-nodes.lua                      |  15 +---
 homedecor/models/homedecor_chimney.obj        |  72 ++++++++++++++++++
 .../textures/homedecor_chimney_bottom.png     | Bin 178 -> 0 bytes
 .../textures/homedecor_chimney_sides.png      | Bin 414 -> 0 bytes
 homedecor/textures/homedecor_chimney_tb.png   | Bin 0 -> 198 bytes
 homedecor/textures/homedecor_chimney_top.png  | Bin 114 -> 0 bytes
 6 files changed, 75 insertions(+), 12 deletions(-)
 create mode 100644 homedecor/models/homedecor_chimney.obj
 delete mode 100644 homedecor/textures/homedecor_chimney_bottom.png
 delete mode 100644 homedecor/textures/homedecor_chimney_sides.png
 create mode 100644 homedecor/textures/homedecor_chimney_tb.png
 delete mode 100644 homedecor/textures/homedecor_chimney_top.png

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 80161e6bbda817eb28e7341b5b9411d3d6041a78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|m7Xq+AsV804_@Rtq#(lf;Qz_R
zvmIoT7g-huUyjVp4q&<awaE6s!#xM~@mB{2YuuZ9QCqV_d8)|K-EpN4deV85_PG^o
zi*i`AwLy3-qu?4w^>1QFCJ9@d*KC$p!}z?!rlI0&c|p$YJ=2fB|NU~wj*L?8LN4cT
ceAb`Y{|Os4=dO8D3v>j7r>mdKI;Vst07J$_F8}}l

diff --git a/homedecor/textures/homedecor_chimney_sides.png b/homedecor/textures/homedecor_chimney_sides.png
deleted file mode 100644
index 1426927db85e8c83131311198375482b489aff83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0004HNkl<ZD9?S8
zOHaZ;6ovT*fT3ku(ihX8Bp4K0YM;D{7&joVoiSj60)<j)72|@$#Q*1Q-LRQXP9}FT
zUvkbplS*Bjo*)cORVT<E&s(TCZ5mpRXtHbycPxZn9<BTAmBsU2gvO?-=7=`OVF8(C
zCc08eXQ~t>(ezl8OPOfK0*7GdY!`5QzUu|<+FioDJ8ZB3*abn7fg&~Xd6Qwl<WRiB
z0xgyWbz=7hK{n%gDvMYE?1JhHGd0z6oCM}kwSoo0)6rhd?d9wkdiH9zT)(;A`ulvs
z0<g-yQrBZM4+0t}b(4&eB=zvW`#3s!lBx!oZzU8b()3W1Z!%f2P=FpLhH{-w?7<KB
z3unIFJ0Qpdop?w0{nN(+ZCESEwNbIJNE$(QI1V~_uH9k*c+rUB3L{;Kei6%dg~T3e
z6a|7L<M>BG66j%2DPw`H=LF#ac0adYe}2y&U%}4bfG*$s0WjT*&Vv<y#{d8T07*qo
IM6N<$f_1mGc>n+a

diff --git a/homedecor/textures/homedecor_chimney_tb.png b/homedecor/textures/homedecor_chimney_tb.png
new file mode 100644
index 0000000000000000000000000000000000000000..71726f0aaacb4b18a61b51a91f32d19f7cca8d83
GIT binary patch
literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|y`C<PAsXkC6C{2$2+rJGac@rj
z{(55r!@c$Y=XFkedH;WX)1N=_`~RQN(m1lN`r8!G8BM33pLcy`q*%=I<ENpi!Nv^_
zu6%fTS>1<sejw}2fZ8K1D;wKqOD|`Olgk5&?W;Sw^5M6=)ib1AT3ROT)Q}T;@HBRR
wk|aO>_o>;}EiEl7Dk}c}{oQ>v*;$%_L7HDP)zXuR8R#$uPgg&ebxsLQ07~Og_y7O^

literal 0
HcmV?d00001

diff --git a/homedecor/textures/homedecor_chimney_top.png b/homedecor/textures/homedecor_chimney_top.png
deleted file mode 100644
index 8359158e0830fc93576b58df57f569513bda33fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 114
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0T3kK%hWXb<ymZUH{zT
zfP6(y7sn8e=;VY0Y|qXzcgZEN2=Se9Sk%brrf_6i?%`F!3{NFkx2B!czXepx;OXk;
Jvd$@?2>_Ki9(n)(