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

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2015-11-03 17:05:46 +03:00
parent c49d5b0cb1
commit b00aa7746a
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drape_frontend/animation/model_view_animation.cpp
View file

@ -51,7 +51,9 @@ m2::AnyRectD ModelViewAnimation::GetRect(double elapsedTime) const
double ModelViewAnimation::GetRotateDuration(double startAngle, double endAngle)
{
return 0.5 * fabs(ang::GetShortestDistance(startAngle, endAngle)) / math::pi;
double const kRotateDurationScalar = 0.75;
return kRotateDurationScalar * fabs(ang::GetShortestDistance(startAngle, endAngle)) / math::pi;
}
namespace
@ -59,7 +61,9 @@ namespace
double CalcAnimSpeedDuration(double pxDiff, double pxSpeed)
{
if (my::AlmostEqualAbs(pxDiff, 0.0, 1e-5))
double const kEps = 1e-5;
if (my::AlmostEqualAbs(pxDiff, 0.0, kEps))
return 0.0;
return fabs(pxDiff) / pxSpeed;
@ -69,26 +73,33 @@ double CalcAnimSpeedDuration(double pxDiff, double pxSpeed)
double ModelViewAnimation::GetMoveDuration(m2::PointD const & startPt, m2::PointD const & endPt, ScreenBase const & convertor)
{
double const kMinMoveDuration = 0.2;
double const kMinSpeedScalar = 0.2;
double const kMaxSpeedScalar = 7.0;
double const kEps = 1e-5;
m2::RectD const & dispPxRect = convertor.PixelRect();
double pixelLength = convertor.GtoP(endPt).Length(convertor.GtoP(startPt));
if (pixelLength < 1e-5)
double const pixelLength = convertor.GtoP(endPt).Length(convertor.GtoP(startPt));
if (pixelLength < kEps)
return 0.0;
if (pixelLength < 0.2 * min(dispPxRect.SizeX(), dispPxRect.SizeY()))
return 0.2;
double const minSize = min(dispPxRect.SizeX(), dispPxRect.SizeY());
if (pixelLength < kMinSpeedScalar * minSize)
return kMinMoveDuration;
double const pixelSpeed = 1.5 * min(dispPxRect.SizeX(), dispPxRect.SizeY());
double const pixelSpeed = kMaxSpeedScalar * minSize;
return CalcAnimSpeedDuration(pixelLength, pixelSpeed);
}
double ModelViewAnimation::GetScaleDuration(double startSize, double endSize)
{
// Resize 2.0 times should be done for 0.3 seconds.
double constexpr kPixelSpeed = 2.0 / 0.3;
if (startSize > endSize)
swap(startSize, endSize);
// Resize 2.0 times should be done for 0.3 seconds.
static double const pixelSpeed = 2.0 / 0.3;
return CalcAnimSpeedDuration(endSize / startSize, pixelSpeed);
return CalcAnimSpeedDuration(endSize / startSize, kPixelSpeed);
}
ScaleAnimation::ScaleAnimation(m2::AnyRectD const & startRect, m2::AnyRectD const & endRect,

6
drape_frontend/kinetic_scroller.cpp
View file

@ -96,7 +96,7 @@ void KineticScroller::GrabViewRect(ScreenBase const & modelView, double timeStam
delta = delta.Normalize();
// Velocity on pixels.
double v = min(pxDeltaLength / elapsed, CalculateKineticMaxSpeed(modelView));
double const v = min(pxDeltaLength / elapsed, CalculateKineticMaxSpeed(modelView));
// At this point length(m_direction) already in pixel space, and delta normalized.
m_direction = delta * v;
@ -124,8 +124,8 @@ unique_ptr<BaseModelViewAnimation> KineticScroller::CreateKineticAnimation(Scree
// Before we start animation we have to convert length(m_direction) from pixel space to mercator space.
m2::PointD center = m_lastRect.GlobalCenter();
double const d = (modelView.PtoG(modelView.GtoP(center) + m_direction) - center).Length();
double const glbLength = kKineticAcceleration * d;
double const offset = (modelView.PtoG(modelView.GtoP(center) + m_direction) - center).Length();
double const glbLength = kKineticAcceleration * offset;
m2::PointD const glbDirection = m_direction.Normalize() * glbLength;
m2::PointD const targetCenter = center + glbDirection;
if (!df::GetWorldRect().IsPointInside(targetCenter))