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.

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 350c4b74f6c395ccedaffc2d7eb19dcfbe7afc19..8af65a9c5b8c9e9aa8bfa24df08ac1f3461643bc 100644 (file)
--- 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 1bfed076dddd4126515bcbc935b517df60d45c4f..72ba175a02e3fa23ebd866090f50dd2902775189 100644 (file)
--- 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 (file)
index 7bbec5d..0000000
--- 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 7fa8d2cae6894802632db4a81a7d2c698c006c26..be87dde13d904ba15ba49d25ae244fa3a0874b2c 100644 (file)
--- 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 (file)
index 0000000..5f7b6b1
Binary files /dev/null and b/mods/default/textures/default_chest_inside.png differ

diff --git a/mods/default/textures/default_chest_top.png b/mods/default/textures/default_chest_top.png
index f1a5cb594f4ee6ef23813aeb68ddd38a472c4801..f4a92ee07edb9c3b6b8e33320082ca222656c252 100644 (file)
Binary files a/mods/default/textures/default_chest_top.png and b/mods/default/textures/default_chest_top.png differ

diff --git a/mods/default/textures/default_chest_wood.png b/mods/default/textures/default_chest_wood.png
deleted file mode 100644 (file)
index 408fddb..0000000
Binary files a/mods/default/textures/default_chest_wood.png and /dev/null differ

diff --git a/mods/default/textures/default_chest_wood_locked.png b/mods/default/textures/default_chest_wood_locked.png
deleted file mode 100644 (file)
index f08a7ff..0000000
Binary files a/mods/default/textures/default_chest_wood_locked.png and /dev/null differ