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

more gesture improvements

Browse Source 
good enough for today
This commit is contained in:
Hannes Janetzek 2014-01-28 05:40:33 +01:00
parent a19a82cf6e
commit beef0bfae9
1 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,8 +67,10 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
private long mStartMove; private long mStartMove;
protected static final double PINCH_ZOOM_THRESHOLD = 4; protected static final double PINCH_ZOOM_THRESHOLD = 4;
protected static final double PINCH_TILT_THRESHOLD = 4;
protected static final double PINCH_TILT_SLOPE = 0.75;
protected static final double PINCH_ROTATE_THRESHOLD = 0.2; protected static final double PINCH_ROTATE_THRESHOLD = 0.2;
protected static final float PINCH_TILT_THRESHOLD = 1f; protected static final double PINCH_ROTATE_THRESHOLD2 = 0.5;
/** 1mm as minimal distance to start move: dpi / 2.54 */ /** 1mm as minimal distance to start move: dpi / 2.54 */
protected static final float MIN_SLOP = 25.4f; protected static final float MIN_SLOP = 25.4f;
@ -229,20 +231,23 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
float scaleBy = 1; float scaleBy = 1;
float tiltBy = 0; float tiltBy = 0;
mx = ((x1 + x2) - (mPrevX1 + mPrevX2)) / 2;
my = ((y1 + y2) - (mPrevY1 + mPrevY2)) / 2;
if (mCanTilt) { if (mCanTilt) {
float slope = (dx == 0) ? 0 : dy / dx; float slope = (dx == 0) ? 0 : dy / dx;
if (Math.abs(slope) < 1) { if (Math.abs(slope) < PINCH_TILT_SLOPE) {
if (mDoTilt) {
tiltBy = my / 5;
} else if (Math.abs(my) > (CanvasAdapter.dpi /
MIN_SLOP * PINCH_TILT_THRESHOLD)) {
// enter exclusive tilt mode // enter exclusive tilt mode
mCanScale = false; mCanScale = false;
mCanRotate = false; mCanRotate = false;
mDoTilt = true; mDoTilt = true;
}
float my2 = y2 - mPrevY2;
float t = PINCH_TILT_THRESHOLD;
if ((my > t && my2 > t) || (my < -t && my2 < -t))
tiltBy = my / 5;
} }
} }
@ -256,7 +261,7 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
if (mDoRotate) { if (mDoRotate) {
double da = rad - mAngle; double da = rad - mAngle;
if (Math.abs(da) > 0.001) { if (Math.abs(da) > 0.0001) {
rotateBy = da; rotateBy = da;
mAngle = rad; mAngle = rad;
@ -272,10 +277,23 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
mAngle = rad; mAngle = rad;
} else if (!mDoScale) { } else if (!mDoScale) {
// reduce pince trigger by the amount of // reduce pince trigger by the amount of
// rotation. // rotation
deltaPinch *= 1 - (r / PINCH_ROTATE_THRESHOLD); deltaPinch *= 1 - (r / PINCH_ROTATE_THRESHOLD);
} else {
mPrevPinchWidth = pinchWidth;
} }
} }
} else if (mDoScale) {
// reenable rotation when higher threshold is reached
double rad = Math.atan2(dy, dx);
double r = rad - mAngle;
if (r > PINCH_ROTATE_THRESHOLD2) {
// start rotate again
mDoRotate = true;
mCanRotate = true;
mAngle = rad;
}
} }
if (mCanScale || mDoRotate) { if (mCanScale || mDoRotate) {
@ -301,15 +319,20 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
float fy = (y2 + y1) / 2 - height / 2; float fy = (y2 + y1) / 2 - height / 2;
synchronized (mViewport) { synchronized (mViewport) {
if (!mDoTilt) {
mViewport.moveMap(mx, my);
if (rotateBy != 0) if (rotateBy != 0)
mViewport.rotateMap(rotateBy, fx, fy); mViewport.rotateMap(rotateBy, fx, fy);
if (scaleBy != 1) if (scaleBy != 1)
mViewport.scaleMap((float) scaleBy, fx, fy); mViewport.scaleMap(scaleBy, fx, fy);
if (tiltBy != 0) } else {
if (tiltBy != 0) {
mViewport.moveMap(0, my / 2);
mViewport.tiltMap(tiltBy); mViewport.tiltMap(tiltBy);
if (!mDoTilt) }
mViewport.moveMap(((x1 + x2) - (mPrevX1 + mPrevX2)) / 4, }
((y1 + y2) - (mPrevY1 + mPrevY2)) / 4);
} }
mMap.updateMap(true); mMap.updateMap(true);