From 65ec371b7849606e7a8b6bf31e75d7c210ce7035 Mon Sep 17 00:00:00 2001
From: DragonWrangler1 <146014546+DragonWrangler1@users.noreply.github.com>
Date: Thu, 26 Sep 2024 08:34:16 -0700
Subject: [PATCH] Allow `allfaces` drawtypes to have 6 textures (#15175)

---
 doc/lua_api.md                             |  3 ++-
 games/devtest/mods/testnodes/drawtypes.lua | 17 +++++++++++++++++
 src/client/content_mapblock.cpp            | 18 +++++++++++-------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/doc/lua_api.md b/doc/lua_api.md
index 4c436b1d2..7623c1c5d 100644
--- a/doc/lua_api.md
+++ b/doc/lua_api.md
@@ -1470,7 +1470,8 @@ Look for examples in `games/devtest` or `games/minetest_game`.
       'Connected Glass'.
 * `allfaces`
     * Often used for partially-transparent nodes.
-    * External and internal sides of textures are visible.
+    * External sides of textures, and unlike other drawtypes, the external sides
+      of other blocks, are visible from the inside.
 * `allfaces_optional`
     * Often used for leaves nodes.
     * This switches between `normal`, `glasslike` and `allfaces` according to
diff --git a/games/devtest/mods/testnodes/drawtypes.lua b/games/devtest/mods/testnodes/drawtypes.lua
index 087d09eff..4a657b739 100644
--- a/games/devtest/mods/testnodes/drawtypes.lua
+++ b/games/devtest/mods/testnodes/drawtypes.lua
@@ -98,6 +98,23 @@ minetest.register_node("testnodes:allfaces", {
 	groups = { dig_immediate = 3 },
 })
 
+minetest.register_node("testnodes:allfaces_6", {
+	description = S("\"allfaces 6 Textures\" Drawtype Test Node").."\n"..
+		S("Transparent node with visible internal backfaces"),
+	drawtype = "allfaces",
+	paramtype = "light",
+	tiles = {
+			"testnodes_allfaces.png^[colorize:red",
+			"testnodes_allfaces.png^[colorize:orange",
+			"testnodes_allfaces.png^[colorize:yellow",
+			"testnodes_allfaces.png^[colorize:green",
+			"testnodes_allfaces.png^[colorize:blue",
+			"testnodes_allfaces.png^[colorize:purple"
+		},
+
+	groups = { dig_immediate = 3 },
+})
+
 local allfaces_optional_tooltip = ""..
 	S("Rendering depends on 'leaves_style' setting:").."\n"..
 	S("* 'fancy': transparent with visible internal backfaces").."\n"..
diff --git a/src/client/content_mapblock.cpp b/src/client/content_mapblock.cpp
index 2a1352139..6ce3ca0f4 100644
--- a/src/client/content_mapblock.cpp
+++ b/src/client/content_mapblock.cpp
@@ -1016,13 +1016,6 @@ void MapblockMeshGenerator::drawGlasslikeFramedNode()
 	}
 }
 
-void MapblockMeshGenerator::drawAllfacesNode()
-{
-	static const aabb3f box(-BS / 2, -BS / 2, -BS / 2, BS / 2, BS / 2, BS / 2);
-	useTile(0, 0, 0);
-	drawAutoLightedCuboid(box);
-}
-
 void MapblockMeshGenerator::drawTorchlikeNode()
 {
 	u8 wall = cur_node.n.getWallMounted(nodedef);
@@ -1545,6 +1538,17 @@ namespace {
 	};
 }
 
+void MapblockMeshGenerator::drawAllfacesNode()
+{
+	static const aabb3f box(-BS / 2, -BS / 2, -BS / 2, BS / 2, BS / 2, BS / 2);
+	TileSpec tiles[6];
+	for (int face = 0; face < 6; face++)
+		getTile(nodebox_tile_dirs[face], &tiles[face]);
+	if (data->m_smooth_lighting)
+		getSmoothLightFrame();
+	drawAutoLightedCuboid(box, nullptr, tiles, 6);
+}
+
 void MapblockMeshGenerator::drawNodeboxNode()
 {
 	TileSpec tiles[6];