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

bin/testrunner.js

@@ -7,7 +7,8 @@
  */
 
 const puppeteer = require('puppeteer');
-const fs = require("fs")
+const fs_bare = require("fs") // required for fs-extra
+const fs = require("fs-extra")
 const path = require("path")
 const start_dir = process.cwd()
 const start_file = path.join(start_dir,"lib","index.html")
@@ -39,18 +40,24 @@ async function makeScreenshot(href){
     page.once("load",logPageEvent)
 
     await page.goto(href)
+    href = href.replace("file:///","")
     const fname = path.parse(href).name
-
+    let fpath
     if (fname != "index"){
         image_url = href.replace(fname + ".html" ,"thumbnails/" + fname + ".png")
+        fpath = href.replace(fname + ".html", "thumbnails")
     }
     else{
         image_url = href.replace(fname + ".html" ,"thumbnail.png")
+        fpath = href.replace(fname + ".html", "")
     }
-    image_url = image_url.replace("file:///","")
+    // image_url = image_url.replace("file:///","")
+    // fpath = fpath.replace("file:///","")
     
     page.removeAllListeners()
     
+    fs.ensureDir(fpath)
+
     await page.screenshot({path: image_url});
     await browser.close();
 }

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 @@
             }
         }
 
-        animateThrow(time) {
-            if (this.velocity != null) {
+        _throwDeltaTime() {
             let t = performance.now();
             let dt = t - this.lastframe;
             this.lastframe = t;
+            return dt
+        }
+
+        animateThrow(time) {
+            if (this.velocity != null) {
+                let dt = this._throwDeltaTime();
                 // 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) {
-                // this.resizeButton.style.width = 50/this.scale+"px"
-                // this.resizeButton.style.height = 50/this.scale+"px"
-            }
+            if (this.resizeButton != null) ;
         }
 
         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 @@
             }
         }
 
-        animateThrow(time) {
-            if (this.velocity != null) {
+        _throwDeltaTime() {
             let t = performance.now();
             let dt = t - this.lastframe;
             this.lastframe = t;
+            return dt
+        }
+
+        animateThrow(time) {
+            if (this.velocity != null) {
+                let dt = this._throwDeltaTime();
                 // 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) {
-                // this.resizeButton.style.width = 50/this.scale+"px"
-                // this.resizeButton.style.height = 50/this.scale+"px"
-            }
+            if (this.resizeButton != null) ;
         }
 
         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;
-    const keptBaseTextures = [];
+    let keepTextures = 0;
+    const keptTextures = [];
 
     /** The current Tile implementation simply uses PIXI.Sprites.
      *
@@ -7828,8 +7829,8 @@
          * @param {*} value
          * @memberof Tile
          */
-        static enableKeepBaseTextures(value = 1000) {
-            keepBaseTextures = value;
+        static enableKeepTextures(value = 1000) {
+            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) {
-                keptBaseTextures.push({ url: this.url, texture: this.texture.baseTexture});
+            if (keepTextures > 0) {
+                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) {
-                    let {url, texture} = keptBaseTextures.shift();
-                    let tiles = registeredTiles.get(url);
-                    if (tiles.size > 0 && !Tile.isPending(url)) {
-                        texture.destroy();
-                        if (debug) console.log("Destroying baseTexture", url);
+                while (keptTextures.length > keepTextures) {
+                    let { url, texture } = keptTextures.shift();
+                    if (Tile.isObsolete(url)) {
+                        texture.destroy(true); // Destroy base as well
+                        if (debug) console.log("Destroying texture and 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);
-                texture.destroy(destroyBase);
+                let url = resource.url;
+                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') {
@@ -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
@@ -635,7 +636,7 @@ export class DeepZoomImage extends PIXI.Container {
     }
 
     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) {
@@ -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,16 +1080,14 @@ export class DeepZoomImage extends PIXI.Container {
    * @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/pixi/deepzoom/tile.js

@@ -1,3 +1,5 @@
+/* ES Lint  */
+/* globals PIXI, console*/
 
 const registeredTiles = new Map()
 const pendingTiles = new Map()
@@ -139,18 +141,18 @@ export default class Tile extends PIXI.Sprite {
      * @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 (keepTextures > 0) {
-            keptTextures.push({ url: this.url, texture: this.texture})
+            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(keptTextures.length > keepTextures) {
-                let {url, texture} = keptTextures.shift() 
+            while (keptTextures.length > keepTextures) {
+                let { url, texture } = keptTextures.shift()
                 if (Tile.isObsolete(url)) {
                     texture.destroy(true) // Destroy base as well
                     if (debug) console.log("Destroying texture and baseTexture", url)

lib/scatter.js

@@ -173,11 +173,16 @@ class Throwable {
         }
     }
 
-    animateThrow(time) {
-        if (this.velocity != null) {
+    _throwDeltaTime() {
         let t = performance.now()
         let dt = t - this.lastframe
         this.lastframe = t
+        return dt
+    }
+
+    animateThrow(time) {
+        if (this.velocity != null) {
+            let dt = this._throwDeltaTime()
             // 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-lock.json

@@ -1429,6 +1429,16 @@
                 "map-cache": "^0.2.2"
             }
         },
+        "fs-extra": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+            "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+            "requires": {
+                "graceful-fs": "^4.1.2",
+                "jsonfile": "^4.0.0",
+                "universalify": "^0.1.0"
+            }
+        },
         "fs-mkdirp-stream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -1464,8 +1474,7 @@
                 "ansi-regex": {
                     "version": "2.1.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "aproba": {
                     "version": "1.2.0",
@@ -1486,14 +1495,12 @@
                 "balanced-match": {
                     "version": "1.0.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "brace-expansion": {
                     "version": "1.1.11",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "balanced-match": "^1.0.0",
                         "concat-map": "0.0.1"
@@ -1508,20 +1515,17 @@
                 "code-point-at": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "core-util-is": {
                     "version": "1.0.2",
@@ -1638,8 +1642,7 @@
                 "inherits": {
                     "version": "2.0.3",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "ini": {
                     "version": "1.3.5",
@@ -1651,7 +1654,6 @@
                     "version": "1.0.0",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
                     }
@@ -1666,7 +1668,6 @@
                     "version": "3.0.4",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
@@ -1674,14 +1675,12 @@
                 "minimist": {
                     "version": "0.0.8",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "minipass": {
                     "version": "2.3.5",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
                         "yallist": "^3.0.0"
@@ -1700,7 +1699,6 @@
                     "version": "0.5.1",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "minimist": "0.0.8"
                     }
@@ -1781,8 +1779,7 @@
                 "number-is-nan": {
                     "version": "1.0.1",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "object-assign": {
                     "version": "4.1.1",
@@ -1794,7 +1791,6 @@
                     "version": "1.4.0",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "wrappy": "1"
                     }
@@ -1880,8 +1876,7 @@
                 "safe-buffer": {
                     "version": "5.1.2",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "safer-buffer": {
                     "version": "2.1.2",
@@ -1917,7 +1912,6 @@
                     "version": "1.0.2",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -1937,7 +1931,6 @@
                     "version": "3.0.1",
                     "bundled": true,
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
@@ -1981,14 +1974,12 @@
                 "wrappy": {
                     "version": "1.0.2",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "yallist": {
                     "version": "3.0.3",
                     "bundled": true,
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
         },
@@ -4432,6 +4423,11 @@
                 "through2-filter": "^3.0.0"
             }
         },
+        "universalify": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+        },
         "unset-value": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "iwmlib",
-    "version": "1.0.10",
+    "version": "1.0.12",
     "description": "An Open Source library for multi-touch, WebGL powered applications.",
     "main": "index.js",
     "directories": {
@@ -28,6 +28,7 @@
         "gulp-uglify": "^3.0.2"
     },
     "dependencies": {
+        "fs-extra": "^8.0.1",
         "gsap": "^2.1.3",
         "hammerjs": "^2.0.8",
         "optimal-select": "^4.0.1",