#5585: Expose vertex colour mode

codereader · Apr 11, 2021 · b99b075 · b99b075
1 parent c3b3840
commit b99b075
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/install/scripts/materialtest.py b/install/scripts/materialtest.py
@@ -94,6 +94,7 @@
     print('Stage colour expression ALPHA: {0}'.format(stage.getColourExpressionString(dr.MaterialStage.ColourComponent.ALPHA)))
     print('Stage colour expression RGB: {0}'.format(stage.getColourExpressionString(dr.MaterialStage.ColourComponent.RGB)))
     print('Stage colour expression RGBA: {0}'.format(stage.getColourExpressionString(dr.MaterialStage.ColourComponent.RGBA)))
+    print('Stage vertex colour mode: {0}'.format(stage.getVertexColourMode()))
 
 newMaterial.swapStagePosition(diffuseStageIndex, bumpStageIndex)
 

diff --git a/plugins/script/interfaces/ShaderSystemInterface.cpp b/plugins/script/interfaces/ShaderSystemInterface.cpp
@@ -323,6 +323,12 @@ void ShaderSystemInterface::registerInterface(py::module& scope, py::dict& globa
         .value("RGBA", IShaderLayer::COMP_RGBA)
         .export_values();
 
+    py::enum_<IShaderLayer::VertexColourMode>(stage, "VertexColourMode")
+        .value("NONE", IShaderLayer::VERTEX_COLOUR_NONE)
+        .value("MULTIPLY", IShaderLayer::VERTEX_COLOUR_MULTIPLY)
+        .value("INVERSE_MULTIPLY", IShaderLayer::VERTEX_COLOUR_INVERSE_MULTIPLY)
+        .export_values();
+
     // Shader Stage
     stage.def(py::init<const IShaderLayer::Ptr&>());
     stage.def("getType", &ScriptMaterialStage::getType);
@@ -332,6 +338,7 @@ void ShaderSystemInterface::registerInterface(py::module& scope, py::dict& globa
     stage.def("getTexGenType", &ScriptMaterialStage::getTexGenType);
     stage.def("getTexGenExpressionString", &ScriptMaterialStage::getTexGenExpressionString);
     stage.def("getColourExpressionString", &ScriptMaterialStage::getColourExpressionString);
+    stage.def("getVertexColourMode", &ScriptMaterialStage::getVertexColourMode);
 
 	// Expose the MaterialVisitor interface
 

diff --git a/plugins/script/interfaces/ShaderSystemInterface.h b/plugins/script/interfaces/ShaderSystemInterface.h
@@ -55,6 +55,11 @@ class ScriptMaterialStage
         return _layer && _layer->getColourExpression(component) ?
             _layer->getColourExpression(component)->getExpressionString() : std::string();
     }
+
+    IShaderLayer::VertexColourMode getVertexColourMode()
+    {
+        return _layer ? _layer->getVertexColourMode() : IShaderLayer::VERTEX_COLOUR_NONE;
+    }
 };
 
 /**