Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Improve code clarity after 0a53c5e06a by removing a fall-through.

Browse Source 
Also fix the indentation to follow the coding conventions.

This was SVN commit r16280.
This commit is contained in:
Nicolas Auvray 2015-02-07 15:38:22 +00:00
parent dab6836378
commit b66465de73
1 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
source/simulation2/components/CCmpSelectable.cpp
View File

@ -287,87 +287,88 @@ void CCmpSelectable::HandleMessage(const CMessage& msg, bool UNUSED(global))
switch (msg.GetType())
{
case MT_Interpolate:
{
PROFILE3("Selectable::Interpolate");
const CMessageInterpolate& msgData = static_cast<const CMessageInterpolate&> (msg);
if (m_FadeDeltaAlpha != 0.f)
{
PROFILE3("Selectable::Interpolate");
const CMessageInterpolate& msgData = static_cast<const CMessageInterpolate&> (msg);
if (m_FadeDeltaAlpha != 0.f)
m_FadeProgress += msgData.deltaRealTime;
if (m_FadeProgress >= FADE_DURATION)
{
m_FadeProgress += msgData.deltaRealTime;
if (m_FadeProgress >= FADE_DURATION)
{
const float targetAlpha = m_FadeBaselineAlpha + m_FadeDeltaAlpha;
const float targetAlpha = m_FadeBaselineAlpha + m_FadeDeltaAlpha;
// stop the fade
m_Color.a = targetAlpha;
m_FadeBaselineAlpha = targetAlpha;
m_FadeDeltaAlpha = 0.f;
m_FadeProgress = FADE_DURATION; // will need to be reset to start the next fade again
}
else
{
m_Color.a = Ease::QuartOut(m_FadeProgress, m_FadeBaselineAlpha, m_FadeDeltaAlpha, FADE_DURATION);
}
// stop the fade
m_Color.a = targetAlpha;
m_FadeBaselineAlpha = targetAlpha;
m_FadeDeltaAlpha = 0.f;
m_FadeProgress = FADE_DURATION; // will need to be reset to start the next fade again
}
else
{
m_Color.a = Ease::QuartOut(m_FadeProgress, m_FadeBaselineAlpha, m_FadeDeltaAlpha, FADE_DURATION);
}
// update dynamic overlay only when visible
if (m_Color.a > 0)
UpdateDynamicOverlay(msgData.offset);
UpdateMessageSubscriptions();
break;
}
// update dynamic overlay only when visible
if (m_Color.a > 0)
UpdateDynamicOverlay(msgData.offset);
UpdateMessageSubscriptions();
break;
}
case MT_OwnershipChanged:
{
const CMessageOwnershipChanged& msgData = static_cast<const CMessageOwnershipChanged&> (msg);
{
const CMessageOwnershipChanged& msgData = static_cast<const CMessageOwnershipChanged&> (msg);
// don't update color if there's no new owner (e.g. the unit died)
if (msgData.to == INVALID_PLAYER)
break;
// update the selection highlight color
CmpPtr<ICmpPlayerManager> cmpPlayerManager(GetSystemEntity());
if (!cmpPlayerManager)
break;
CmpPtr<ICmpPlayer> cmpPlayer(GetSimContext(), cmpPlayerManager->GetPlayerByID(msgData.to));
if (!cmpPlayer)
break;
// Update the highlight color, while keeping the current alpha target value intact
// (i.e. baseline + delta), so that any ongoing fades simply continue with the new color.
CColor color = cmpPlayer->GetColour();
SetSelectionHighlight(CColor(color.r, color.g, color.b, m_FadeBaselineAlpha + m_FadeDeltaAlpha), m_Selected);
InvalidateStaticOverlay();
// don't update color if there's no new owner (e.g. the unit died)
if (msgData.to == INVALID_PLAYER)
break;
}
// update the selection highlight color
CmpPtr<ICmpPlayerManager> cmpPlayerManager(GetSystemEntity());
if (!cmpPlayerManager)
break;
CmpPtr<ICmpPlayer> cmpPlayer(GetSimContext(), cmpPlayerManager->GetPlayerByID(msgData.to));
if (!cmpPlayer)
break;
// Update the highlight color, while keeping the current alpha target value intact
// (i.e. baseline + delta), so that any ongoing fades simply continue with the new color.
CColor color = cmpPlayer->GetColour();
SetSelectionHighlight(CColor(color.r, color.g, color.b, m_FadeBaselineAlpha + m_FadeDeltaAlpha), m_Selected);
InvalidateStaticOverlay();
break;
}
case MT_PositionChanged:
{
if (m_AlwaysVisible)
{
if (m_AlwaysVisible)
{
const CMessagePositionChanged& msgData = static_cast<const CMessagePositionChanged&> (msg);
m_AlphaMin = msgData.inWorld ? MIN_ALPHA_ALWAYS_VISIBLE : MIN_ALPHA_UNSELECTED;
m_Color.a = m_AlphaMin;
}
const CMessagePositionChanged& msgData = static_cast<const CMessagePositionChanged&> (msg);
m_AlphaMin = msgData.inWorld ? MIN_ALPHA_ALWAYS_VISIBLE : MIN_ALPHA_UNSELECTED;
m_Color.a = m_AlphaMin;
}
InvalidateStaticOverlay();
break;
}
case MT_TerrainChanged:
case MT_WaterChanged:
{
InvalidateStaticOverlay();
break;
}
InvalidateStaticOverlay();
break;
case MT_RenderSubmit:
{
PROFILE3("Selectable::RenderSubmit");
{
PROFILE3("Selectable::RenderSubmit");
const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);
RenderSubmit(msgData.collector);
const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);
RenderSubmit(msgData.collector);
break;
}
break;
}
}
}