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

Removed obsolete comments.

Browse Source
This commit is contained in:
Uwe Oestermeier 2019-05-31 06:31:09 +02:00
parent b26a5e902c
commit d114edc1e2
2 changed files with 814 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/interaction.js
View File

@ -201,16 +201,13 @@ export class InteractionPoints {
let p1 = this.previous.get(c1.key) let p1 = this.previous.get(c1.key)
let p2 = this.previous.get(c2.key) let p2 = this.previous.get(c2.key)
//let p1 = previous[0]
//let p2 = previous[1]
let d1 = Points.subtract(c1, p1) let d1 = Points.subtract(c1, p1)
let d2 = Points.subtract(c2, p2) let d2 = Points.subtract(c2, p2)
let cm = Points.mean(c1, c2) let cm = Points.mean(c1, c2)
//let pm = Points.mean(p1, p2)
// UO: Using the mean lead to jumps between time slices with 3 and 2 fingers // Using the mean leads to jumps between time slices with 3 and 2 fingers
// We use the mean of deltas instead // We use the mean of deltas instead
let delta = Points.mean(d1, d2) //Points.subtract(cm, pm) let delta = Points.mean(d1, d2)
let zoom = 1.0 let zoom = 1.0
let distance1 = Points.distance(p1, p2) let distance1 = Points.distance(p1, p2)
let distance2 = Points.distance(c1, c2) let distance2 = Points.distance(c1, c2)
@ -222,7 +219,8 @@ export class InteractionPoints {
let alpha = this.diffAngle(currentAngle, previousAngle) let alpha = this.diffAngle(currentAngle, previousAngle)
return new InteractionDelta(delta.x, delta.y, zoom, alpha, cm) return new InteractionDelta(delta.x, delta.y, zoom, alpha, cm)
} else if (csize == 1 && psize == 1 && this.current.firstKey() == this.previous.firstKey()) { } else if (csize == 1 && psize == 1 && this.current.firstKey() == this.previous.firstKey()) {
// We need to ensure that the keys are the same // We need to ensure that the keys are the same, since single points with different keys
// can jump
let current = this.current.first() let current = this.current.first()
let previous = this.previous.first() let previous = this.previous.first()
let delta = Points.subtract(current, previous) let delta = Points.subtract(current, previous)

836
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff