xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix zoom animation not executed sometimes (#261)

Browse Source
This commit is contained in:
Andrey Novikov 2016-11-28 17:42:44 +04:00 committed by Emux
parent 77653096f9
commit d9bf94da99
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtm/src/org/oscim/map/Animator.java
View File

@ -187,6 +187,8 @@ public class Animator {
mStartPos.copy(mCurPos); mStartPos.copy(mCurPos);
scaleBy = mMap.viewport().limitScale(scaleBy); scaleBy = mMap.viewport().limitScale(scaleBy);
if (scaleBy == 0.0)
return;
mDeltaPos.scale = scaleBy - mStartPos.scale; mDeltaPos.scale = scaleBy - mStartPos.scale;
@ -254,7 +256,7 @@ public class Animator {
return; return;
} }
float adv = clamp(1.0f - millisLeft / mDuration, 0, 1); float adv = clamp(1.0f - millisLeft / mDuration, 1E-6f, 1);
// Avoid redundant calculations in case of linear easing // Avoid redundant calculations in case of linear easing
if (mEasingType != Easing.Type.LINEAR) { if (mEasingType != Easing.Type.LINEAR) {
adv = Easing.ease(0, (long) (adv * Long.MAX_VALUE), Long.MAX_VALUE, mEasingType); adv = Easing.ease(0, (long) (adv * Long.MAX_VALUE), Long.MAX_VALUE, mEasingType);