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

ViewController: clamp tilt in setPosition

Browse Source
This commit is contained in:
Hannes Janetzek 2014-10-13 22:20:35 +02:00
parent dfc1aeb98f
commit e1c1a20074
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtm/src/org/oscim/map/ViewController.java
View File

@ -1,5 +1,7 @@
package org.oscim.map; package org.oscim.map;
import static org.oscim.utils.FastMath.clamp;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.core.Point; import org.oscim.core.Point;
import org.oscim.core.Tile; import org.oscim.core.Tile;
@ -179,10 +181,10 @@ public class ViewController extends Viewport {
public void setMapPosition(MapPosition mapPosition) { public void setMapPosition(MapPosition mapPosition) {
ThreadUtils.assertMainThread(); ThreadUtils.assertMainThread();
mPos.scale = FastMath.clamp(mapPosition.scale, MIN_SCALE, MAX_SCALE); mPos.scale = clamp(mapPosition.scale, MIN_SCALE, MAX_SCALE);
mPos.x = mapPosition.x; mPos.x = mapPosition.x;
mPos.y = mapPosition.y; mPos.y = mapPosition.y;
mPos.tilt = mapPosition.tilt; mPos.tilt = clamp(mapPosition.tilt, 0, MAX_TILT);
mPos.bearing = mapPosition.bearing; mPos.bearing = mapPosition.bearing;
updateMatrices(); updateMatrices();
} }