From 8cdc36c948886518d126361936b9b7d3254d9e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 15 Jun 2018 14:15:23 +0200 Subject: [PATCH] Graphics/Material: Add parameter for vertex color --- include/Nazara/Utility/MaterialData.hpp | 1 + src/Nazara/Graphics/Material.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/Nazara/Utility/MaterialData.hpp b/include/Nazara/Utility/MaterialData.hpp index c2634d92c..5d82400d7 100644 --- a/include/Nazara/Utility/MaterialData.hpp +++ b/include/Nazara/Utility/MaterialData.hpp @@ -60,6 +60,7 @@ namespace Nz static constexpr const char* StencilTest = "MatStencilTest"; static constexpr const char* StencilZFail = "MatStencilZFail"; static constexpr const char* Transform = "MatTransform"; + static constexpr const char* VertexColor = "MatVertexColor"; }; } diff --git a/src/Nazara/Graphics/Material.cpp b/src/Nazara/Graphics/Material.cpp index e88ad6100..37ab5afd7 100644 --- a/src/Nazara/Graphics/Material.cpp +++ b/src/Nazara/Graphics/Material.cpp @@ -183,6 +183,9 @@ namespace Nz if (matData.GetBooleanParameter(MaterialData::StencilTest, &isEnabled)) EnableStencilTest(isEnabled); + if (matData.GetBooleanParameter(MaterialData::VertexColor, &isEnabled)) + EnableVertexColor(isEnabled); + // Samplers if (matData.GetIntegerParameter(MaterialData::DiffuseAnisotropyLevel, &iValue)) m_diffuseSampler.SetAnisotropyLevel(static_cast(iValue)); @@ -296,6 +299,7 @@ namespace Nz matData->SetParameter(MaterialData::FaceCulling, IsFaceCullingEnabled()); matData->SetParameter(MaterialData::ScissorTest, IsScissorTestEnabled()); matData->SetParameter(MaterialData::StencilTest, IsStencilTestEnabled()); + matData->SetParameter(MaterialData::VertexColor, HasVertexColor()); // Samplers matData->SetParameter(MaterialData::DiffuseAnisotropyLevel, static_cast(GetDiffuseSampler().GetAnisotropicLevel()));