From 05d41327d7608c9849ddb92a63ebfb22b72f1bfa Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Thu, 7 May 2015 18:05:46 -0400 Subject: [PATCH] use mesh node for Air conditioner (to get rid of the "metal" top face where there should be glass) --- homedecor/climate-control.lua | 18 ++---- homedecor/models/homedecor_ac.obj | 75 ++++++++++++++++++++++ homedecor/textures/homedecor_ac.png | Bin 0 -> 317 bytes homedecor/textures/homedecor_ac_back.png | Bin 141 -> 0 bytes homedecor/textures/homedecor_ac_front.png | Bin 203 -> 0 bytes homedecor/textures/homedecor_ac_sides.png | Bin 146 -> 0 bytes homedecor/textures/homedecor_ac_tb.png | Bin 110 -> 0 bytes 7 files changed, 80 insertions(+), 13 deletions(-) create mode 100644 homedecor/models/homedecor_ac.obj create mode 100644 homedecor/textures/homedecor_ac.png delete mode 100644 homedecor/textures/homedecor_ac_back.png delete mode 100644 homedecor/textures/homedecor_ac_front.png delete mode 100644 homedecor/textures/homedecor_ac_sides.png delete mode 100644 homedecor/textures/homedecor_ac_tb.png 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 0000000000000000000000000000000000000000..f7edf962944a65094087aca81de6caa90f1ae8f0 GIT binary patch literal 317 zcmV-D0mA-?P)VO<(zBko2J21%AzO;A${M!GNp8yrso6380VZZrfDFAKmhRFbVA6X za~uaD6a)dB2R;mrS+D$D#I|kAvMv}P02qeh2R2PJ3`5WJ;1cj#h3mS@vcOd!_+xy& zfl-#Fey+!HjG{;gp{bwe+1U5}R5Q~w)nC8sI()X70FdW-UDt6OzvV2;?iAeypU~uW zUG;m=wyp2`+qUU9AD`Xm@p$NqlO(y1{Qm~HX_{02`{|e}rS2Qt2EW4>=T@Z^MHfIU P00000NkvXXu0mjfPn?hx literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_ac_back.png b/homedecor/textures/homedecor_ac_back.png deleted file mode 100644 index 9a1e976a06f3230542824d1b98311aad417eca2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`A)YRdAr_~Te|&lQzusvEBS*oh zgCY}{3#2~$x6gB)_;iC*!+F<;t3gM(m$1on?fNg$AZ?!Kz>|@a^G9Ap#Koxg*_oMv p%x#^F3yv@(O=vdHyYoYyA&bX%>voPcoj~&$JYD@<);T3K0RUa|FzQ_RodOqh3$wF%;05613skyk~Qa_k6d`TzkLap224>4^73EhM-g82cC%v z3M9uU%=yhQr?`9Jbjv+^59S_NKac4_dV-;nrfS@ZoNGrJOs{GKUB}?*>gTe~DWM4f D9(hoi diff --git a/homedecor/textures/homedecor_ac_sides.png b/homedecor/textures/homedecor_ac_sides.png deleted file mode 100644 index f95b9d1376f864951b9da6c28838fd1bd25fa918..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k)AG&Ar_~Te|&lQzusvEBS*oh zgCY}{3#2~$x6gB)_;iC*!+F<;t3gM(m$1on?Yh6e{{R0UAC)72oS3NmU(%sR-GAPM v*7EoFY_kp+7&1(eaNsHWuqpNQKW2v5g->ri?7H_6XbFR-tDnm{r-UW|svtW6 diff --git a/homedecor/textures/homedecor_ac_tb.png b/homedecor/textures/homedecor_ac_tb.png deleted file mode 100644 index af0f3da6a3929d126d21b7cfe4afb5dd1b097ca6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWUAAo5?%lhO969pj$&-&C zKmPvxTcWN;8z?L8>Eal|A)Cze^8f?We~G#5Qx