Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2014-09-26 13:26:25 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:28:51 +0300
commitb58e285a591d14ca6af77d3695d23d538fa60c5f (patch)
tree96ba821bb72c1c2ff65ae5d6aee55ba85d38d407 /map/location_state.cpp
parentd62f10356bf23391462334b315dbdbad8ec3e189 (diff)
[animation] Fixed logic of angle and segment interpolation.
Diffstat (limited to 'map/location_state.cpp')
-rw-r--r--map/location_state.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/map/location_state.cpp b/map/location_state.cpp
index 5ba3904114..3e92ddf122 100644
--- a/map/location_state.cpp
+++ b/map/location_state.cpp
@@ -61,10 +61,10 @@ public:
double srcAngle, m2::PointD const & srcPixelBinding)
: m_fw(fw)
{
- m_angleAnim.reset(new anim::SafeAngleInterpolation(srcAngle, srcAngle, 0.0));
- m_posAnim.reset(new anim::SafeSegmentInterpolation(srcPos, srcPos, 0.0));
+ m_angleAnim.reset(new anim::SafeAngleInterpolation(srcAngle, srcAngle, 1.0));
+ m_posAnim.reset(new anim::SafeSegmentInterpolation(srcPos, srcPos, 1.0));
m2::PointD invertedPxBinding(InvertPxBinding(srcPixelBinding));
- m_pxBindingAnim.reset(new anim::SafeSegmentInterpolation(invertedPxBinding, invertedPxBinding, 0.0));
+ m_pxBindingAnim.reset(new anim::SafeSegmentInterpolation(invertedPxBinding, invertedPxBinding, 1.0));
}
void SetDestinationParams(m2::PointD const & dstPos, double dstAngle)
@@ -72,7 +72,7 @@ public:
ASSERT(m_angleAnim != nullptr, ());
ASSERT(m_posAnim != nullptr, ());
double const posSpeed = m_fw->GetNavigator().ComputeMoveSpeed(m_posAnim->GetCurrentValue(), dstPos);
- double const angleSpeed = m_fw->GetAnimator().GetRotationSpeed();
+ double const angleSpeed = 1.5;//m_fw->GetAnimator().GetRotationSpeed();
m_angleAnim->ResetDestParams(dstAngle, angleSpeed);
m_posAnim->ResetDestParams(dstPos, posSpeed);