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

improve combined move/scale animation

Browse Source
This commit is contained in:
Hannes Janetzek 2014-02-17 01:49:19 +01:00
parent 2fc078e80d
commit b006cacc89
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,13 +209,14 @@ public class Animator {
float adv = clamp(1.0f - millisLeft / mDuration, 0, 1); float adv = clamp(1.0f - millisLeft / mDuration, 0, 1);
double scaleAdv = 1;
if ((mState & ANIM_SCALE) != 0) { if ((mState & ANIM_SCALE) != 0) {
doScale(v, adv); scaleAdv = doScale(v, adv);
} }
if ((mState & ANIM_MOVE) != 0) { if ((mState & ANIM_MOVE) != 0) {
v.moveTo(mStartPos.x + mDeltaPos.x * adv, v.moveTo(mStartPos.x + mDeltaPos.x * (adv / scaleAdv),
mStartPos.y + mDeltaPos.y * adv); mStartPos.y + mDeltaPos.y * (adv / scaleAdv));
} }
if ((mState & ANIM_FLING) != 0) { if ((mState & ANIM_FLING) != 0) {
@ -253,13 +254,13 @@ public class Animator {
} }
} }
private void doScale(ViewController v, float adv) { private double doScale(ViewController v, float adv) {
double newScale; double newScale = mStartPos.scale + mDeltaPos.scale * Math.sqrt(adv);
newScale = mStartPos.scale + (mDeltaPos.scale * adv);
v.scaleMap((float) (newScale / mCurPos.scale), v.scaleMap((float) (newScale / mCurPos.scale),
(float) mPivot.x, (float) mPivot.y); (float) mPivot.x, (float) mPivot.y);
return newScale / (mStartPos.scale + mDeltaPos.scale);
} }
public synchronized void cancel() { public synchronized void cancel() {