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

decrease change of scale by the change of rotation

Browse Source
This commit is contained in:
Hannes Janetzek 2013-02-07 13:40:25 +01:00
parent 68fbb7e7ba
commit ed34c3b63a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/oscim/view/TouchHandler.java
View File

@ -228,9 +228,13 @@ final class TouchHandler implements OnGestureListener, OnDoubleTapListener {
mSumScale *= scale; mSumScale *= scale;
if (mSumScale < 0.95 || mSumScale > 1.05) { if (mSumScale < 0.95 || mSumScale > 1.05)
mBeginRotate = false; mBeginRotate = false;
}
// decrease change of scale by the change of rotation
// pi * 10 is just arbitrary
scale = 1 + ((scale - 1) * Math.max((1 - (float)(Math.abs(r) * Math.PI) * 10), 0));
float fx = (x2 + x1) / 2 - width / 2; float fx = (x2 + x1) / 2 - width / 2;
float fy = (y2 + y1) / 2 - height / 2; float fy = (y2 + y1) / 2 - height / 2;