From 327d6f14669566d82d95bb5123638027d7837d58 Mon Sep 17 00:00:00 2001 From: Emux Date: Tue, 12 Nov 2019 17:54:27 +0200 Subject: [PATCH] Animator: smooth scaling --- vtm/src/org/oscim/map/Animator.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/vtm/src/org/oscim/map/Animator.java b/vtm/src/org/oscim/map/Animator.java index 2cefa100..0f3690b7 100644 --- a/vtm/src/org/oscim/map/Animator.java +++ b/vtm/src/org/oscim/map/Animator.java @@ -1,7 +1,7 @@ /* * Copyright 2013 Hannes Janetzek * Copyright 2016 Stephan Leuschner - * Copyright 2016-2018 devemux86 + * Copyright 2016-2019 devemux86 * Copyright 2016 Izumi Kawashima * Copyright 2017 Wolfgang Schramm * Copyright 2018 Gustl22 @@ -22,11 +22,7 @@ package org.oscim.map; import org.oscim.backend.CanvasAdapter; -import org.oscim.core.BoundingBox; -import org.oscim.core.GeoPoint; -import org.oscim.core.MapPosition; -import org.oscim.core.Point; -import org.oscim.core.Tile; +import org.oscim.core.*; import org.oscim.renderer.MapRenderer; import org.oscim.utils.ThreadUtils; import org.oscim.utils.animation.Easing; @@ -350,7 +346,7 @@ public class Animator { }; 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), (float) mPivot.x, (float) mPivot.y);