external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix zoom amount

Browse Source
This commit is contained in:
drdev
2014-05-14 23:08:07 +00:00
parent b14dbe0f1a
commit 7eddd9754e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java
View File

@@ -27,8 +27,10 @@ public abstract class FGestureAdapter extends InputAdapter {
private boolean inTapSquare, pressed, longPressed, longPressHandled, quickTapped, pinching, panning; private boolean inTapSquare, pressed, longPressed, longPressHandled, quickTapped, pinching, panning;
private final VelocityTracker tracker = new VelocityTracker(); private final VelocityTracker tracker = new VelocityTracker();
Vector2 pointer1 = new Vector2(); private final Vector2 pointer1 = new Vector2();
private final Vector2 pointer2 = new Vector2(); private final Vector2 pointer2 = new Vector2();
private final Vector2 prevPointer1 = new Vector2();
private final Vector2 prevPointer2 = new Vector2();
private final Vector2 initialPointer1 = new Vector2(); private final Vector2 initialPointer1 = new Vector2();
private final Vector2 initialPointer2 = new Vector2(); private final Vector2 initialPointer2 = new Vector2();
@@ -136,16 +138,18 @@ public abstract class FGestureAdapter extends InputAdapter {
if (pointer > 1) { return false; } if (pointer > 1) { return false; }
if (pointer == 0) { if (pointer == 0) {
prevPointer1.set(pointer1);
pointer1.set(x, y); pointer1.set(x, y);
} }
else { else {
prevPointer2.set(pointer2);
pointer2.set(x, y); pointer2.set(x, y);
} }
// handle pinch zoom // handle pinch zoom
if (pinching) { if (pinching) {
Vector2 focalPoint = Utils.getIntersection(pointer1, pointer2, initialPointer1, initialPointer2); Vector2 focalPoint = Utils.getIntersection(pointer1, pointer2, initialPointer1, initialPointer2);
return zoom(focalPoint.x, focalPoint.y, pointer1.dst(pointer2) - initialPointer1.dst(initialPointer2)); return zoom(focalPoint.x, focalPoint.y, pointer1.dst(pointer2) - prevPointer1.dst(prevPointer2));
} }
// update tracker // update tracker