From d104b9b10ffc2ee2dd16bd2f2a6aaa5296913ebc Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Mon, 8 May 2017 15:29:07 -0400 Subject: [PATCH] Chest: Redo new chests to use single-tile textures where possible This keeps the filenames the same, but adds a new "inside" double texture for the open chest. Use regular drawtype for closed chest and delete the "cube.obj" model. X-flip the right-side texture for the closed chest. --- mods/default/README.txt | 10 +- mods/default/models/chest_open.obj | 143 ++++++++---------- mods/default/models/cube.obj | 38 ----- mods/default/nodes.lua | 24 ++- .../default/textures/default_chest_inside.png | Bin 0 -> 102 bytes mods/default/textures/default_chest_top.png | Bin 422 -> 423 bytes mods/default/textures/default_chest_wood.png | Bin 2320 -> 0 bytes .../textures/default_chest_wood_locked.png | Bin 2418 -> 0 bytes 8 files changed, 93 insertions(+), 122 deletions(-) delete mode 100644 mods/default/models/cube.obj create mode 100644 mods/default/textures/default_chest_inside.png delete mode 100644 mods/default/textures/default_chest_wood.png delete mode 100644 mods/default/textures/default_chest_wood_locked.png diff --git a/mods/default/README.txt b/mods/default/README.txt index 350c4b74..8af65a9c 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -136,10 +136,10 @@ BlockMen (CC BY-SA 3.0): default_lava_source_animated.png default_lava_flowing_animated.png default_stick.png - default_chest_front.png -- Texture kept for mod compability - default_chest_lock.png -- Texture kept for mod compability - default_chest_side.png -- Texture kept for mod compability - default_chest_top.png -- Texture kept for mod compability + default_chest_front.png + default_chest_lock.png + default_chest_side.png + default_chest_top.png default_mineral_mese.png default_meselamp.png bubble.png @@ -154,7 +154,7 @@ sofar (CC BY-SA 3.0): default_aspen_tree default_aspen_tree_top, derived from default_pine_tree_top (by paramat) default_aspen_wood, derived from default_pine_wood (by paramat) - default_chest_wood, default_chest_wood_locked derived from default_chest_* textures by BlockMen + default_chest_inside sofar (WTFPL): default_gravel.png -- Derived from Gambit's PixelBOX texture pack light gravel diff --git a/mods/default/models/chest_open.obj b/mods/default/models/chest_open.obj index 1bfed076..72ba175a 100644 --- a/mods/default/models/chest_open.obj +++ b/mods/default/models/chest_open.obj @@ -1,88 +1,79 @@ -# Blender v2.78 (sub 0) OBJ File: 'chest_open.blend' +# Blender v2.78 (sub 0) OBJ File: 'chest-open.blend' # www.blender.org -mtllib chest_open.mtl -o Bottom_Cube.001 -v -0.500000 -0.500000 0.500000 -v -0.500000 0.187500 0.500000 -v -0.500000 -0.500000 -0.500000 +o Top_Cube.002_None_Top_Cube.002_None_bottom +v -0.500000 0.408471 0.720970 +v -0.500000 1.115578 0.013863 +v -0.500000 0.894607 -0.207108 +v -0.500000 0.187501 0.499999 +v 0.500000 1.115578 0.013863 +v 0.500000 0.408471 0.720970 +v 0.500000 0.187501 0.499999 +v 0.500000 0.894607 -0.207108 v -0.500000 0.187500 -0.500000 +v -0.500000 -0.500000 -0.500000 +v -0.500000 -0.500000 0.500000 +v 0.500000 0.187500 -0.500000 v 0.500000 -0.500000 0.500000 -v 0.500000 0.187500 0.500000 v 0.500000 -0.500000 -0.500000 -v 0.500000 0.187500 -0.500000 -vt 0.7500 0.3438 -vt 0.5000 0.3438 -vt 0.5000 0.0000 -vt 0.7500 0.0000 -vt 0.2500 0.3438 -vt 0.2500 0.0000 -vt 0.0000 0.3438 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 vt 0.0000 0.0000 -vt 0.7500 0.8438 -vt 0.5000 0.8438 -vt 0.5000 0.5000 -vt 0.7500 0.5000 -vt 0.2500 0.5000 -vt 0.2500 1.0000 vt 0.0000 1.0000 -vt 0.0000 0.5000 -vt 0.7500 -0.0000 -vt 0.7500 0.5000 -vt 1.0000 0.5000 +vt 1.0000 1.0000 +vt 1.0000 0.6875 +vt 0.0000 0.6875 +vt 1.0000 1.0000 +vt 0.0000 0.6875 +vt 1.0000 0.6875 +vt 1.0000 0.6875 vt 1.0000 0.0000 -vn -1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 1.0000 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 1.0000 0.0000 -g Bottom_Cube.001_None -usemtl None -s off -f 2/1/1 4/2/1 3/3/1 1/4/1 -f 4/2/2 8/5/2 7/6/2 3/3/2 -f 8/5/3 6/7/3 5/8/3 7/6/3 -f 6/9/4 2/10/4 1/11/4 5/12/4 -f 1/13/5 3/14/5 7/15/5 5/16/5 -f 6/17/6 8/18/6 4/19/6 2/20/6 -o Top_Cube.002 -v -0.500000 0.187501 0.499999 -v -0.500000 0.408471 0.720970 -v -0.500000 0.894607 -0.207108 -v -0.500000 1.115578 0.013863 -v 0.500000 0.187501 0.499999 -v 0.500000 0.408471 0.720970 -v 0.500000 0.894607 -0.207108 -v 0.500000 1.115578 0.013863 -vt 0.7500 0.5000 -vt 0.5000 0.5000 -vt 0.5000 0.3438 -vt 0.7500 0.3438 -vt 0.2500 0.5000 -vt 0.2500 0.3438 -vt 0.0000 0.5000 -vt 0.0000 0.3438 -vt 0.7500 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.8438 -vt 0.7500 0.8438 +vt 0.0000 0.0000 +vt 1.0000 0.6875 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 1.0000 0.6875 +vt 1.0000 0.0000 +vt 0.0000 1.0000 +vt 0.0000 0.6875 +vt 0.0000 0.6875 +vt 0.0000 0.0000 vt 1.0000 0.5000 vt 1.0000 1.0000 -vt 0.7500 1.0000 -vt 0.7500 0.5000 -vt 0.2500 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.5000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 0.0000 0.7071 0.7071 +vn -0.0000 -1.0000 -0.0000 vn -1.0000 0.0000 0.0000 -vn 0.0000 0.7071 -0.7071 -vn 1.0000 0.0000 0.0000 +vn 1.0000 0.0000 -0.0000 vn 0.0000 -0.7071 0.7071 -vn 0.0000 -0.7071 -0.7071 -vn 0.0000 0.7071 0.7071 -g Top_Cube.002_None -usemtl None +vn 0.0000 0.0000 1.0000 +vn -0.0000 0.7071 -0.7071 +vn -0.0000 0.0000 -1.0000 +vn -0.0000 -0.7071 -0.7071 +vn -0.0000 1.0000 -0.0000 +g Top_Cube.002_None_Top_Cube.002_None_bottom_Top_Cube.002_None_Top_Cube.002_None_bottom_Top s off -f 10/21/7 12/22/7 11/23/7 9/24/7 -f 12/22/8 16/25/8 15/26/8 11/23/8 -f 16/25/9 14/27/9 13/28/9 15/26/9 -f 14/29/10 10/30/10 9/31/10 13/32/10 -f 9/33/11 11/34/11 15/35/11 13/36/11 -f 14/37/12 16/25/12 12/22/12 10/30/12 +f 6/1/1 5/2/1 2/3/1 1/4/1 +g Top_Cube.002_None_Top_Cube.002_None_bottom_Top_Cube.002_None_Top_Cube.002_None_bottom_Bottom +f 11/5/2 10/6/2 14/7/2 13/8/2 +g Top_Cube.002_None_Top_Cube.002_None_bottom_Top_Cube.002_None_Top_Cube.002_None_bottom_Right-Left +f 1/9/3 2/10/3 3/11/3 4/12/3 +f 5/13/4 6/1/4 7/14/4 8/15/4 +f 4/12/3 9/16/3 10/17/3 11/18/3 +f 12/19/4 7/14/4 13/8/4 14/20/4 +g Top_Cube.002_None_Top_Cube.002_None_bottom_Top_Cube.002_None_Top_Cube.002_None_bottom_Back +f 6/21/5 1/9/5 4/12/5 7/22/5 +f 7/22/6 4/12/6 11/18/6 13/23/6 +g Top_Cube.002_None_Top_Cube.002_None_bottom_Top_Cube.002_None_Top_Cube.002_None_bottom_Front +f 2/10/7 5/24/7 8/25/7 3/11/7 +f 9/16/8 12/26/8 14/27/8 10/17/8 +g Top_Cube.002_None_Top_Cube.002_None_bottom_Top_Cube.002_None_Top_Cube.002_None_bottom_Inside +f 4/28/9 3/29/9 8/30/9 7/31/9 +f 7/31/10 12/32/10 9/33/10 4/28/10 diff --git a/mods/default/models/cube.obj b/mods/default/models/cube.obj deleted file mode 100644 index 7bbec5de..00000000 --- a/mods/default/models/cube.obj +++ /dev/null @@ -1,38 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: 'chest_close.blend' -# www.blender.org -mtllib chest_close.mtl -o Cube_Cube.001 -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.500000 0.500000 -v 0.500000 0.500000 0.500000 -v 0.500000 -0.500000 -0.500000 -v 0.500000 0.500000 -0.500000 -vt 0.750000 0.500000 -vt 0.500000 0.500000 -vt 0.500000 -0.000000 -vt 0.750000 0.000000 -vt 0.250000 0.500000 -vt 0.250000 0.000000 -vt 0.000000 0.500000 -vt -0.000000 0.000000 -vt 0.750000 1.000000 -vt 0.500000 1.000000 -vt 0.250000 1.000000 -vt -0.000000 1.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 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 1.000000 0.000000 -usemtl None -s off -f 2/1/1 4/2/1 3/3/1 1/4/1 -f 4/2/2 8/5/2 7/6/2 3/3/2 -f 8/5/3 6/7/3 5/8/3 7/6/3 -f 6/9/4 2/10/4 1/2/4 5/1/4 -f 1/5/5 3/11/5 7/12/5 5/7/5 -f 6/11/6 8/5/6 4/2/6 2/10/6 diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 7fa8d2ca..be87dde1 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1999,7 +1999,11 @@ function default.register_chest(name, d) return false end - def_closed.mesh = "cube.obj" + def_closed.mesh = nil + def_closed.drawtype = nil + def_closed.tiles[6] = def.tiles[5] -- swap textures around for "normal" + def_closed.tiles[5] = def.tiles[3] -- drawtype to make them match the mesh + def_closed.tiles[3] = def.tiles[3].."^[transformFX" minetest.register_node("default:" .. name, def_closed) minetest.register_node("default:" .. name .. "_open", def_opened) @@ -2026,7 +2030,14 @@ end default.register_chest("chest", { description = "Chest", - tiles = { "default_chest_wood.png" }, + tiles = { + "default_chest_top.png", + "default_chest_top.png", + "default_chest_side.png", + "default_chest_side.png", + "default_chest_front.png", + "default_chest_inside.png" + }, sounds = default.node_sound_wood_defaults(), sound_open = "default_chest_open", sound_close = "default_chest_close", @@ -2035,7 +2046,14 @@ default.register_chest("chest", { default.register_chest("chest_locked", { description = "Locked Chest", - tiles = { "default_chest_wood_locked.png" }, + tiles = { + "default_chest_top.png", + "default_chest_top.png", + "default_chest_side.png", + "default_chest_side.png", + "default_chest_lock.png", + "default_chest_inside.png" + }, sounds = default.node_sound_wood_defaults(), sound_open = "default_chest_open", sound_close = "default_chest_close", diff --git a/mods/default/textures/default_chest_inside.png b/mods/default/textures/default_chest_inside.png new file mode 100644 index 0000000000000000000000000000000000000000..5f7b6b13270890618c6a6332eee1c6c721b91f1b GIT binary patch literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!2~3yyw0Buq;x%9978NlCvUkPo}j=vVadU` z_{Ppg7lT!aA;@D3{h6xK;WWK5B?*(dP@O1TaS?83{1OQEB B9=-qo literal 0 HcmV?d00001 diff --git a/mods/default/textures/default_chest_top.png b/mods/default/textures/default_chest_top.png index f1a5cb594f4ee6ef23813aeb68ddd38a472c4801..f4a92ee07edb9c3b6b8e33320082ca222656c252 100644 GIT binary patch delta 221 zcmV<303!dU1E&L!(tp57L_t&-(`C;`5`!=d1<=Ud#+VL)(9;{F-v4S5>u9BUqmjN= ztG_z=m!_$YS>xB6@`d2Dm~*QmZ>?0YN4Nl48>7ad?;mD^aEM~|wv^Hen7kt#nUg7N zMUo0Bt_bG@8*yu81rTQlrBUHlgXNs>_yV7_iU;~U#ufeyf9G9*?MPz z0o9fhvOO%pJc8w6uA(SPgh}E6085zG)JMpLyR~QMoRA4!l76q+<}R{XhQ$ XTl@{es#0}<00000NkvXXu0mjfU?gjW delta 220 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