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

fix animateToBBox

Browse Source
This commit is contained in:
Hannes Janetzek 2013-10-01 23:17:14 +02:00
parent 8ab84c4e85
commit c07709803c
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ public class MapAnimator {
private final int ANIM_MOVE = 1 << 0; private final int ANIM_MOVE = 1 << 0;
private final int ANIM_SCALE = 1 << 1; private final int ANIM_SCALE = 1 << 1;
private final int ANIM_FLING = 1 << 2; private final int ANIM_FLING = 1 << 2;
private final int ANIM_BBOX = 1 << 3;
private final Map mMap; private final Map mMap;
private final Viewport mViewport; private final Viewport mViewport;
@ -58,6 +59,8 @@ public class MapAnimator {
double newScale = Math.min(zx, zy); double newScale = Math.min(zx, zy);
animateTo(500, bbox.getCenterPoint(), newScale, false); animateTo(500, bbox.getCenterPoint(), newScale, false);
mState = ANIM_MOVE | ANIM_SCALE | ANIM_BBOX;
} }
public synchronized void animateTo(long duration, GeoPoint geoPoint, double scale, public synchronized void animateTo(long duration, GeoPoint geoPoint, double scale,
@ -75,9 +78,7 @@ public class MapAnimator {
scale = FastMath.clamp(scale, Viewport.MIN_SCALE, Viewport.MAX_SCALE); scale = FastMath.clamp(scale, Viewport.MIN_SCALE, Viewport.MAX_SCALE);
mDeltaPos.scale = scale; mDeltaPos.scale = scale;
scale = (float) (scale / mPos.scale); mScaleBy = scale - mPos.scale;
mScaleBy = mPos.scale * scale - mPos.scale;
mStartPos.scale = mPos.scale; mStartPos.scale = mPos.scale;
mStartPos.angle = mPos.angle; mStartPos.angle = mPos.angle;
@ -87,6 +88,7 @@ public class MapAnimator {
mDeltaPos.x = MercatorProjection.longitudeToX(geoPoint.getLongitude()); mDeltaPos.x = MercatorProjection.longitudeToX(geoPoint.getLongitude());
mDeltaPos.y = MercatorProjection.latitudeToY(geoPoint.getLatitude()); mDeltaPos.y = MercatorProjection.latitudeToY(geoPoint.getLatitude());
mDeltaPos.x -= mStartPos.x; mDeltaPos.x -= mStartPos.x;
mDeltaPos.y -= mStartPos.y; mDeltaPos.y -= mStartPos.y;
@ -107,9 +109,7 @@ public class MapAnimator {
scale = FastMath.clamp(scale, Viewport.MIN_SCALE, Viewport.MAX_SCALE); scale = FastMath.clamp(scale, Viewport.MIN_SCALE, Viewport.MAX_SCALE);
mDeltaPos.scale = scale; mDeltaPos.scale = scale;
scale = (float) (scale / mPos.scale); mScaleBy = scale - mPos.scale;
mScaleBy = mPos.scale * scale - mPos.scale;
mStartPos.scale = mPos.scale; mStartPos.scale = mPos.scale;
mStartPos.angle = mPos.angle; mStartPos.angle = mPos.angle;
@ -186,8 +186,8 @@ public class MapAnimator {
if (millisLeft <= 0) { if (millisLeft <= 0) {
// set final position // set final position
if ((mState & ANIM_MOVE) != 0) if ((mState & ANIM_MOVE) != 0)
mViewport.moveInternal(mStartPos.x + mDeltaPos.x, mViewport.moveTo(mStartPos.x + mDeltaPos.x,
mStartPos.y + mDeltaPos.y); mStartPos.y + mDeltaPos.y);
if ((mState & ANIM_SCALE) != 0) { if ((mState & ANIM_SCALE) != 0) {
if (mScaleBy > 0) if (mScaleBy > 0)
@ -213,11 +213,18 @@ public class MapAnimator {
} }
if ((mState & ANIM_MOVE) != 0) { if ((mState & ANIM_MOVE) != 0) {
mViewport.moveInternal(mStartPos.x + mDeltaPos.x * adv, mViewport.moveTo(mStartPos.x + mDeltaPos.x * adv,
mStartPos.y + mDeltaPos.y * adv); mStartPos.y + mDeltaPos.y * adv);
changed = true; changed = true;
} }
if ((mState & ANIM_BBOX) != 0) {
if (mPos.angle > 180)
mPos.angle -= 360;
mViewport.setRotation(mPos.angle * (1 - adv));
mViewport.setTilt(mPos.tilt * (1 - adv));
}
if ((mState & ANIM_FLING) != 0) { if ((mState & ANIM_FLING) != 0) {
adv = (float) Math.sqrt(adv); adv = (float) Math.sqrt(adv);
double dx = mVelocity.x * adv; double dx = mVelocity.x * adv;

7
vtm/src/org/oscim/map/Viewport.java
View File

@ -401,12 +401,7 @@ public class Viewport {
} }
/* used by MapAnimator */ /* used by MapAnimator */
void moveInternal(double mx, double my) { void moveTo(double x, double y) {
Point p = applyRotation(mx, my);
moveTo(p.x, p.y);
}
private void moveTo(double x, double y) {
mPos.x = x; mPos.x = x;
mPos.y = y; mPos.y = y;