#5585: MaterialVisitor interface

codereader · Apr 11, 2021 · 111f74e · 111f74e
1 parent ccf6820
commit 111f74e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/install/scripts/test.py b/install/scripts/test.py
@@ -160,7 +160,7 @@ def visit(self, shader):
 
 # Disabled code, takes very long in TDM
 # materialVisitor = TestMaterialVisitor()
-# GlobalMaterialManager.foreachShader(materialVisitor)
+# GlobalMaterialManager.foreachMaterial(materialVisitor)
 
 material = GlobalMaterialManager.getMaterialForName('bc_rat')
 

diff --git a/plugins/script/interfaces/ShaderSystemInterface.cpp b/plugins/script/interfaces/ShaderSystemInterface.cpp
@@ -26,7 +26,7 @@ namespace
 	};
 }
 
-void ShaderSystemInterface::foreachShader(MaterialVisitor& visitor)
+void ShaderSystemInterface::foreachMaterial(MaterialVisitor& visitor)
 {
 	// Note: foreachShader only traverses the loaded materials, use a small adaptor to traverse all known
 	ShaderNameToShaderWrapper adaptor(visitor);
@@ -66,13 +66,14 @@ void ShaderSystemInterface::registerInterface(py::module& scope, py::dict& globa
 	visitor.def(py::init<>());
 	visitor.def("visit", &MaterialVisitor::visit);
 
-    scope.add_object("ShaderVisitor", visitor); // old compatibility name
-
 	// Add the module declaration to the given python namespace
 	py::class_<ShaderSystemInterface> materialManager(scope, "MaterialManager");
 
-	materialManager.def("foreachShader", &ShaderSystemInterface::foreachShader);
+	materialManager.def("foreachMaterial", &ShaderSystemInterface::foreachMaterial);
 	materialManager.def("getMaterial", &ShaderSystemInterface::getMaterial);
+
+    scope.add_object("ShaderVisitor", visitor); // old compatibility name
+	materialManager.def("foreachShader", &ShaderSystemInterface::foreachMaterial); // old compatibility name
 	materialManager.def("getMaterialForName", &ShaderSystemInterface::getMaterial); // old compatibility name
 
 	// Now point the Python variable "GlobalMaterialManager" to this instance

diff --git a/plugins/script/interfaces/ShaderSystemInterface.h b/plugins/script/interfaces/ShaderSystemInterface.h
@@ -93,7 +93,7 @@ class ShaderSystemInterface :
 	public IScriptInterface
 {
 public:
-	void foreachShader(MaterialVisitor& visitor);
+	void foreachMaterial(MaterialVisitor& visitor);
 	ScriptShader getMaterial(const std::string& name);
 
 	// IScriptInterface implementation