From a5f94e0a5fe7b164841b35d83fc0fbb9246a1ef6 Mon Sep 17 00:00:00 2001 From: uoestermeier Date: Mon, 15 Mar 2021 15:39:07 +0100 Subject: [PATCH] Reverted changes from commit fa0256d782dd498c6d3e51321260ca375ca9f855 and moved addVelocity from _move back to old locations. --- dist/iwmlib.js | 5 +++-- dist/iwmlib.pixi.js | 5 +++-- lib/scatter.js | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dist/iwmlib.js b/dist/iwmlib.js index fedc6d9..6f189b9 100644 --- a/dist/iwmlib.js +++ b/dist/iwmlib.js @@ -3483,6 +3483,7 @@ let delta = interaction.delta(); if (delta != null) { + this.addVelocity(delta); // uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 let rotate = delta.rotate; let zoom = delta.zoom; if (this.maxRotation != null) { @@ -3682,7 +3683,7 @@ } _move(delta) { - this.addVelocity(delta); + // this.addVelocity(delta) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 this.x += this.movableX ? delta.x : 0; this.y += this.movableX ? delta.y : 0; } @@ -4497,7 +4498,7 @@ } this._x = x; this._y = y; - this.addVelocity({ x: delta.x, y: delta.y }); + // this.addVelocity({ x: delta.x, y: delta.y }) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 TweenLite.set(this.element, { x, y }); } diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js index b6fb541..b77fe7c 100644 --- a/dist/iwmlib.pixi.js +++ b/dist/iwmlib.pixi.js @@ -7033,6 +7033,7 @@ let delta = interaction.delta(); if (delta != null) { + this.addVelocity(delta); // uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 let rotate = delta.rotate; let zoom = delta.zoom; if (this.maxRotation != null) { @@ -7232,7 +7233,7 @@ } _move(delta) { - this.addVelocity(delta); + // this.addVelocity(delta) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 this.x += this.movableX ? delta.x : 0; this.y += this.movableX ? delta.y : 0; } @@ -7867,7 +7868,7 @@ } this._x = x; this._y = y; - this.addVelocity({ x: delta.x, y: delta.y }); + // this.addVelocity({ x: delta.x, y: delta.y }) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 TweenLite.set(this.element, { x, y }); } diff --git a/lib/scatter.js b/lib/scatter.js index c6def64..2f23654 100644 --- a/lib/scatter.js +++ b/lib/scatter.js @@ -382,6 +382,7 @@ export class AbstractScatter extends Throwable { let delta = interaction.delta() if (delta != null) { + this.addVelocity(delta) // uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 let rotate = delta.rotate let zoom = delta.zoom if (this.maxRotation != null) { @@ -581,7 +582,7 @@ export class AbstractScatter extends Throwable { } _move(delta) { - this.addVelocity(delta) + // this.addVelocity(delta) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 this.x += this.movableX ? delta.x : 0 this.y += this.movableX ? delta.y : 0 } @@ -1396,7 +1397,7 @@ export class DOMScatter extends AbstractScatter { } this._x = x this._y = y - this.addVelocity({ x: delta.x, y: delta.y }) + // this.addVelocity({ x: delta.x, y: delta.y }) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855 TweenLite.set(this.element, { x, y }) }