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

Animator easing: improvements and backwards API compatibility (#242) #246

Browse Source
This commit is contained in:
Emux
2016-11-21 12:42:48 +02:00
parent acde5d565d
commit 829e45224f
6 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vtm/src/org/oscim/layers/MapEventLayer.java
View File

@@ -27,7 +27,6 @@ import org.oscim.event.MotionEvent;
import org.oscim.map.Map;
import org.oscim.map.Map.InputListener;
import org.oscim.map.ViewController;
import org.oscim.utils.Easing;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -178,7 +177,7 @@ public class MapEventLayer extends Layer implements InputListener, GestureListen
}
/* handle double tap zoom */
mMap.animator().animateZoom(300, 2, pivotX, pivotY, Easing.Type.LINEAR);
mMap.animator().animateZoom(300, 2, pivotX, pivotY);
} else if (mStartMove > 0) {
/* handle fling gesture */

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

@@ -66,6 +66,10 @@ public class Animator {
mMap = map;
}
public synchronized void animateTo(long duration, BoundingBox bbox) {
animateTo(duration, bbox, Easing.Type.LINEAR);
}
public synchronized void animateTo(long duration, BoundingBox bbox, Easing.Type easingType) {
ThreadUtils.assertMainThread();
@@ -100,6 +104,14 @@ public class Animator {
animateTo(1000, bbox, Easing.Type.LINEAR);
}
/**
* Animate to GeoPoint
*
* @param duration in ms
* @param geoPoint
* @param scale
* @param relative alter scale relative to current scale
*/
public void animateTo(long duration, GeoPoint geoPoint,
double scale, boolean relative) {
animateTo(duration, geoPoint, scale, relative, Easing.Type.LINEAR);
@@ -108,10 +120,11 @@ public class Animator {
/**
* Animate to GeoPoint
*
* @param duration in ms
* @param duration in ms
* @param geoPoint
* @param scale
* @param relative alter scale relative to current scale
* @param relative alter scale relative to current scale
* @param easingType easing function
*/
public void animateTo(long duration, GeoPoint geoPoint,
double scale, boolean relative, Easing.Type easingType) {
@@ -136,6 +149,10 @@ public class Animator {
animateTo(500, p, 1, true, Easing.Type.LINEAR);
}
public void animateTo(long duration, MapPosition pos) {
animateTo(duration, pos, Easing.Type.LINEAR);
}
public void animateTo(long duration, MapPosition pos, Easing.Type easingType) {
ThreadUtils.assertMainThread();
@@ -238,7 +255,11 @@ public class Animator {
}
float adv = clamp(1.0f - millisLeft / mDuration, 0, 1);
adv = Easing.ease(0, (long) (adv * Long.MAX_VALUE), Long.MAX_VALUE, mEasingType);
// Avoid redundant calculations in case of linear easing
if (mEasingType != Easing.Type.LINEAR) {
adv = Easing.ease(0, (long) (adv * Long.MAX_VALUE), Long.MAX_VALUE, mEasingType);
adv = clamp(adv, 0, 1);
}
double scaleAdv = 1;
if ((mState & ANIM_SCALE) != 0) {