#5585: Start exposing VFP methods

codereader · Apr 11, 2021 · 5861f18 · 5861f18
1 parent 8df08bc
commit 5861f18
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/include/ishaderlayer.h b/include/ishaderlayer.h
@@ -320,7 +320,7 @@ class IShaderLayer
     virtual const shaders::IShaderExpression::Ptr& getConditionExpression() const = 0;
 
 	/**
-	 * Returns the name of this stage's fragment program.
+	 * Returns the name of this stage's vertex program.
 	 */
 	virtual const std::string& getVertexProgram()const = 0;
 

diff --git a/install/scripts/materialtest.py b/install/scripts/materialtest.py
@@ -99,6 +99,9 @@
     print('Stage render map size: {0}'.format(stage.getRenderMapSize()))
     print('Stage alpha test expression: {0}'.format(stage.getAlphaTestExpressionString()))
     print('Stage condition expression: {0}'.format(stage.getConditionExpressionString()))
+    print('Stage vertex program: {0}'.format(stage.getVertexProgram()))
+    print('Stage fragment program: {0}'.format(stage.getFragmentProgram()))
+    print('Stage has {0} vertex parameters and {1} fragment maps'.format(stage.getNumVertexParms(), stage.getNumFragmentMaps()))
 
     for transform in stage.getTransformations():
         print('Stage transform type: {0}'.format(transform.type))

diff --git a/plugins/script/interfaces/ShaderSystemInterface.cpp b/plugins/script/interfaces/ShaderSystemInterface.cpp
@@ -358,6 +358,10 @@ void ShaderSystemInterface::registerInterface(py::module& scope, py::dict& globa
     stage.def("getRenderMapSize", &ScriptMaterialStage::getRenderMapSize);
     stage.def("getAlphaTestExpressionString", &ScriptMaterialStage::getAlphaTestExpressionString);
     stage.def("getConditionExpressionString", &ScriptMaterialStage::getConditionExpressionString);
+    stage.def("getVertexProgram", &ScriptMaterialStage::getVertexProgram);
+    stage.def("getFragmentProgram", &ScriptMaterialStage::getFragmentProgram);
+    stage.def("getNumVertexParms", &ScriptMaterialStage::getNumVertexParms);
+    stage.def("getNumFragmentMaps", &ScriptMaterialStage::getNumFragmentMaps);
 
 	// Expose the MaterialVisitor interface
 

diff --git a/plugins/script/interfaces/ShaderSystemInterface.h b/plugins/script/interfaces/ShaderSystemInterface.h
@@ -108,6 +108,26 @@ class ScriptMaterialStage
         return _layer && _layer->getConditionExpression() ?
             _layer->getConditionExpression()->getExpressionString() : std::string();
     }
+
+    std::string getVertexProgram()
+    {
+        return _layer ? _layer->getVertexProgram() : std::string();
+    }
+
+    std::string getFragmentProgram()
+    {
+        return _layer ? _layer->getFragmentProgram() : std::string();
+    }
+
+    int getNumVertexParms()
+    {
+        return _layer ? _layer->getNumVertexParms() : 0;
+    }
+
+    int getNumFragmentMaps()
+    {
+        return _layer ? _layer->getNumFragmentMaps() : 0;
+    }
 };
 
 /**