sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics/Material: Add parameter for vertex color

Browse Source
This commit is contained in:
Jérôme Leclercq
2018-06-15 14:15:23 +02:00
parent 41e2d3e448
commit 8cdc36c948
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Utility/MaterialData.hpp
View File

@@ -60,6 +60,7 @@ namespace Nz
static constexpr const char* StencilTest = "MatStencilTest"; static constexpr const char* StencilTest = "MatStencilTest";
static constexpr const char* StencilZFail = "MatStencilZFail"; static constexpr const char* StencilZFail = "MatStencilZFail";
static constexpr const char* Transform = "MatTransform"; static constexpr const char* Transform = "MatTransform";
static constexpr const char* VertexColor = "MatVertexColor";
}; };
} }

4
src/Nazara/Graphics/Material.cpp
View File

@@ -183,6 +183,9 @@ namespace Nz
if (matData.GetBooleanParameter(MaterialData::StencilTest, &isEnabled)) if (matData.GetBooleanParameter(MaterialData::StencilTest, &isEnabled))
EnableStencilTest(isEnabled); EnableStencilTest(isEnabled);
if (matData.GetBooleanParameter(MaterialData::VertexColor, &isEnabled))
EnableVertexColor(isEnabled);
// Samplers // Samplers
if (matData.GetIntegerParameter(MaterialData::DiffuseAnisotropyLevel, &iValue)) if (matData.GetIntegerParameter(MaterialData::DiffuseAnisotropyLevel, &iValue))
m_diffuseSampler.SetAnisotropyLevel(static_cast<UInt8>(iValue)); m_diffuseSampler.SetAnisotropyLevel(static_cast<UInt8>(iValue));
@@ -296,6 +299,7 @@ namespace Nz
matData->SetParameter(MaterialData::FaceCulling, IsFaceCullingEnabled()); matData->SetParameter(MaterialData::FaceCulling, IsFaceCullingEnabled());
matData->SetParameter(MaterialData::ScissorTest, IsScissorTestEnabled()); matData->SetParameter(MaterialData::ScissorTest, IsScissorTestEnabled());
matData->SetParameter(MaterialData::StencilTest, IsStencilTestEnabled()); matData->SetParameter(MaterialData::StencilTest, IsStencilTestEnabled());
matData->SetParameter(MaterialData::VertexColor, HasVertexColor());
// Samplers // Samplers
matData->SetParameter(MaterialData::DiffuseAnisotropyLevel, static_cast<long long>(GetDiffuseSampler().GetAnisotropicLevel())); matData->SetParameter(MaterialData::DiffuseAnisotropyLevel, static_cast<long long>(GetDiffuseSampler().GetAnisotropicLevel()));