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

dist/iwmlib.3rdparty.js

@@ -92733,86 +92733,86 @@ module.exports = function (_Plugin) {
 
 },{}]},{},[13]);
 
-/*jslint plusplus: true, vars: true, indent: 2 */
+/*jslint plusplus: true, vars: true, indent: 2 */
-/* convertPointFromPageToNode.js from
+/* convertPointFromPageToNode.js from
- <script src="https://gist.github.com/Yaffle/1145197.js"></script>
+ <script src="https://gist.github.com/Yaffle/1145197.js"></script>
-
+
-  convertPointFromPageToNode(element, event.pageX, event.pageY) -> {x, y}
+  convertPointFromPageToNode(element, event.pageX, event.pageY) -> {x, y}
-  returns coordinate in element's local coordinate system (works properly
+  returns coordinate in element's local coordinate system (works properly
-  with css transforms without perspective projection)
+  with css transforms without perspective projection)
-  convertPointFromNodeToPage(element, offsetX, offsetY) -> {x, y}
+  convertPointFromNodeToPage(element, offsetX, offsetY) -> {x, y}
-  returns coordinate in window's coordinate system (works properly with
+  returns coordinate in window's coordinate system (works properly with
-  css transforms without perspective projection)
+  css transforms without perspective projection)
-*/
+*/
-
+
-(function () {
+(function () {
-    'use strict'
+    'use strict'
-
+
-    var I = (typeof(WebKitCSSMatrix) == 'undefined') ? new DOMMatrix() : new WebKitCSSMatrix()
+    var I = (typeof(WebKitCSSMatrix) == 'undefined') ? new DOMMatrix() : new WebKitCSSMatrix()
-
+
-    function Point(x, y, z) {
+    function Point(x, y, z) {
-        this.x = x
+        this.x = x
-        this.y = y
+        this.y = y
-        this.z = z
+        this.z = z
-    }
+    }
-
+
-    Point.prototype.transformBy = function (matrix) {
+    Point.prototype.transformBy = function (matrix) {
-        var tmp = matrix.multiply(I.translate(this.x, this.y, this.z))
+        var tmp = matrix.multiply(I.translate(this.x, this.y, this.z))
-        return new Point(tmp.m41, tmp.m42, tmp.m43)
+        return new Point(tmp.m41, tmp.m42, tmp.m43)
-    }
+    }
-
+
-    function createMatrix(transform) {
+    function createMatrix(transform) {
-        try {
+        try {
-            return (typeof(WebKitCSSMatrix) == 'undefined') ? new DOMMatrix(transform) : new WebKitCSSMatrix(transform)
+            return (typeof(WebKitCSSMatrix) == 'undefined') ? new DOMMatrix(transform) : new WebKitCSSMatrix(transform)
-        } catch(e) {
+        } catch(e) {
-            console.warn(transform)
+            console.warn(transform)
-            console.warn(e.toString())
+            console.warn(e.toString())
-            return I
+            return I
-        }
+        }
-    }
+    }
-
+
-    function getTransformationMatrix(element) {
+    function getTransformationMatrix(element) {
-        var transformationMatrix = I
+        var transformationMatrix = I
-        var x = element
+        var x = element
-
+
-        while (x != undefined && x !== x.ownerDocument.documentElement) {
+        while (x != undefined && x !== x.ownerDocument.documentElement) {
-            var computedStyle = window.getComputedStyle(x, undefined)
+            var computedStyle = window.getComputedStyle(x, undefined)
-            var transform = computedStyle.transform || 'none'
+            var transform = computedStyle.transform || 'none'
-            var c = transform === 'none' ? I : createMatrix(transform)
+            var c = transform === 'none' ? I : createMatrix(transform)
-            transformationMatrix = c.multiply(transformationMatrix)
+            transformationMatrix = c.multiply(transformationMatrix)
-            x = x.parentNode
+            x = x.parentNode
-        }
+        }
-
+
-        var w = element.offsetWidth
+        var w = element.offsetWidth
-        var h = element.offsetHeight
+        var h = element.offsetHeight
-        var i = 4
+        var i = 4
-        var left = +Infinity
+        var left = +Infinity
-        var top = +Infinity
+        var top = +Infinity
-        while (--i >= 0) {
+        while (--i >= 0) {
-            var p = new Point(i === 0 || i === 1 ? 0 : w, i === 0 || i === 3 ? 0 : h,
+            var p = new Point(i === 0 || i === 1 ? 0 : w, i === 0 || i === 3 ? 0 : h,
-                        0).transformBy(transformationMatrix)
+                        0).transformBy(transformationMatrix)
-            if (p.x < left) {
+            if (p.x < left) {
-                left = p.x
+                left = p.x
-            }
+            }
-            if (p.y < top) {
+            if (p.y < top) {
-                top = p.y
+                top = p.y
-            }
+            }
-        }
+        }
-        var rect = element.getBoundingClientRect()
+        var rect = element.getBoundingClientRect()
-        transformationMatrix = I.translate(window.pageXOffset + rect.left - left,
+        transformationMatrix = I.translate(window.pageXOffset + rect.left - left,
-                                        window.pageYOffset + rect.top - top, 0)
+                                        window.pageYOffset + rect.top - top, 0)
-                            .multiply(transformationMatrix)
+                            .multiply(transformationMatrix)
-        return transformationMatrix
+        return transformationMatrix
-    }
+    }
-
+
-    window.convertPointFromPageToNode = function (element, pageX, pageY) {
+    window.convertPointFromPageToNode = function (element, pageX, pageY) {
-        return new Point(pageX, pageY, 0).transformBy(
+        return new Point(pageX, pageY, 0).transformBy(
-                                    getTransformationMatrix(element).inverse())
+                                    getTransformationMatrix(element).inverse())
-    }
+    }
-
+
-    window.convertPointFromNodeToPage = function (element, offsetX, offsetY) {
+    window.convertPointFromNodeToPage = function (element, offsetX, offsetY) {
-        return new Point(offsetX, offsetY, 0).transformBy(
+        return new Point(offsetX, offsetY, 0).transformBy(
-                                    getTransformationMatrix(element))
+                                    getTransformationMatrix(element))
-    }
+    }
-
+
-}())
+}())

dist/iwmlib.js

@@ -2336,8 +2336,6 @@
         onMouseWheel(event) {
             if (this.capture(event) && this.target.onMouseWheel) {
                 this.target.onMouseWheel(event);
-            } else {
-                //console.warn('Target has no onMouseWheel callback')
             }
         }
 
@@ -2531,8 +2529,6 @@
                 }
                 if (this.target.onMouseWheel) {
                     this.target.onMouseWheel(event);
-                } else {
-                    //console.warn('Target has no onMouseWheel callback', this.target)
                 }
             }
         }
@@ -2999,11 +2995,16 @@
             }
         }
 
+        _throwDeltaTime() {
+            let t = performance.now();
+            let dt = t - this.lastframe;
+            this.lastframe = t;
+            return dt
+        }
+
         animateThrow(time) {
             if (this.velocity != null) {
-                let t = performance.now();
+                let dt = this._throwDeltaTime();
-                let dt = t - this.lastframe;
-                this.lastframe = t;
                 // console.log("animateThrow", dt)
                 let next = this.nextVelocity(this.velocity);
                 let prevLength = Points.length(this.velocity);
@@ -4206,10 +4207,7 @@
                 let event = new ResizeEvent(this, { width: w, height: h });
                 this.onResize(event);
             }
-            if (this.resizeButton != null) {
+            if (this.resizeButton != null) ;
-                // this.resizeButton.style.width = 50/this.scale+"px"
-                // this.resizeButton.style.height = 50/this.scale+"px"
-            }
         }
 
         startResize(e) {
@@ -4260,7 +4258,7 @@
                 let resizeW = r * Math.cos(Angle.degree2radian(phiCorrected));
                 let resizeH = -r * Math.sin(Angle.degree2radian(phiCorrected));
 
-                if (this.element.offsetWidth + resizeW / this.scale > this.width * 0.3 && this.element.offsetHeight + resizeH / this.scale > this.height * 0.3) TweenLite.to(this.element, 0, { width: this.element.offsetWidth + resizeW / this.scale, height: this.element.offsetHeight + resizeH / this.scale });
+                if ((this.element.offsetWidth + resizeW) / this.scale > this.width * 0.5 / this.scale && (this.element.offsetHeight + resizeH) / this.scale > this.height * 0.3  / this.scale) TweenLite.to(this.element, 0, { width: this.element.offsetWidth + resizeW / this.scale, height: this.element.offsetHeight + resizeH / this.scale });
 
                 this.oldX = e.clientX;
                 this.oldY = e.clientY;

dist/iwmlib.pixi.js

@@ -5500,8 +5500,6 @@
         onMouseWheel(event) {
             if (this.capture(event) && this.target.onMouseWheel) {
                 this.target.onMouseWheel(event);
-            } else {
-                //console.warn('Target has no onMouseWheel callback')
             }
         }
 
@@ -5695,8 +5693,6 @@
                 }
                 if (this.target.onMouseWheel) {
                     this.target.onMouseWheel(event);
-                } else {
-                    //console.warn('Target has no onMouseWheel callback', this.target)
                 }
             }
         }
@@ -6163,11 +6159,16 @@
             }
         }
 
+        _throwDeltaTime() {
+            let t = performance.now();
+            let dt = t - this.lastframe;
+            this.lastframe = t;
+            return dt
+        }
+
         animateThrow(time) {
             if (this.velocity != null) {
-                let t = performance.now();
+                let dt = this._throwDeltaTime();
-                let dt = t - this.lastframe;
-                this.lastframe = t;
                 // console.log("animateThrow", dt)
                 let next = this.nextVelocity(this.velocity);
                 let prevLength = Points.length(this.velocity);
@@ -7208,10 +7209,7 @@
                 let event = new ResizeEvent(this, { width: w, height: h });
                 this.onResize(event);
             }
-            if (this.resizeButton != null) {
+            if (this.resizeButton != null) ;
-                // this.resizeButton.style.width = 50/this.scale+"px"
-                // this.resizeButton.style.height = 50/this.scale+"px"
-            }
         }
 
         startResize(e) {
@@ -7803,11 +7801,14 @@
         }
     }
 
+    /* ES Lint  */
+    /* globals PIXI, console*/
+
     const registeredTiles = new Map();
     const pendingTiles = new Map();
     /** Implements a baseTexture cache. The last textures are kept for reuse  */
-    const keepBaseTextures = 0;
+    let keepTextures = 0;
-    const keptBaseTextures = [];
+    const keptTextures = [];
 
     /** The current Tile implementation simply uses PIXI.Sprites.
      *
@@ -7828,8 +7829,8 @@
          * @param {*} value
          * @memberof Tile
          */
-        static enableKeepBaseTextures(value = 1000) {
+        static enableKeepTextures(value = 1000) {
-            keepBaseTextures = value;
+            keepTextures = value;
         }
 
         /**
@@ -7852,13 +7853,21 @@
          * Returns true iff the url is pending
          *
          * @static
+         * @param {*} url
          * @returns
          * @memberof Tile
          */
-        static isPending() {
+        static isPending(url) {
             return pendingTiles.has(url) && pendingTiles.get(url) > 0
         }
 
+        static isObsolete(url) {
+            if (registeredTiles.has(url) && registeredTiles.get(url) > 0) {
+                return false
+            }
+            return true
+        }
+
         /**
          * Removes the given url from pending urls.
          *
@@ -7924,6 +7933,7 @@
             tiles.delete(this);
             if (tiles.size == 0) {
                 registeredTiles.delete(this.url);
+                return 0
             }
             return tiles.size
         }
@@ -7934,28 +7944,27 @@
          * @param {*} options  Part of the PIXI API, but ignored in the implementation
          * @memberof Tile
          */
-        destroy(options, debug = true) {
+        destroy(options, debug = false) {
             let count = this.unregister();
 
-            if (keepBaseTextures > 0) {
+            if (keepTextures > 0) {
-                keptBaseTextures.push({ url: this.url, texture: this.texture.baseTexture});
+                keptTextures.push({ url: this.url, texture: this.texture });
 
                 let opts = { children: true, texture: false, baseTexture: false };
                 if (debug) console.log("Tile.destroy", registeredTiles.size, opts);
                 super.destroy(opts);
 
-                while(keptBaseTextures.length > keepBaseTextures) {
+                while (keptTextures.length > keepTextures) {
-                    let {url, texture} = keptBaseTextures.shift();
+                    let { url, texture } = keptTextures.shift();
-                    let tiles = registeredTiles.get(url);
+                    if (Tile.isObsolete(url)) {
-                    if (tiles.size > 0 && !Tile.isPending(url)) {
+                        texture.destroy(true); // Destroy base as well
-                        texture.destroy();
+                        if (debug) console.log("Destroying texture and baseTexture", url);
-                        if (debug) console.log("Destroying baseTexture", url);
                     }
                 }
             }
             else {
                 // No longer registered and not pending
-                if (count <= 0 && !Tile.isPending(url)) {
+                if (count <= 0 && !Tile.isPending(this.url)) {
                     let opts = { children: true, texture: true, baseTexture: true };
                     super.destroy(opts);
                     if (debug) console.log("Tile.destroy", registeredTiles.size, opts);
@@ -7971,7 +7980,6 @@
                     this.visible = false;
                 }
             }
-            
         }
 
         /**
@@ -7992,6 +8000,16 @@
             return null
         }
 
+        /**
+         * Texture received too late. We do not need it.
+         * @param {*} url 
+         * @param {*} texture 
+         */
+        static lateTexture(url, texture) {
+            let destroyBase = !registeredTiles.has(url);
+            texture.destroy(destroyBase);
+        }
+
         static printInfos() {
             let references = new Map();
             let multiples = 0;
@@ -8166,8 +8184,8 @@
         _onLoaded(loader, resource) {
             if (this.destroyed) {
                 let texture = resource.texture;
-                let destroyBase = !deepZoomTileCache.has(resource.url);
+                let url = resource.url;
-                texture.destroy(destroyBase);
+                Tile.lateTexture(url, texture);
                 console.warn("Received resource after destroy", texture);
                 return
             }
@@ -8985,6 +9003,7 @@
                 : 1;
             this.alpha = alpha;
             this.fastLoads = 0;
+            this.active = true;
             this.autoLoadTiles = autoLoadTiles;
             this.minimumLevel = minimumLevel;
             this.quadTrees = new Map(); // url as keys, TileQuadNodes as values
@@ -9256,7 +9275,7 @@
         }
 
         worldBounds() {
-            let viewBounds = this.app.scene.getBounds();
+            let viewBounds = this.app.scene.bounds; // UO: Never use getBounds()
             // Using getBounds extends visible scope after loading tiles and leads
             // to excessive loading
             if (this.world != null) {
@@ -9638,6 +9657,9 @@
          * @param {boolean} debug - log debug infos
          */
         transformed(event) {
+            if (!this.active) {
+                return
+            }
             let key = this.currentLevel.toString();
             let currentTiles = this.tileLayers[key];
             if (typeof currentTiles == 'undefined') {
@@ -9660,7 +9682,7 @@
                 this.ensureTiles(this.currentLevel, event.about);
                 return
             }
-            
+
             let level = this.levelForScale(event.scale);
             let newLevel = Math.max(level, this.minimumLevel);
             if (newLevel != this.currentLevel) {
@@ -9685,6 +9707,7 @@
        * @memberof DeepZoomImage
        */
         activate() {
+            this.active = true;
             this.destroyTilesAboveLevel(this.currentLevel);
             this.ensureTiles(this.currentLevel, null);
             //console.log("Activate Textures!", this.currentLevel)
@@ -9696,16 +9719,14 @@
        * @memberof DeepZoomImage
        */
         deactivate() {
+            this.active = false;
             this.destroyAllTiles();
-            Object.keys(this.tileLayers).forEach(key => {
-                this.destroyTiles(key);
-            });
             this.tileContainer.destroy({ children: true });
             printTileCacheInfos();
         }
 
         throwFinished() {
-            console.log("throwFinished");
+            //console.log("throwFinished")
             let key = this.currentLevel.toString();
             let currentTiles = this.tileLayers[key];
             if (typeof currentTiles == 'undefined') {

lib/interaction.html

@@ -23,7 +23,7 @@ a single delegate pattern.
 <p>The main differences are that <code>PointerEvent</code> are fired for each
 touch point, whereas the <code>TouchEvent</code> collects multiple
 <code>TouchPoints</code> into a single event. The basic PointMap and Interaction
-classes unify this behavior by collection all contact points regardless
+classes unify this behavior by collecting all contact points regardless
 of their original mouse, touch, or pointer events.</p>
 <h2>
     Point Maps

lib/pixi/deepzoom/image.js

@@ -364,6 +364,7 @@ export class DeepZoomImage extends PIXI.Container {
             : 1
         this.alpha = alpha
         this.fastLoads = 0
+        this.active = true
         this.autoLoadTiles = autoLoadTiles
         this.minimumLevel = minimumLevel
         this.quadTrees = new Map() // url as keys, TileQuadNodes as values
@@ -1017,6 +1018,9 @@ export class DeepZoomImage extends PIXI.Container {
      * @param {boolean} debug - log debug infos
      */
     transformed(event) {
+        if (!this.active) {
+            return
+        }
         let key = this.currentLevel.toString()
         let currentTiles = this.tileLayers[key]
         if (typeof currentTiles == 'undefined') {
@@ -1064,6 +1068,7 @@ export class DeepZoomImage extends PIXI.Container {
    * @memberof DeepZoomImage
    */
     activate() {
+        this.active = true
         this.destroyTilesAboveLevel(this.currentLevel)
         this.ensureTiles(this.currentLevel, null)
         //console.log("Activate Textures!", this.currentLevel)
@@ -1075,6 +1080,7 @@ export class DeepZoomImage extends PIXI.Container {
    * @memberof DeepZoomImage
    */
     deactivate() {
+        this.active = false
         this.destroyAllTiles()
         this.tileContainer.destroy({ children: true })
         printTileCacheInfos()

lib/pixi/deepzoom/tile.js

@@ -1,3 +1,5 @@
+/* ES Lint  */
+/* globals PIXI, console*/
 
 const registeredTiles = new Map()
 const pendingTiles = new Map()

lib/scatter.js

@@ -173,11 +173,16 @@ class Throwable {
         }
     }
 
+    _throwDeltaTime() {
+        let t = performance.now()
+        let dt = t - this.lastframe
+        this.lastframe = t
+        return dt
+    }
+
     animateThrow(time) {
         if (this.velocity != null) {
-            let t = performance.now()
+            let dt = this._throwDeltaTime()
-            let dt = t - this.lastframe
-            this.lastframe = t
             // console.log("animateThrow", dt)
             let next = this.nextVelocity(this.velocity)
             let prevLength = Points.length(this.velocity)
@@ -1434,7 +1439,7 @@ export class DOMScatter extends AbstractScatter {
             let resizeW = r * Math.cos(Angle.degree2radian(phiCorrected))
             let resizeH = -r * Math.sin(Angle.degree2radian(phiCorrected))
 
-            if (this.element.offsetWidth + resizeW / this.scale > this.width * 0.3 && this.element.offsetHeight + resizeH / this.scale > this.height * 0.3) TweenLite.to(this.element, 0, { width: this.element.offsetWidth + resizeW / this.scale, height: this.element.offsetHeight + resizeH / this.scale });
+            if ((this.element.offsetWidth + resizeW) / this.scale > this.width * 0.5 / this.scale && (this.element.offsetHeight + resizeH) / this.scale > this.height * 0.3  / this.scale) TweenLite.to(this.element, 0, { width: this.element.offsetWidth + resizeW / this.scale, height: this.element.offsetHeight + resizeH / this.scale });
 
             this.oldX = e.clientX
             this.oldY = e.clientY

package.json

@@ -1,6 +1,6 @@
 {
     "name": "iwmlib",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "description": "An Open Source library for multi-touch, WebGL powered applications.",
     "main": "index.js",
     "directories": {