Browse Source

Moved addVelocity to _move.

master
Severin Opel 1 week ago
parent
commit
fa0256d782
2 changed files with 11 additions and 6 deletions
  1. +2
    -2
      lib/interaction.js
  2. +9
    -4
      lib/scatter.js

+ 2
- 2
lib/interaction.js View File

@ -849,8 +849,8 @@ export class InteractionDelegate {
if (Events.isCaptured(event)) {
return false
}
let captured = this.target.capture(event)
return captured
return this.target.capture ? this.target.capture(event) : false
}
getPosition(event) {

+ 9
- 4
lib/scatter.js View File

@ -117,6 +117,9 @@ class Throwable {
let t = performance.now()
let dt = t - this.lastframe
this.lastframe = t
// When number is not set or is zero. Use one instead.
let number = delta.number ? delta.number : 1
if (dt > 0) {
// Avoid division by zero errors later on
// and consider the number of involved pointers sind addVelocity will be called by the
@ -124,13 +127,14 @@ class Throwable {
let velocity = {
t: t,
dt: dt,
dx: delta.x / delta.number,
dy: delta.y / delta.number
dx: delta.x / number,
dy: delta.y / number
}
this.velocities.push(velocity)
while (this.velocities.length > buffer) {
this.velocities.shift()
}
}
}
@ -378,7 +382,6 @@ export class AbstractScatter extends Throwable {
let delta = interaction.delta()
if (delta != null) {
this.addVelocity(delta)
let rotate = delta.rotate
let zoom = delta.zoom
if (this.maxRotation != null) {
@ -578,6 +581,7 @@ export class AbstractScatter extends Throwable {
}
_move(delta) {
this.addVelocity(delta)
this.x += this.movableX ? delta.x : 0
this.y += this.movableX ? delta.y : 0
}
@ -1392,7 +1396,8 @@ export class DOMScatter extends AbstractScatter {
}
this._x = x
this._y = y
TweenLite.set(this.element, { x: x, y: y })
this.addVelocity({ x: delta.x, y: delta.y })
TweenLite.set(this.element, { x, y })
}
resizeAfterTransform(zoom) {

Loading…
Cancel
Save