gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Updates a model color uniform in RenderModifier only if it was changed.

Browse Source 
This was SVN commit r26653.
This commit is contained in:
vladislavbelov
2022-03-14 22:56:38 +00:00
parent b4253d48cb
commit ea6af3f148
5 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/renderer/RenderModifiers.cpp
+26 -3
View File
@@ -64,6 +64,7 @@ void LitRenderModifier::SetLightEnv(const CLightEnv* lightenv)
// ShaderRenderModifier implementation
ShaderRenderModifier::ShaderRenderModifier()
: m_ShadingColor(1.0f, 1.0f, 1.0f, 1.0f), m_PlayerColor(1.0f, 1.0f, 1.0f, 1.0f)
{
}
@@ -96,6 +97,18 @@ void ShaderRenderModifier::BeginPass(Renderer::Backend::GL::CShaderProgram* shad
m_BindingInstancingTransform = shader->GetUniformBinding(str_instancingTransform);
m_BindingShadingColor = shader->GetUniformBinding(str_shadingColor);
m_BindingPlayerColor = shader->GetUniformBinding(str_playerColor);
if (m_BindingShadingColor.Active())
{
m_ShadingColor = CColor(1.0f, 1.0f, 1.0f, 1.0f);
shader->Uniform(m_BindingShadingColor, m_ShadingColor);
}
if (m_BindingPlayerColor.Active())
{
m_PlayerColor = g_Game->GetPlayerColor(0);
shader->Uniform(m_BindingPlayerColor, m_PlayerColor);
}
}
void ShaderRenderModifier::PrepareModel(Renderer::Backend::GL::CShaderProgram* shader, CModel* model)
@@ -103,9 +116,19 @@ void ShaderRenderModifier::PrepareModel(Renderer::Backend::GL::CShaderProgram* s
if (m_BindingInstancingTransform.Active())
shader->Uniform(m_BindingInstancingTransform, model->GetTransform());
if (m_BindingShadingColor.Active())
shader->Uniform(m_BindingShadingColor, model->GetShadingColor());
if (m_BindingShadingColor.Active() && m_ShadingColor != model->GetShadingColor())
{
m_ShadingColor = model->GetShadingColor();
shader->Uniform(m_BindingShadingColor, m_ShadingColor);
}
if (m_BindingPlayerColor.Active())
shader->Uniform(m_BindingPlayerColor, g_Game->GetPlayerColor(model->GetPlayerID()));
{
const CColor& playerColor = g_Game->GetPlayerColor(model->GetPlayerID());
if (m_PlayerColor != playerColor)
{
m_PlayerColor = playerColor;
shader->Uniform(m_BindingPlayerColor, m_PlayerColor);
}
}
}