From 7f7ba92bc8e72d7f2eeeb9794bea06576a78c869 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sun, 26 Apr 2015 23:23:45 -0400
Subject: [PATCH] use mesh node for cd/dvd cabinet

---
 homedecor/misc-nodes.lua                      |  21 +--
 homedecor/models/homedecor_dvd_cabinet.obj    | 137 ++++++++++++++++++
 .../textures/homedecor_dvdcd_cabinet_back.png | Bin 515 -> 501 bytes
 .../homedecor_dvdcd_cabinet_front.png         | Bin 625 -> 705 bytes
 .../homedecor_dvdcd_cabinet_sides.png         | Bin 151 -> 0 bytes
 .../textures/homedecor_dvdcd_cabinet_top.png  | Bin 171 -> 0 bytes
 6 files changed, 140 insertions(+), 18 deletions(-)
 create mode 100644 homedecor/models/homedecor_dvd_cabinet.obj
 delete mode 100644 homedecor/textures/homedecor_dvdcd_cabinet_sides.png
 delete mode 100644 homedecor/textures/homedecor_dvdcd_cabinet_top.png

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 ac60f928d535c27dbfb57ebc43a73f96c82691c0..f9241083218589b6fece566c752ac4f5009c7eb5 100644
GIT binary patch
delta 302
zcmV+}0nz@01oZ=uBnaV9OjJbx005CGSCNAu5{Ze4ii(PijEs$qjgOCykdTm(ygz@l
zv$M3cw6?akx3{;sxw*W&yu`%BXTX(O0002bNkl<Z7}I5r*;c|p5JXFM5s0!WJ17JK
zfn+9R$TGt=BI5slkR5n~dg(s5>r^%Hp!WAcMh&2M`Z?`rBJ(*B(f|yprB^0U5-N7{
zK+WeoY!axucJwy@UfGJP4+1R}3RZsvp8CVFnIlkMIwGh5U9}PJGlBfvSz5FdSr8>{
zsInE~<f!S(<+n>9HF5pm9e7h(?~|4nPpo<JN4$%}I)RRIEUyhz9D6n`5HReSInL5S
zZ*QT7A0N*hAUzs=C2h!>^Mys$>P8-}p?CTRb><qd%7ub_00000NkvXXu0jG}f)aX(
A<NyEw

delta 317
zcmV-D0mA<E1A_#RBn9eFOjJdYELQ_yODvItAsC2hH;IXfii(PijEs$qjgOCykdTm(
zb3~E0KYy}|QnRzOw6wIgwzjvox4F5wyu7@`#Kejlh)n<h0MtoDK~xwS1;N`+gFqBO
z(Ou@ifnIF2hSW4feKPI;|Ba6rW5Ci%CbTn52iKY%uv?(46^A;K>T=vZEWfCJcW<wc
ztqRSj*=C-)AJkoM2zjZ|-ay=d7A_(8-L!u}?|)%Ll1fNdA$&I<{I!Yn9fCa@Re}Ax
zpS(dDe>X!Ip|fgaiLl5+nx#-YDU*_L>5XIsW%SNnJyI4M6a5Wh3?W8@&AfMu1xz-K
zlWhdsjq%*V>Uj*D5SVA04R!USBx;dnIH$9CTC?7z>C`ei02R~~)ByiZFl3a)W?(1)
P015yANkvXXu0mjfPOFq1

diff --git a/homedecor/textures/homedecor_dvdcd_cabinet_front.png b/homedecor/textures/homedecor_dvdcd_cabinet_front.png
index 0b63194ac089a8543622b8178a52ee341c99a65a..b155633c71e72798a0d5d2283353f4f7df7efed5 100644
GIT binary patch
delta 692
zcmV;l0!#hz1i=N68Gi!+001a04^sdD0ijS#R7C&)06RN7JUl!-Jv~7|K}AJHM@L6V
zNl8mfOH52mO-)TsPEJrzP*G7)Qc_Y=Q&Ut_R8>_~R#sM5S65kCSz20JTU%RPTwGmU
zU0z;ZVPRoyV`y$>WVBG7bZumyV2x{ZYJqKbbaQBQbaabtf`651l!9_~e{^$;X}ytZ
zrh9j3igb91cx82ai-UKKfq8*`dVq{|kBxVJmUeWRaHv>@kb`@Gk9Uc^XQYmJhk1X2
zo^qCXe~G<mqKSHzZ-a}DdWnj9mWY6CeuQS8d}eloq`YmvntHCYalw~)#k6#zsdd4T
zeZ#1CyOe&$Yk!cPX^^R;goUAlnuLq6#e1BHjh<wjc6F7Gd6So7nwn{weW-?~e3p)Z
zlBcnUj<$$;m5s4{ntpzmjf;}2qmX@nn3;f<s+5$TU#Ez?jd*3Hi@=JMil1qWn690c
zsFk2*XRC^EsFAFiaG9WVyq0*an{|VwkfEVxxtM*PrGI6&o@2q9bBwEJkffr1teL%^
zWpuQ6wxEb-w7r71ingkpgTI$`!NG{e#+S#l$;E}m$A_u^#bN*e0NY7KK~xyiV_?7l
z?D;u~5xfixoR#H8@j^fWCIuxO7oY&INl;^_Bv63Y)+;(sl!1XiuA(Fpq=G#otFTU(
zfkCjes(-#(1Sr5LEhFc|2{a=tDk&YLf<s=#DjZ~nqn^GQJ5YelSxe254`_z3w}+bm
zP=G~I+sGWKh1=c7&l6+@mxG~QC{TvoHKC<T94Nq_7Mxrw#=sz!8|!b%3^KH)I3*Bh
z246sAK?6TffG4%Axm5zFB0I!FmKEgErndGDDJ`H`2FmKj+#oYFG*zvEN`+!<bnRI&
aJr4j54krafMHY$x0000<MNUMnLSTZ)+&xAB

delta 611
zcmV-p0-XK91@Q!s8Gix*005AYXf^-<0ys%TK~yNuO_Ezv+E5V3{Xl*11M=WZ8OA{w
z?iNKVm5b5RS~(#QBwT_L5`w`(fT$4_3tsBf%FyW)#xfmn`mMUm$)K5i*t478?*7l7
z8IE`jwq|-&j=Y)L55WdO?BgG%&J5({=jW@<Ab(2iDop%K&3|gOLJ(|WVL`nNoSlVk
zmF*r!yId~7Ccy0M>=xQYk&Qwupza1S0L8#*Y<JFBrPt*CjrP1=uLeM3K%95cMQ6W#
zB6pUTmoZ?s+wb$GU-e{Pj`hVDba)==U7HJB3frABbK6*2T7n=Hb2^>hj>w<t`rtG$
zR3dJ-8{!i{r+?Fh*Ec=}{V43`(jQ=S41nW5juJ;nrY=@0Ds<2QlgZRv6NPX#p30Eb
z64n3!I6N)0l$eQU*hCrznE;S58jVaYn4pO44q1xjZ8jSQKtqT6eMJr*J`elhM~B0q
z0dsS6nQ)XxF_B^psKRt4v)QcBcje^Y3Nx<7N16smEPpO8mgqu}JSfmIC#tv-zKkf_
zs*3l$>*LW=-sACT8lZJrzRn5Xg~J=Eb-uE)f&p-f^}EbrdrLZbyD#bW`e)I_n^2>P
zE~I2Dw}&-=!AD3}?-eC<!=o+*b+yG=ES6Ng!Cp$)9?w43R##W29scl@QQ~+IYIQ9q
z27}>w(_EqMfE*6F@woQ%;Pd%lqYwve44p;@rBFnUBDjMIfUi#=2IbAKRidKq$Z*5}
xY-(37#Zv_`A$(#5tpk3v*zhFyA-(ip+J7T=XO<E}Z}9*C002ovPDHLkV1hq>B!mC}

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

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=7*(nhD-I9hv46i(NK#
z2W^-kF9;NM@N{tu;fPL7U|@0%7ETm6EAT>U4NvL}je`<e32qZs8n-M=dBv4zanNOg
ugq~7>8;6>+WbZ?s$whpPH}Y6g7#OZ6@yXnks<;6(i^0>?&t;ucLK6T7I4WZR

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

literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bjds^e@Yd<bG@n@PvZ*^r
ze(ys&pj5c0i(?3ftn9%?K_^8XmxJ!?DO;Mjc~9JI`12)xvSiuC)8G6Im6{9_t55c-
z{*Dg4QtA?=%X{SLs`<Co?%pfy;QkQy*=@Dns#hCJ3oaKPn&EQ9#X7hC3;Ps%5e0$A
S-8+C*FnGH9xvX<aXaWGr>ONBd