From dfe7c0a011ac8a4a5f1022b13050ef87b75f6fee Mon Sep 17 00:00:00 2001 From: uoestermeier Date: Fri, 19 Jul 2019 15:13:31 +0200 Subject: [PATCH] Rebuild dist. --- dist/iwmlib.js | 13 ++++++++++--- dist/iwmlib.pixi.js | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dist/iwmlib.js b/dist/iwmlib.js index 4b7f239..969df93 100644 --- a/dist/iwmlib.js +++ b/dist/iwmlib.js @@ -1857,15 +1857,17 @@ * @param {*} rotate * @param {*} about * @param {*} number - number of involved pointer + * @param {*} distance - distance of farthests touch points * @memberof InteractionDelta */ - constructor(x, y, zoom, rotate, about, number) { + constructor(x, y, zoom, rotate, about, number, distance) { this.x = x; this.y = y; this.zoom = zoom; this.rotate = rotate; this.about = about; this.number = number; + this.distance = distance; } toString() { @@ -1961,7 +1963,8 @@ zoom, alpha, cm, - csize + csize, + distance2 ) } else if ( csize == 1 && @@ -3371,6 +3374,7 @@ scaleCloseThreshold = 0.1, scaleCloseBuffer = 0.05, maxRotation = Angle.degree2radian(5), + minRotationDistance = 200, useLowPassFilter = true } = {}) { if (rotationDegrees != null && rotation != null) { @@ -3416,6 +3420,7 @@ this.mouseZoomFactor = mouseZoomFactor; this.autoBringToFront = autoBringToFront; this.useLowPassFilter = useLowPassFilter; + this.minRotationDistance = minRotationDistance; if (useLowPassFilter) { this.rotateLPF = new LowPassFilter(); this.zoomLPF = new LowPassFilter(); @@ -3472,7 +3477,9 @@ if (this.useLowPassFilter) { rotate = this.rotateLPF.next(rotate); zoom = this.zoomLPF.next(zoom); - // console.log({rotate, zoom}) + if (delta.distance < this.minRotationDistance) { + rotate = 0; + } } this.transform(delta, zoom, rotate, delta.about); if (zoom != 1) this.interactionAnchor = delta.about; diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js index e151e3b..4e445bf 100644 --- a/dist/iwmlib.pixi.js +++ b/dist/iwmlib.pixi.js @@ -5278,15 +5278,17 @@ * @param {*} rotate * @param {*} about * @param {*} number - number of involved pointer + * @param {*} distance - distance of farthests touch points * @memberof InteractionDelta */ - constructor(x, y, zoom, rotate, about, number) { + constructor(x, y, zoom, rotate, about, number, distance) { this.x = x; this.y = y; this.zoom = zoom; this.rotate = rotate; this.about = about; this.number = number; + this.distance = distance; } toString() { @@ -5382,7 +5384,8 @@ zoom, alpha, cm, - csize + csize, + distance2 ) } else if ( csize == 1 && @@ -6783,6 +6786,7 @@ scaleCloseThreshold = 0.1, scaleCloseBuffer = 0.05, maxRotation = Angle.degree2radian(5), + minRotationDistance = 200, useLowPassFilter = true } = {}) { if (rotationDegrees != null && rotation != null) { @@ -6828,6 +6832,7 @@ this.mouseZoomFactor = mouseZoomFactor; this.autoBringToFront = autoBringToFront; this.useLowPassFilter = useLowPassFilter; + this.minRotationDistance = minRotationDistance; if (useLowPassFilter) { this.rotateLPF = new LowPassFilter(); this.zoomLPF = new LowPassFilter(); @@ -6884,7 +6889,9 @@ if (this.useLowPassFilter) { rotate = this.rotateLPF.next(rotate); zoom = this.zoomLPF.next(zoom); - // console.log({rotate, zoom}) + if (delta.distance < this.minRotationDistance) { + rotate = 0; + } } this.transform(delta, zoom, rotate, delta.about); if (zoom != 1) this.interactionAnchor = delta.about;