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

Animator: smooth scaling

Browse Source
This commit is contained in:
Emux
2019-11-12 17:54:27 +02:00
parent 17a135813b
commit 327d6f1466
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 Stephan Leuschner * Copyright 2016 Stephan Leuschner
* Copyright 2016-2018 devemux86 * Copyright 2016-2019 devemux86
* Copyright 2016 Izumi Kawashima * Copyright 2016 Izumi Kawashima
* Copyright 2017 Wolfgang Schramm * Copyright 2017 Wolfgang Schramm
* Copyright 2018 Gustl22 * Copyright 2018 Gustl22
@@ -22,11 +22,7 @@
package org.oscim.map; package org.oscim.map;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.core.BoundingBox; import org.oscim.core.*;
import org.oscim.core.GeoPoint;
import org.oscim.core.MapPosition;
import org.oscim.core.Point;
import org.oscim.core.Tile;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;
import org.oscim.utils.ThreadUtils; import org.oscim.utils.ThreadUtils;
import org.oscim.utils.animation.Easing; import org.oscim.utils.animation.Easing;
@@ -350,7 +346,7 @@ public class Animator {
}; };
double doScale(ViewController v, float adv) { double doScale(ViewController v, float adv) {
double newScale = mStartPos.scale + mDeltaPos.scale * Math.sqrt(adv); double 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);