From da4039e2c5bb5d2f9e4f634269b3cb2f159f15d7 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Wed, 25 Jun 2014 03:57:52 -0400
Subject: [PATCH] add white and "mahogany" "3dforniture" tables, better wood
 texture for "3dforniture" wooden objects

---
 homedecor/furniture.lua                       |  59 +++++++++++-------
 homedecor/textures/forniture_wood.png         | Bin 1124 -> 640 bytes
 .../textures/forniture_wood_mahogany.png      | Bin 0 -> 588 bytes
 homedecor/textures/forniture_wood_white.png   | Bin 0 -> 250 bytes
 4 files changed, 36 insertions(+), 23 deletions(-)
 create mode 100644 homedecor/textures/forniture_wood_mahogany.png
 create mode 100644 homedecor/textures/forniture_wood_white.png

diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua
index f51cfa48..deb9a72b 100644
--- a/homedecor/furniture.lua
+++ b/homedecor/furniture.lua
@@ -1,28 +1,41 @@
 local S = homedecor.gettext
 
--- Test
-minetest.register_node("homedecor:table", {
-    description = S("Table"),
-    tiles = { "forniture_wood.png" },
-    drawtype = "nodebox",
-    paramtype = "light",
-    paramtype2 = "facedir",
-    node_box = {
-        type = "fixed",
-        fixed = {
-            { -0.4, -0.5, -0.4, -0.3,  0.4, -0.3 },
-            {  0.3, -0.5, -0.4,  0.4,  0.4, -0.3 },
-            { -0.4, -0.5,  0.3, -0.3,  0.4,  0.4 },
-            {  0.3, -0.5,  0.3,  0.4,  0.4,  0.4 },
-            { -0.5,  0.4, -0.5,  0.5,  0.5,  0.5 },
-            { -0.4, -0.2, -0.3, -0.3, -0.1,  0.3 },
-            {  0.3, -0.2, -0.4,  0.4, -0.1,  0.3 },
-            { -0.3, -0.2, -0.4,  0.4, -0.1, -0.3 },
-            { -0.3, -0.2,  0.3,  0.3, -0.1,  0.4 },
-        },
-    },
-    groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
-})  
+-- 3dforniture tables ... well, they used to be :P
+
+local table_colors = { "", "mahogany", "white" }
+
+for _, i in ipairs(table_colors) do
+	local color = "_"..i
+	local desc = S("Table ("..i..")")
+
+	if i == "" then
+		color = ""
+		desc = S("Table")
+	end
+
+	minetest.register_node("homedecor:table"..color, {
+		description = desc,
+		tiles = { "forniture_wood"..color..".png" },
+		drawtype = "nodebox",
+		paramtype = "light",
+		paramtype2 = "facedir",
+		node_box = {
+		    type = "fixed",
+		    fixed = {
+		        { -0.4, -0.5, -0.4, -0.3,  0.4, -0.3 },
+		        {  0.3, -0.5, -0.4,  0.4,  0.4, -0.3 },
+		        { -0.4, -0.5,  0.3, -0.3,  0.4,  0.4 },
+		        {  0.3, -0.5,  0.3,  0.4,  0.4,  0.4 },
+		        { -0.5,  0.4, -0.5,  0.5,  0.5,  0.5 },
+		        { -0.4, -0.2, -0.3, -0.3, -0.1,  0.3 },
+		        {  0.3, -0.2, -0.4,  0.4, -0.1,  0.3 },
+		        { -0.3, -0.2, -0.4,  0.4, -0.1, -0.3 },
+		        { -0.3, -0.2,  0.3,  0.3, -0.1,  0.4 },
+		    },
+		},
+		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	})  
+end
 
 minetest.register_node("homedecor:chair", {
     description = S("Chair"),
diff --git a/homedecor/textures/forniture_wood.png b/homedecor/textures/forniture_wood.png
index 5ae119b8a0998cc845f9f25fabef4d28da92c33d..7e44cea5223f0d2e4adddbfbd629dd8178cc674c 100644
GIT binary patch
delta 626
zcmV-&0*(FT2!I8U8Gix*005AYXf^-<0!K+iK~yNu1;I;>6EP3~(6U|rbf-JXWC#)x
z$$}k7a1F$1I2G4n37O@9m>EQVo&LD(vR%9<zI}Zk0$Xdx$)l2-7>p5uj7Fx+%(k{t
z0B4#=YOQd;-<w6Pq_DNkg|*Z~Boqs&({OdGO-hk7p>yAVynpOkf%UQxoRu@tN2QdH
z9VkFm6Q$+u9TzG?igREZoi&TQ1`oe(F(fWoyM?h>a$=G5bjeb~!%-W{DR2(x&?oit
zvBMAdQPlR~ciG(s4UsdMdZ|nWqE<$6q@rBxuclp>VPKIFH1eGN6k;W1v!QvOZ#M>|
zD;9;MFj6Lsi+^xFp*CCucIRNUMD0)|=RlOY00NgZcM_ekC5D&??BZ2-zHrI-5?mTn
z*N+F!`0qTA^K!c(AB13uSqe`vfRHFJxsa5A`*kwLAk<(?7)CC}PaW61XjcH@aDx3}
z1^`!K3Q0MODbD`ZE87B0cDX{troE@cAr~&$n4*oH{eRRCtgQlKRLvXJO08I!mV#%A
zIZ;d${VnC<XAH)=##PI9@-rHThsPr-sg32*`9O$R)r(vx2WF5t`j@yYLoC-JQ3ROq
z<Icty1@*3~m2t;^*T19R;s^!WRb_Ygx6@Uxg^{Q$n?WP!hNk{<8k&YfBmfwK+G;tM
z6i$;oPiw1f>yvsuo~o*P{r0W;^1%Uf%G6y)>-2K7?xPHsn?W&`GWc@2c&+tjyO}&a
z{d!WLKdsNlNokRVoI>UTeO7V2{ppi-_3G6f%X~gh&o7s%X-wPv2eU7Ib^`R%+yDRo
M07*qoM6N<$g4y>hH2?qr

delta 1114
zcmV-g1f~0c1>^{j8Gi!+001a04^sdD00d`2O+f$vv5yP<VFdsH0`yQ!R7IVCRJxK}
zig;AMnPQN4P^pAUjdo79i&l(lKC6mTi+ND3h*XPpPL6d@znEgHhf=A4PLF$0k#tF^
zgH42QP_2eftA0eemt~!FK6_Luka$q9ic+M2Ost7lkakV4gMUY?hftbwJFA6Ek#|sy
zTOo~RFrjunu8mloc0Z0<BAaU|s)kOLXe^#{I+kTKqj@`)Y%r>cQ-n$unP(!2P8z9#
zNT_~EtA|geen*mIDXoD<t&3Wuc|eeNQKfxGk#|w7g;A4XAc;*Hif=}bTp+H9QI%*Z
zoM|kbbUdnvQh$tA9-MPLxu0jAXeOh3NQ6`>u994vZZE5aNU4BJx{p?uW+{hM7?^7=
zjaD3dNG7m}Rik-AmS!fSctDwKHI`>9g-;cabWVRvCXQGdnP@4nhgp<-Q=D-$j#e9Z
zL?)(!POOJfqIyKBgi(!jPJ2ftn{73Xa!$CCV~kW7uYZeIflVl~hfk(^M3Q48jdM$m
zSQ~pqCVN6Cv4u&YbvuxDQIumNjdV|cOC^|SERb3orFlZHf=hcuCbExSjd4t^hfkw=
zMwDkMm0}}@P91(rC9;Q3mtY{1WF(+@Kb2k|e@rNUOeKCyC9aKEq<lq+Z%3<#Q>utq
ztchBXYJWU^N+qa<Q>uwql6F&!Rv5dMV32f9r-V(dhg6<%H-=3ZmuM%hiBzF@MUi<_
zlVKsOhf}3@LzZVKlU*IJgG!EePk&4&t%y;VWF?7F9HDnXjdD$`i&?OXR+C>Nmt!TV
zg;1)8Pl-|=rGHDCZ7z*<PL*CAxRYL}g-?%mP=Ba^N~(oblVm86Un7oNA)0V9h*2A(
zdqRwGOQU*4s)$pidqJ&>SBO#}mv1(eWGIqfBaT@aicuSlS{}HPU#y5zp?W~3f=#Q2
zQH*d%qkTxPi&><6L#TyKmuN1lgix-DR;hwaid7w%XeOtCOp{$Cl42*6c~_KWDwbv?
zrGI}%l4B;5Vkf45Mv`GAs)bRGbxx998<Jrogq1;x0003SNkl<Z7}Eg|0q_0*Ekygh
z%+1)`@AUWe@#o8)053B^jjq1?+1l>%?6*fMB>*lmG(wK4!Ozy)>$plOBpCoWFgYwn
zjH<)V*SSb2As7e%H8wXzYl@qzzqUy$B7YkN008;<LvD$ht;Er~KO-6h0u2B$_-%-o
zufWsfyeIex4+;YSOKgjotisac?aDqJ5DN?k0MyXs-{#@o;OOZ<AQck^0RZ;%>c^&`
zouIqboI4#C5e@+G;>e|OW?^}OqO^ZK9uyJ)-NvMHWlUOBc7~9%eL5c&0LiCxYEw>7
zTU}Fkg_E#;JSG6BaA#LuQeRP3TzG?$v4CU%qxy4bU`<w7V|s-8l##N<0Ec{gZ)s0i
gVs(O*mXDX8wclNTasT}FnE(I)07*qoM6N<$f&miY8UO$Q

diff --git a/homedecor/textures/forniture_wood_mahogany.png b/homedecor/textures/forniture_wood_mahogany.png
new file mode 100644
index 0000000000000000000000000000000000000000..25ab29fb9023768b5278a859767e5935e739679c
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006LNkl<ZD9;7K
z*@`4Z6adh>X5?1Y_ROFo3ciZqN6gRozdnm1B8WCKy;NppM#Nn_2Y>nWlUb<hSsN3k
zCx{@ph@^RDYEeW?_ZA>b^6|sFaUemM3R=L3a5^9*6W$MdShRU~WKsO}pZ=kcTt~`G
zRje(U@U=S-6yoam?blO8*gcLG-EvU*Y9{&p#jRUr$}osZIz~pcdlLWlAF^s%4>wls
znSZ>Hd|yni^w(>=A48!!<}$E63_>CdVPP!W9oAXeVGb@Vm_2LljZ??ct$jHI5yv4R
zLXZHXFyFSWgpeRFcTh&rfe1#43<jjktgWjsQB=$BunfcV;T|b(L1D4qk5=(%=T_Tt
zz4X=*k_8a4_l}56;o*cJ?@LZXvM#K=pYH2$)*1|#sQ|#=2fUL2096PNQju<652Im(
z=Ibbhah`^rXaNx+0*ujHJ!`Tuddf0Sh{%wG%4vaw=FuFE)+3@D_`u^dUnbsr4ovdr
z=Q|U!C}eBhn0Xk-a0_z)h~D3Hj??}<Gu!|`et6L832w8Jtn#$=+x@nJLBKSZ%XNI-
zD;F$?MH!Gpg%69{e$*n}9001}MX`n1c5M5(T&5oQeA`MX-#jk-<HtvUH234Es<N*0
z>Dc#E2zzGjzU?QAT(3)Q_VoFUfBx=q+fHIiglZlECqO@rm)dnG%VkZ-eLugvZe<*0
a9RCMJ8ETp~4Ig;`0000<MNUMnLSTZqdJyaY

literal 0
HcmV?d00001

diff --git a/homedecor/textures/forniture_wood_white.png b/homedecor/textures/forniture_wood_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..02053db63e3f3001a93e1eebadf46a325a826728
GIT binary patch
literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000mG000mO00000I+&on0002NNkl<Z7}Ev8
z>uSP45P;EdW;fZ~M8Wrewo(xMRhp7$;$CKYj(l0D;v#B9+%(D(l68f+UusLgA6dOG
zAv3guzdX<KFb@I-YN$yZyR8dt4!wAN&8NkV%Czq?S!8-8i=U{&AmX{}PrI!q56`M~
zXowi%B4>iu-gf1=(3d{8btHuz(DBGY<1_(4ZWeEVe2coNVzkaM!~xp#&WH=3aI{aY
z!Hz@xFQf0`8!5b{oImC2YdrSEftT&FoLjw3|0{-XLc#?n(EtDd07*qoM6N<$f=?oE
AKmY&$

literal 0
HcmV?d00001