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

invert tilt gesture

Browse Source
This commit is contained in:
Hannes Janetzek 2014-05-04 18:44:44 +02:00
parent 469ca9093f
commit d5827de12e
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,7 +310,6 @@ public class MapEventLayer extends Layer implements InputListener, GestureListen
} }
if (mCanScale || mDoRotate) { if (mCanScale || mDoRotate) {
if (!(mDoScale || mDoRotate)) { if (!(mDoScale || mDoRotate)) {
/* enter exclusive scale mode */ /* enter exclusive scale mode */
if (Math.abs(deltaPinch) > (CanvasAdapter.dpi if (Math.abs(deltaPinch) > (CanvasAdapter.dpi
@ -338,9 +337,7 @@ public class MapEventLayer extends Layer implements InputListener, GestureListen
float fy = (y2 + y1) / 2 - height / 2; float fy = (y2 + y1) / 2 - height / 2;
synchronized (mViewport) { synchronized (mViewport) {
if (!mDoTilt) { if (!mDoTilt) {
if (rotateBy != 0) if (rotateBy != 0)
mViewport.rotateMap(rotateBy, fx, fy); mViewport.rotateMap(rotateBy, fx, fy);
if (scaleBy != 1) if (scaleBy != 1)
@ -348,10 +345,8 @@ public class MapEventLayer extends Layer implements InputListener, GestureListen
mViewport.moveMap(mx, my); mViewport.moveMap(mx, my);
} else { } else {
if (tiltBy != 0) { if (tiltBy != 0 && mViewport.tiltMap(-tiltBy))
mViewport.moveMap(0, my / 2); mViewport.moveMap(0, my / 2);
mViewport.tiltMap(tiltBy);
}
} }
} }