mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Tuned disappear animation

Browse source
This commit is contained in:
r.kuznetsov 2015-10-06 11:26:21 +03:00
parent 69abd4c441
commit e7d2c0a179
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drape_frontend/render_group.cpp
View file

@ -59,10 +59,7 @@ bool RenderGroup::IsLess(RenderGroup const & other) const
void RenderGroup::UpdateAnimation()
{
double opactity = 1.0;
if (m_disappearAnimation != nullptr)
opactity = m_disappearAnimation->GetOpacity();
double const opactity = GetOpacity();
m_uniforms.SetFloatValue("u_opacity", opactity);
}
@ -84,9 +81,8 @@ bool RenderGroup::IsAnimating() const
void RenderGroup::Disappear()
{
m_disappearAnimation = make_unique<OpacityAnimation>(0.25 /* duration */,
1.0 /* startOpacity */,
0.0 /* endOpacity */);
m_disappearAnimation = make_unique<OpacityAnimation>(0.2 /* duration */, 0.25 /* delay */,
1.0 /* startOpacity */, 0.0 /* endOpacity */);
}
bool RenderGroupComparator::operator()(drape_ptr<RenderGroup> const & l, drape_ptr<RenderGroup> const & r)