IWMBrowser/iwmlib
IWMBrowser/iwmlib
4
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Merge branch 'master' of gitea.iwm-tuebingen.de:IWMBrowser/iwmlib

Browse Source
This commit is contained in:
Sebastian Kupke 2021-02-24 16:14:26 +01:00
commit 1b4eee6498
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/interaction.js
View File

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

13
lib/scatter.js
View File

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