From 9b9988569ffdc870a06473c143230a7831f1dfb9 Mon Sep 17 00:00:00 2001 From: uoestermeier Date: Thu, 4 Jul 2019 16:08:23 +0200 Subject: [PATCH] Added limit to scatter rotation to avoid flicker. --- dist/iwmlib.js | 3 +- dist/iwmlib.pixi.js | 3 +- lib/scatter.js | 3 +- package-lock.json | 85 ++++++++++++++++++++++++++------------------- package.json | 8 ++--- 5 files changed, 57 insertions(+), 45 deletions(-) diff --git a/dist/iwmlib.js b/dist/iwmlib.js index 0cbf467..448f3fb 100644 --- a/dist/iwmlib.js +++ b/dist/iwmlib.js @@ -3136,7 +3136,7 @@ scaleAutoClose = false, scaleCloseThreshold = 0.10, scaleCloseBuffer = 0.05, - maxRotation = 5 + maxRotation = Angle.degree2radian(5) } = {}) { if (rotationDegrees != null && rotation != null) { throw new Error('Use rotationDegrees or rotation but not both') @@ -3215,7 +3215,6 @@ gesture(interaction) { let delta = interaction.delta(); - console.log("gesture", delta.rotate); if (delta != null) { this.addVelocity(delta); let alpha = delta.rotate; diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js index bc18fb1..7ca6108 100644 --- a/dist/iwmlib.pixi.js +++ b/dist/iwmlib.pixi.js @@ -6303,7 +6303,7 @@ scaleAutoClose = false, scaleCloseThreshold = 0.10, scaleCloseBuffer = 0.05, - maxRotation = 5 + maxRotation = Angle.degree2radian(5) } = {}) { if (rotationDegrees != null && rotation != null) { throw new Error('Use rotationDegrees or rotation but not both') @@ -6382,7 +6382,6 @@ gesture(interaction) { let delta = interaction.delta(); - console.log("gesture", delta.rotate); if (delta != null) { this.addVelocity(delta); let alpha = delta.rotate; diff --git a/lib/scatter.js b/lib/scatter.js index 76de55e..5788272 100644 --- a/lib/scatter.js +++ b/lib/scatter.js @@ -269,7 +269,7 @@ export class AbstractScatter extends Throwable { scaleAutoClose = false, scaleCloseThreshold = 0.10, scaleCloseBuffer = 0.05, - maxRotation = 5 + maxRotation = Angle.degree2radian(5) } = {}) { if (rotationDegrees != null && rotation != null) { throw new Error('Use rotationDegrees or rotation but not both') @@ -348,7 +348,6 @@ export class AbstractScatter extends Throwable { gesture(interaction) { let delta = interaction.delta() - console.log("gesture", delta.rotate) if (delta != null) { this.addVelocity(delta) let alpha = delta.rotate diff --git a/package-lock.json b/package-lock.json index 1281fd0..a22b15d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iwmlib", - "version": "1.0.10", + "version": "1.0.15", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -184,9 +184,9 @@ } }, "@types/pixi.js": { - "version": "4.8.7", - "resolved": "https://registry.npmjs.org/@types/pixi.js/-/pixi.js-4.8.7.tgz", - "integrity": "sha512-SuaeAVDWNbvVzg+ipVrNzVxMDZHaa/MRNT/+Y270sYp/qxfB31KC1wEt7KDVNq9Ac/pRdSDrxVDcLDUaYn0aVg==" + "version": "4.8.8", + "resolved": "https://registry.npmjs.org/@types/pixi.js/-/pixi.js-4.8.8.tgz", + "integrity": "sha512-5wmLnmL3foK/rqYMrrEM/3DxEwvwxJaP73RyqY8aMqq8zUm6CBlmc+12RIBH6iR/RHqU76XL238vWWJV1IN/zw==" }, "acorn": { "version": "5.7.3", @@ -194,9 +194,9 @@ "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" }, "agent-base": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", - "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", "requires": { "es6-promisify": "^5.0.0" } @@ -1049,9 +1049,9 @@ } }, "es6-promise": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz", - "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==" + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, "es6-promisify": { "version": "5.0.0", @@ -1430,13 +1430,20 @@ } }, "fs-extra": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz", - "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "requires": { - "graceful-fs": "^4.1.2", + "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", "universalify": "^0.1.0" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz", + "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==" + } } }, "fs-mkdirp-stream": { @@ -2502,9 +2509,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, @@ -2770,6 +2777,14 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, "just-debounce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", @@ -2962,9 +2977,9 @@ } }, "mime": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz", - "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==" + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", + "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" }, "mini-signals": { "version": "1.2.0", @@ -3416,22 +3431,22 @@ "integrity": "sha1-i0tcQzsx5Bm8N53FZc4bg1qRs3I=" }, "pixi-particles": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/pixi-particles/-/pixi-particles-4.1.0.tgz", - "integrity": "sha512-By5470dTkHCTrM3T2xrFg9YRH6XK9BNpZjTZmWNzsHmyPbWB+4E/fg66b1DKFQ/vgez6xQm8wfHWcOpNrHWWHg==" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/pixi-particles/-/pixi-particles-4.1.1.tgz", + "integrity": "sha512-R/vnqXzD2X4v4mSi3zJE81i1vGWaaZSDI/ImaZr8G4E0qBq2+OxB97Kb9WVWd7BlLFj4wR09VGKm7e5sQGQy4Q==" }, "pixi-projection": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/pixi-projection/-/pixi-projection-0.2.7.tgz", - "integrity": "sha512-zrMUs2lDmPQX8AHXr14/MNGKXRlqr/XBjyI4Pm9fwz2sxMkz+QRLCa1weUrHXbfv1e6GjUe4tJ8KgqeNuRkc3w==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/pixi-projection/-/pixi-projection-0.2.8.tgz", + "integrity": "sha512-3K06VHVDNm0rnCd72HhH9cZF/davWZXIMcJMFzwAuIV9Io2ExQrUv3Eauri4A682jsoriM+stHgm+6n75Ps5lg==", "requires": { "@types/pixi.js": "^4.7.1" } }, "pixi.js": { - "version": "4.8.7", - "resolved": "https://registry.npmjs.org/pixi.js/-/pixi.js-4.8.7.tgz", - "integrity": "sha512-mx7YbHPkkWoj8FT3qBMkieAjBuuJ4yZWU7rq9NnCSUGpNrVlocrW179xrJQPVR2Q7JZ73ZGTwH7NOUZ9wgh7wA==", + "version": "4.8.8", + "resolved": "https://registry.npmjs.org/pixi.js/-/pixi.js-4.8.8.tgz", + "integrity": "sha512-wQzuLAWSMfV+x2guL5jZBp37pwCmYXHiTXG7ZWXu4E/5IsC9xozwmOfLeCNEyPzlyucOgxAx/HS+tLqxWPYX7Q==", "requires": { "bit-twiddle": "^1.0.2", "earcut": "^2.1.4", @@ -3501,9 +3516,9 @@ } }, "puppeteer": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.17.0.tgz", - "integrity": "sha512-3EXZSximCzxuVKpIHtyec8Wm2dWZn1fc5tQi34qWfiUgubEVYHjUvr0GOJojqf3mifI6oyKnCdrGxaOI+lWReA==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.18.1.tgz", + "integrity": "sha512-luUy0HPSuWPsPZ1wAp6NinE0zgetWtudf5zwZ6dHjMWfYpTQcmKveFRox7VBNhQ98OjNA9PQ9PzQyX8k/KrxTg==", "requires": { "debug": "^4.1.0", "extract-zip": "^1.6.6", @@ -3524,9 +3539,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, diff --git a/package.json b/package.json index cbfce9c..63bca56 100644 --- a/package.json +++ b/package.json @@ -34,10 +34,10 @@ "optimal-select": "^4.0.1", "pixi-compressed-textures": "^1.1.8", "pixi-filters": "^2.7.1", - "pixi-particles": "^4.1.0", - "pixi-projection": "^0.2.7", - "pixi.js": "^4.8.7", + "pixi-particles": "^4.1.1", + "pixi-projection": "^0.2.8", + "pixi.js": "^4.8.8", "propagating-hammerjs": "^1.4.6", - "puppeteer": "^1.16.0" + "puppeteer": "^1.18.1" } }