Refactor texture overrides and add new features (#9600)

[oweals/minetest.git] / src / nodedef.cpp

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index b6eca9497185eb0bbac658ac5dbd9a88558b1ba9..37332c3c60928488052817ad5464440484db3781 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -1304,60 +1304,35 @@ void NodeDefManager::updateAliases(IItemDefManager *idef)
        }
 }
 
-void NodeDefManager::applyTextureOverrides(const std::string &override_filepath)
+void NodeDefManager::applyTextureOverrides(const std::vector<TextureOverride> &overrides)
 {
        infostream << "NodeDefManager::applyTextureOverrides(): Applying "
-               "overrides to textures from " << override_filepath << std::endl;
-
-       std::ifstream infile(override_filepath.c_str());
-       std::string line;
-       int line_c = 0;
-       while (std::getline(infile, line)) {
-               line_c++;
-               // Also trim '\r' on DOS-style files
-               line = trim(line);
-               if (line.empty())
-                       continue;
-
-               std::vector<std::string> splitted = str_split(line, ' ');
-               if (splitted.size() != 3) {
-                       errorstream << override_filepath
-                               << ":" << line_c << " Could not apply texture override \""
-                               << line << "\": Syntax error" << std::endl;
-                       continue;
-               }
+               "overrides to textures" << std::endl;
 
+       for (const TextureOverride& texture_override : overrides) {
                content_t id;
-               if (!getId(splitted[0], id))
+               if (!getId(texture_override.id, id))
                        continue; // Ignore unknown node
 
                ContentFeatures &nodedef = m_content_features[id];
 
-               if (splitted[1] == "top")
-                       nodedef.tiledef[0].name = splitted[2];
-               else if (splitted[1] == "bottom")
-                       nodedef.tiledef[1].name = splitted[2];
-               else if (splitted[1] == "right")
-                       nodedef.tiledef[2].name = splitted[2];
-               else if (splitted[1] == "left")
-                       nodedef.tiledef[3].name = splitted[2];
-               else if (splitted[1] == "back")
-                       nodedef.tiledef[4].name = splitted[2];
-               else if (splitted[1] == "front")
-                       nodedef.tiledef[5].name = splitted[2];
-               else if (splitted[1] == "all" || splitted[1] == "*")
-                       for (TileDef &i : nodedef.tiledef)
-                               i.name = splitted[2];
-               else if (splitted[1] == "sides")
-                       for (int i = 2; i < 6; i++)
-                               nodedef.tiledef[i].name = splitted[2];
-               else {
-                       errorstream << override_filepath
-                               << ":" << line_c << " Could not apply texture override \""
-                               << line << "\": Unknown node side \""
-                               << splitted[1] << "\"" << std::endl;
-                       continue;
-               }
+               if (texture_override.hasTarget(OverrideTarget::TOP))
+                       nodedef.tiledef[0].name = texture_override.texture;
+
+               if (texture_override.hasTarget(OverrideTarget::BOTTOM))
+                       nodedef.tiledef[1].name = texture_override.texture;
+
+               if (texture_override.hasTarget(OverrideTarget::RIGHT))
+                       nodedef.tiledef[2].name = texture_override.texture;
+
+               if (texture_override.hasTarget(OverrideTarget::LEFT))
+                       nodedef.tiledef[3].name = texture_override.texture;
+
+               if (texture_override.hasTarget(OverrideTarget::BACK))
+                       nodedef.tiledef[4].name = texture_override.texture;
+
+               if (texture_override.hasTarget(OverrideTarget::FRONT))
+                       nodedef.tiledef[5].name = texture_override.texture;
        }
 }