#5585: Expose more stage methods

codereader · Apr 11, 2021 · ec3548e · ec3548e
1 parent 59f4ba1
commit ec3548e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/install/scripts/materialtest.py b/install/scripts/materialtest.py
@@ -72,7 +72,12 @@
 print('Material has now {0} stages'.format(newMaterial.getNumStages()))
 
 for stage in newMaterial.getAllStages():
-    print('Stage of type {0} iterated'.format(stage.getType()))
+    print('Stage type: {0}'.format(stage.getType()))
+    print('Stage flags: {0}'.format(stage.getStageFlags()))
+    print('Stage clamp type: {0}'.format(stage.getClampType()))
+    print('Stage texgen type: {0}'.format(stage.getTexGenType()))
+    print('Stage texgen param #1: {0}'.format(stage.getTexGenParam(0)))
+    print('Stage texgen expression #1: {0}'.format(stage.getTexGenExpressionString(0)))
 
 newMaterial.removeStage(stageIndex)
 

diff --git a/plugins/script/interfaces/ShaderSystemInterface.cpp b/plugins/script/interfaces/ShaderSystemInterface.cpp
@@ -305,10 +305,23 @@ void ShaderSystemInterface::registerInterface(py::module& scope, py::dict& globa
         .value("IGNORE_DEPTH", IShaderLayer::FLAG_IGNORE_DEPTH)
         .export_values();
 
+    // Texgen enum
+    py::enum_<IShaderLayer::TexGenType>(stage, "TexGenType")
+        .value("NORMAL", IShaderLayer::TEXGEN_NORMAL)
+        .value("REFLECT", IShaderLayer::TEXGEN_REFLECT)
+        .value("SCREEN", IShaderLayer::TEXGEN_SCREEN)
+        .value("SKYBOX", IShaderLayer::TEXGEN_SKYBOX)
+        .value("WOBBLESKY", IShaderLayer::TEXGEN_WOBBLESKY)
+        .export_values();
+
     // Shader Stage
     stage.def(py::init<const IShaderLayer::Ptr&>());
     stage.def("getType", &ScriptMaterialStage::getType);
     stage.def("getStageFlags", &ScriptMaterialStage::getStageFlags);
+    stage.def("getClampType", &ScriptMaterialStage::getClampType);
+    stage.def("getTexGenType", &ScriptMaterialStage::getTexGenType);
+    stage.def("getTexGenParam", &ScriptMaterialStage::getTexGenParam);
+    stage.def("getTexGenExpressionString", &ScriptMaterialStage::getTexGenExpressionString);
 
 	// Expose the MaterialVisitor interface
 

diff --git a/plugins/script/interfaces/ShaderSystemInterface.h b/plugins/script/interfaces/ShaderSystemInterface.h
@@ -28,6 +28,27 @@ class ScriptMaterialStage
     {
         return _layer ? _layer->getStageFlags() : 0;
     }
+
+    ClampType getClampType()
+    {
+        return _layer ? _layer->getClampType() : CLAMP_REPEAT;
+    }
+
+    IShaderLayer::TexGenType getTexGenType()
+    {
+        return _layer ? _layer->getTexGenType() : IShaderLayer::TEXGEN_NORMAL;
+    }
+
+    float getTexGenParam(std::size_t index)
+    {
+        return _layer && index < 2 ? _layer->getTexGenParam(index) : 0;
+    }
+
+    std::string getTexGenExpressionString(std::size_t index)
+    {
+        return _layer && index < 2 && _layer->getTexGenExpression(index) ? 
+            _layer->getTexGenExpression(index)->getExpressionString() : std::string();
+    }
 };
 
 /**