Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Refactor UpdateMessageSubscriptions in CCmpRangeOverlayRenderer

Browse Source 
Introduced in 5fbb224dc0

rewrite 3 ifs to 1 if
merge 2 member variables into 1 member variable
remove 2 function local variables
save one call for CComponentManager as both ifs would or execute or not

code is shorter and looks nicer

Differential Revision: D3009
Reviewed by: bb
This was SVN commit r24072.
This commit is contained in:
Angen 2020-09-27 13:12:30 +00:00
parent fbc570674f
commit 69a13c2be5
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/simulation2/components/CCmpRangeOverlayRenderer.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2019 Wildfire Games.
/* Copyright (C) 2020 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -58,9 +58,7 @@ public:
virtual void Init(const CParamNode& UNUSED(paramNode))
{
m_EnabledInterpolate = false;
m_EnabledRenderSubmit = false;
m_Enabled = false;
m_Enabled = m_LastEnabledState = false;
UpdateMessageSubscriptions();
}
@ -161,28 +159,13 @@ private:
void UpdateMessageSubscriptions()
{
bool needInterpolate = false;
bool needRenderSubmit = false;
if (m_Enabled == m_LastEnabledState)
return;
if (m_Enabled)
{
needInterpolate = true;
needRenderSubmit = true;
}
if (needInterpolate != m_EnabledInterpolate)
{
GetSimContext().GetComponentManager().DynamicSubscriptionNonsync(MT_Interpolate, this, needInterpolate);
m_EnabledInterpolate = needInterpolate;
m_Enabled = needInterpolate;
}
if (needRenderSubmit != m_EnabledRenderSubmit)
{
GetSimContext().GetComponentManager().DynamicSubscriptionNonsync(MT_RenderSubmit, this, needRenderSubmit);
m_EnabledRenderSubmit = needRenderSubmit;
m_Enabled = needRenderSubmit;
}
CComponentManager& cmpManager = GetSimContext().GetComponentManager();
cmpManager.DynamicSubscriptionNonsync(MT_Interpolate, this, m_Enabled);
cmpManager.DynamicSubscriptionNonsync(MT_RenderSubmit, this, m_Enabled);
m_LastEnabledState = m_Enabled;
}
void RenderSubmit(SceneCollector& collector, const CFrustum& frustum, bool culling)
@ -221,8 +204,7 @@ private:
SimRender::ConstructTexturedLineCircle(*rangeOverlay.line.get(), origin, rangeOverlay.descriptor.m_Radius);
}
bool m_EnabledInterpolate;
bool m_EnabledRenderSubmit;
bool m_LastEnabledState;
bool m_Enabled;
const char* TEXTURE_BASE_PATH = "art/textures/selection/";