Reverted changes from commit fa0256d782
and moved addVelocity from _move back to old locations.
This commit is contained in:
parent
fff7a4f685
commit
a5f94e0a5f
5
dist/iwmlib.js
vendored
5
dist/iwmlib.js
vendored
@ -3483,6 +3483,7 @@
|
|||||||
let delta = interaction.delta();
|
let delta = interaction.delta();
|
||||||
|
|
||||||
if (delta != null) {
|
if (delta != null) {
|
||||||
|
this.addVelocity(delta); // uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855
|
||||||
let rotate = delta.rotate;
|
let rotate = delta.rotate;
|
||||||
let zoom = delta.zoom;
|
let zoom = delta.zoom;
|
||||||
if (this.maxRotation != null) {
|
if (this.maxRotation != null) {
|
||||||
@ -3682,7 +3683,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
_move(delta) {
|
_move(delta) {
|
||||||
this.addVelocity(delta);
|
// this.addVelocity(delta) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855
|
||||||
this.x += this.movableX ? delta.x : 0;
|
this.x += this.movableX ? delta.x : 0;
|
||||||
this.y += this.movableX ? delta.y : 0;
|
this.y += this.movableX ? delta.y : 0;
|
||||||
}
|
}
|
||||||
@ -4497,7 +4498,7 @@
|
|||||||
}
|
}
|
||||||
this._x = x;
|
this._x = x;
|
||||||
this._y = y;
|
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 });
|
TweenLite.set(this.element, { x, y });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
5
dist/iwmlib.pixi.js
vendored
5
dist/iwmlib.pixi.js
vendored
@ -7033,6 +7033,7 @@
|
|||||||
let delta = interaction.delta();
|
let delta = interaction.delta();
|
||||||
|
|
||||||
if (delta != null) {
|
if (delta != null) {
|
||||||
|
this.addVelocity(delta); // uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855
|
||||||
let rotate = delta.rotate;
|
let rotate = delta.rotate;
|
||||||
let zoom = delta.zoom;
|
let zoom = delta.zoom;
|
||||||
if (this.maxRotation != null) {
|
if (this.maxRotation != null) {
|
||||||
@ -7232,7 +7233,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
_move(delta) {
|
_move(delta) {
|
||||||
this.addVelocity(delta);
|
// this.addVelocity(delta) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855
|
||||||
this.x += this.movableX ? delta.x : 0;
|
this.x += this.movableX ? delta.x : 0;
|
||||||
this.y += this.movableX ? delta.y : 0;
|
this.y += this.movableX ? delta.y : 0;
|
||||||
}
|
}
|
||||||
@ -7867,7 +7868,7 @@
|
|||||||
}
|
}
|
||||||
this._x = x;
|
this._x = x;
|
||||||
this._y = y;
|
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 });
|
TweenLite.set(this.element, { x, y });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -382,6 +382,7 @@ export class AbstractScatter extends Throwable {
|
|||||||
let delta = interaction.delta()
|
let delta = interaction.delta()
|
||||||
|
|
||||||
if (delta != null) {
|
if (delta != null) {
|
||||||
|
this.addVelocity(delta) // uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855
|
||||||
let rotate = delta.rotate
|
let rotate = delta.rotate
|
||||||
let zoom = delta.zoom
|
let zoom = delta.zoom
|
||||||
if (this.maxRotation != null) {
|
if (this.maxRotation != null) {
|
||||||
@ -581,7 +582,7 @@ export class AbstractScatter extends Throwable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_move(delta) {
|
_move(delta) {
|
||||||
this.addVelocity(delta)
|
// this.addVelocity(delta) uo: reverted commit fa0256d782dd498c6d3e51321260ca375ca9f855
|
||||||
this.x += this.movableX ? delta.x : 0
|
this.x += this.movableX ? delta.x : 0
|
||||||
this.y += this.movableX ? delta.y : 0
|
this.y += this.movableX ? delta.y : 0
|
||||||
}
|
}
|
||||||
@ -1396,7 +1397,7 @@ export class DOMScatter extends AbstractScatter {
|
|||||||
}
|
}
|
||||||
this._x = x
|
this._x = x
|
||||||
this._y = y
|
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 })
|
TweenLite.set(this.element, { x, y })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user