#5585: Stage vertex parm exposed

codereader · Apr 11, 2021 · 7ef0c65 · 7ef0c65
1 parent 5861f18
commit 7ef0c65
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/install/scripts/materialtest.py b/install/scripts/materialtest.py
@@ -108,6 +108,11 @@
         print('Stage transform expression1: {0}'.format(transform.expression1))
         print('Stage transform expression2: {0}'.format(transform.expression2))
 
+    for v in range(0, stage.getNumVertexParms()):
+        parm = stage.getVertexParm(v)
+        print('Stage Vertex Parm #{0}: {1}'.format(parm.index, ' '.join(parm.expressions)))
+
+
 newMaterial.swapStagePosition(diffuseStageIndex, bumpStageIndex)
 
 print("The new material has been modified" if newMaterial.isModified() else "The new material is not modified?")

diff --git a/plugins/script/interfaces/ShaderSystemInterface.cpp b/plugins/script/interfaces/ShaderSystemInterface.cpp
@@ -338,11 +338,14 @@ void ShaderSystemInterface::registerInterface(py::module& scope, py::dict& globa
         .export_values();
 
     py::class_<ScriptMaterialStage::Transformation> stageTransform(stage, "Transformation");
-
     stageTransform.def_readwrite("type", &ScriptMaterialStage::Transformation::type);
     stageTransform.def_readwrite("expression1", &ScriptMaterialStage::Transformation::expression1);
     stageTransform.def_readwrite("expression2", &ScriptMaterialStage::Transformation::expression2);
 
+    py::class_<ScriptMaterialStage::VertexParm> stageVertexParm(stage, "VertexParm");
+    stageVertexParm.def_readwrite("index", &ScriptMaterialStage::VertexParm::index);
+    stageVertexParm.def_readwrite("expressions", &ScriptMaterialStage::VertexParm::expressions);
+
     // Shader Stage
     stage.def(py::init<const IShaderLayer::Ptr&>());
     stage.def("getType", &ScriptMaterialStage::getType);
@@ -362,6 +365,7 @@ void ShaderSystemInterface::registerInterface(py::module& scope, py::dict& globa
     stage.def("getFragmentProgram", &ScriptMaterialStage::getFragmentProgram);
     stage.def("getNumVertexParms", &ScriptMaterialStage::getNumVertexParms);
     stage.def("getNumFragmentMaps", &ScriptMaterialStage::getNumFragmentMaps);
+    stage.def("getVertexParm", &ScriptMaterialStage::getVertexParm);
 
 	// Expose the MaterialVisitor interface
 

diff --git a/plugins/script/interfaces/ShaderSystemInterface.h b/plugins/script/interfaces/ShaderSystemInterface.h
@@ -119,15 +119,43 @@ class ScriptMaterialStage
         return _layer ? _layer->getFragmentProgram() : std::string();
     }
 
-    int getNumVertexParms()
+    std::size_t getNumVertexParms()
     {
         return _layer ? _layer->getNumVertexParms() : 0;
     }
 
-    int getNumFragmentMaps()
+    std::size_t getNumFragmentMaps()
     {
         return _layer ? _layer->getNumFragmentMaps() : 0;
     }
+
+    struct VertexParm
+    {
+        std::size_t index;
+        std::vector<std::string> expressions;
+    };
+
+    VertexParm getVertexParm(int index)
+    {
+        VertexParm parm;
+
+        if (_layer && index >= 0 && index < 4)
+        {
+            const auto& vp = _layer->getVertexParm(index);
+
+            parm.index = vp.index;
+
+            for (auto i = 0; i < 4; ++i)
+            {
+                if (vp.expressions[i])
+                {
+                    parm.expressions.emplace_back(vp.expressions[i]->getExpressionString());
+                }
+            }
+        }
+
+        return parm;
+    }
 };
 
 /**