From ec83040d106a2010190c990f62459e7f5b4e5f41 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Fri, 16 Jun 2017 16:14:02 -0400 Subject: [PATCH] use soft overlays for bathroom tiles instead of the two-layer mesh node --- homedecor/bathroom_furniture.lua | 24 +++++----- .../models/homedecor_block_with_overlay.obj | 44 ------------------ .../textures/homedecor_bathroom_tiles_bg.png | Bin 202 -> 219 bytes .../textures/homedecor_bathroom_tiles_fg.png | Bin 259 -> 248 bytes 4 files changed, 12 insertions(+), 56 deletions(-) delete mode 100644 homedecor/models/homedecor_block_with_overlay.obj diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua index 8980422e..2f57ddbf 100644 --- a/homedecor/bathroom_furniture.lua +++ b/homedecor/bathroom_furniture.lua @@ -4,11 +4,11 @@ local S = homedecor_i18n.gettext minetest.register_node("homedecor:bathroom_tiles_dark", { description = S("Bathroom/kitchen tiles (dark)"), tiles = { - { name = "homedecor_bathroom_tiles_bg.png", color = 0xff606060 }, - "homedecor_bathroom_tiles_fg.png" + "homedecor_bathroom_tiles_bg.png" + }, + overlay_tiles = { + { name = "homedecor_bathroom_tiles_fg.png", color = 0xff606060 }, }, - drawtype = "mesh", - mesh = "homedecor_block_with_overlay.obj", paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", @@ -23,11 +23,11 @@ minetest.register_node("homedecor:bathroom_tiles_dark", { minetest.register_node("homedecor:bathroom_tiles_medium", { description = S("Bathroom/kitchen tiles (medium)"), tiles = { - { name = "homedecor_bathroom_tiles_bg.png", color = 0xffc0c0c0 }, - "homedecor_bathroom_tiles_fg.png" + "homedecor_bathroom_tiles_bg.png" + }, + overlay_tiles = { + { name = "homedecor_bathroom_tiles_fg.png", color = 0xffc0c0c0 }, }, - drawtype = "mesh", - mesh = "homedecor_block_with_overlay.obj", paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", @@ -42,11 +42,11 @@ minetest.register_node("homedecor:bathroom_tiles_medium", { minetest.register_node("homedecor:bathroom_tiles_light", { description = S("Bathroom/kitchen tiles (light)"), tiles = { - { name = "homedecor_bathroom_tiles_bg.png", color = 0xffffffff }, - "homedecor_bathroom_tiles_fg.png" + "homedecor_bathroom_tiles_bg.png" + }, + overlay_tiles = { + { name = "homedecor_bathroom_tiles_fg.png", color = 0xffffffff }, }, - drawtype = "mesh", - mesh = "homedecor_block_with_overlay.obj", paramtype = "light", paramtype2 = "color", palette = "unifieddyes_palette_extended.png", diff --git a/homedecor/models/homedecor_block_with_overlay.obj b/homedecor/models/homedecor_block_with_overlay.obj deleted file mode 100644 index 9c70760f..00000000 --- a/homedecor/models/homedecor_block_with_overlay.obj +++ /dev/null @@ -1,44 +0,0 @@ -# Blender v2.72 (sub 0) OBJ File: 'unifiedbricks_brick_block.blend' -# www.blender.org -o Cube -v 0.496092 0.496092 0.496092 -v 0.496092 0.496092 -0.496092 -v -0.496092 0.496092 -0.496092 -v -0.496092 0.496092 0.496092 -v 0.496092 -0.496092 0.496092 -v 0.496092 -0.496092 -0.496092 -v -0.496092 -0.496092 -0.496092 -v -0.496092 -0.496092 0.496092 -v 0.499750 0.499750 0.499750 -v 0.499750 0.499750 -0.499750 -v -0.499750 0.499750 -0.499750 -v -0.499750 0.499750 0.499750 -v 0.499750 -0.499750 0.499750 -v 0.499750 -0.499750 -0.499750 -v -0.499750 -0.499750 -0.499750 -v -0.499750 -0.499750 0.499750 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn -1.000000 0.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 0.000000 0.000000 1.000000 -g Cube_Cube_base -s off -f 8/1/1 7/2/1 6/3/1 5/4/1 -f 4/2/2 3/3/2 7/4/2 8/1/2 -f 1/3/3 2/4/3 3/1/3 4/2/3 -f 2/2/4 1/3/4 5/4/4 6/1/4 -f 3/2/5 2/3/5 6/4/5 7/1/5 -f 1/2/6 4/3/6 8/4/6 5/1/6 -g Cube_Cube_overlay -f 16/1/1 15/2/1 14/3/1 13/4/1 -f 12/2/2 11/3/2 15/4/2 16/1/2 -f 9/3/3 10/4/3 11/1/3 12/2/3 -f 10/2/4 9/3/4 13/4/4 14/1/4 -f 11/2/5 10/3/5 14/4/5 15/1/5 -f 9/2/6 12/3/6 16/4/6 13/1/6 diff --git a/homedecor/textures/homedecor_bathroom_tiles_bg.png b/homedecor/textures/homedecor_bathroom_tiles_bg.png index b8a31573248ebe471f19263b9dd3f9667ef41041..4fa963e495fd4f555b460926ecfc030f9588e4d2 100644 GIT binary patch delta 191 zcmV;w06_oB0owtPB!8kwL_t&-(>;&Tio!4y1*gfi=)(U02l}E`sadQ^Om5CT6nq^R zm_fxKlGIvDk`#vL6~Jpa16Xy<0F(9O4i;vBXKoI_?&~H=UG)(F!n@u9VoqxSkc|UC zZNI|+Zrd~gY-tR-cE2=TBq_wtI{{eFFM#lAM1bhA09g8q4mhxEK7Tu2?iWc?RWg86 t=^0?e^=bf3!vV_piMD@u0N9=!{sDZ+fGg&J_K! zna}!zHQE`FxghirV$UG%Y06MOTZhuNoZidz`NbMhzY+6(^|8|q$Ss`Ev}=UdJb_vt zkUEOgzpz{00q*n~zv~u|9;N|{;n?px!Ldz|4%R=c&uT$jO(%!>Qwu~~!*P06$h96b cv~n!)4|DHFQpYX(?f?J)07*qoM6N<$f_@!U1^@s6 diff --git a/homedecor/textures/homedecor_bathroom_tiles_fg.png b/homedecor/textures/homedecor_bathroom_tiles_fg.png index a00c3a8e6f03b631418f6a8c454a6967c8d3821e..bf19c5bf3eb42aefe98e840dcd53b50f03f392ed 100644 GIT binary patch delta 220 zcmV<203-i{0{8)tB!9n2L_t(2&sEUTa)TfcM&S=ejpjc_l$)zfd49VOp8 z$IfJ}UN*?)le38BC}iYn*e1K_wAFY?ayclR9teuBJ$owj?p5cSY=Yazq7TE_5L~FD zB4X`fve|^AVK!(*VJ`6ScX+r;=-(bznaV@wDH+eGX#Mc8;PuDuAxUOkC2BP55B>+J W5KmClXA|rI00006reU}V9_{5z9LI(c@I zwCSp0CweB{xws*)Fmb2f2{BMOxM0KhqTnx_nCa+TFcT@1zhJC3dzDH0sXGK7Bx0?F zVN8zu2L^=ZbD6+e4Us#c>3wD