@xeokit/xeokit-sdk 2.6.17 → 2.6.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.17",
+  "version": "2.6.19",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",
@@ -11,7 +11,7 @@
     "docs": "rm -Rf ./docs/*; ./node_modules/.bin/esdoc",
     "typedocs": "rm -Rf ./docs/*; typedoc --tsconfig tsconfig.json",
     "publish": "npm publish --access public",
-    "changelog": "git fetch all; auto-changelog --commit-limit false --package --template changelog-template.hbs"
+    "changelog": "git fetch; auto-changelog --commit-limit false --package --template changelog-template.hbs"
   },
   "repository": {
     "type": "git",

package/src/extras/PointerLens/PointerLens.js

@@ -149,8 +149,8 @@ export class PointerLens {
         );
 
         const centerLensCanvas = [
-            (lensRect.left + lensRect.right) / 2,
-            (lensRect.top + lensRect.bottom) / 2
+            (lensRect.left + lensRect.right) / 2 - canvasRect.left,
+            (lensRect.top + lensRect.bottom) / 2 - canvasRect.top
         ];
 
         if (this._snappedCanvasPos) {

package/src/plugins/AnnotationsPlugin/Annotation.js

@@ -347,6 +347,7 @@ class Annotation extends Marker {
         if (this._marker) {
             if (!this._markerExternal) {
                 this._marker.parentNode.removeChild(this._marker);
+                this._marker = null;
             } else {
                 this._marker.removeEventListener("click", this._onMouseClickedExternalMarker);
                 this._marker.removeEventListener("mouseenter", this._onMouseEnterExternalMarker);

package/src/plugins/CityJSONLoaderPlugin/CityJSONDefaultDataSource.js

@@ -5,7 +5,20 @@ import {utils} from "../../viewer/index.js";
  */
 class CityJSONDefaultDataSource {
 
-    constructor() {
+    constructor(cfg = {}) {
+        this.cacheBuster = (cfg.cacheBuster !== false);
+    }
+
+    _cacheBusterURL(url) {
+        if (!this.cacheBuster) {
+            return url;
+        }
+        const timestamp = new Date().getTime();
+        if (url.indexOf('?') > -1) {
+            return url + '&_=' + timestamp;
+        } else {
+            return url + '?_=' + timestamp;
+        }
     }
 
     /**
@@ -16,7 +29,7 @@ class CityJSONDefaultDataSource {
      * @param {Function} error Callback fired on error.
      */
     getCityJSON(src, ok, error) {
-        utils.loadJSON(src,
+        utils.loadJSON(this._cacheBusterURL(src),
             (json) => {
                 ok(json);
             },

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js

@@ -331,7 +331,7 @@ class DistanceMeasurement extends Component {
 
         if (this._wpDirty) {
 
-            this._measurementOrientation = determineMeasurementOrientation(this._originWorld, this._targetWorld, 1);
+            this._measurementOrientation = determineMeasurementOrientation(this._originWorld, this._targetWorld, 0);
             if(this._measurementOrientation === 'Vertical' && this.useRotationAdjustment){
                 this._wp[0] = this._originWorld[0];
                 this._wp[1] = this._originWorld[1];

package/src/plugins/DotBIMLoaderPlugin/DotBIMDefaultDataSource.js

@@ -7,7 +7,20 @@ import {utils} from "../../viewer/scene/utils.js";
  */
 export class DotBIMDefaultDataSource {
 
-    constructor() {
+    constructor(cfg = {}) {
+        this.cacheBuster = (cfg.cacheBuster !== false);
+    }
+
+    _cacheBusterURL(url) {
+        if (!this.cacheBuster) {
+            return url;
+        }
+        const timestamp = new Date().getTime();
+        if (url.indexOf('?') > -1) {
+            return url + '&_=' + timestamp;
+        } else {
+            return url + '?_=' + timestamp;
+        }
     }
 
     /**
@@ -18,7 +31,7 @@ export class DotBIMDefaultDataSource {
      * @param {Function} error Fired on error while loading the .BIM JSON asset.
      */
     getDotBIM(dotBIMSrc, ok, error) {
-        utils.loadJSON(dotBIMSrc,
+        utils.loadJSON(this._cacheBusterURL(dotBIMSrc),
             (json) => {
                 ok(json);
             },

package/src/plugins/GLTFLoaderPlugin/GLTFDefaultDataSource.js

@@ -8,7 +8,20 @@ import {core} from "../../viewer/scene/core.js";
  */
 class GLTFDefaultDataSource {
 
-    constructor() {
+    constructor(cfg = {}) {
+        this.cacheBuster = (cfg.cacheBuster !== false);
+    }
+
+    _cacheBusterURL(url) {
+        if (!this.cacheBuster) {
+            return url;
+        }
+        const timestamp = new Date().getTime();
+        if (url.indexOf('?') > -1) {
+            return url + '&_=' + timestamp;
+        } else {
+            return url + '?_=' + timestamp;
+        }
     }
 
     /**
@@ -19,7 +32,7 @@ class GLTFDefaultDataSource {
      * @param {Function} error Fired on error while loading the metamodel JSON asset.
      */
     getMetaModel(metaModelSrc, ok, error) {
-        utils.loadJSON(metaModelSrc,
+        utils.loadJSON(this._cacheBusterURL(metaModelSrc),
             (json) => {
                 ok(json);
             },
@@ -36,7 +49,7 @@ class GLTFDefaultDataSource {
      * @param {Function} error Fired on error while loading the glTF JSON asset.
      */
     getGLTF(glTFSrc, ok, error) {
-        utils.loadArraybuffer(glTFSrc,
+        utils.loadArraybuffer(this._cacheBusterURL(glTFSrc),
             (gltf) => {
                 ok(gltf);
             },
@@ -53,7 +66,7 @@ class GLTFDefaultDataSource {
      * @param {Function} error Fired on error while loading the .glb asset.
      */
     getGLB(glbSrc, ok, error) {
-        utils.loadArraybuffer(glbSrc,
+        utils.loadArraybuffer(this._cacheBusterURL(glbSrc),
             (arraybuffer) => {
                 ok(arraybuffer);
             },
@@ -74,7 +87,7 @@ class GLTFDefaultDataSource {
      * @param {Function} error Fired on error while loading the glTF binary asset.
      */
     getArrayBuffer(glTFSrc, binarySrc, ok, error) {
-        loadArraybuffer(glTFSrc, binarySrc,
+        loadArraybuffer(this._cacheBusterURL(glTFSrc), binarySrc,
             (arrayBuffer) => {
                 ok(arrayBuffer);
             },

package/src/plugins/LASLoaderPlugin/LASDefaultDataSource.js

@@ -3,7 +3,20 @@
  */
 class LASDefaultDataSource {
 
-    constructor() {
+    constructor(cfg = {}) {
+        this.cacheBuster = (cfg.cacheBuster !== false);
+    }
+
+    _cacheBusterURL(url) {
+        if (!this.cacheBuster) {
+            return url;
+        }
+        const timestamp = new Date().getTime();
+        if (url.indexOf('?') > -1) {
+            return url + '&_=' + timestamp;
+        } else {
+            return url + '?_=' + timestamp;
+        }
     }
 
     /**
@@ -14,6 +27,7 @@ class LASDefaultDataSource {
      * @param {Function} error Callback fired on error.
      */
     getLAS(src, ok, error) {
+        src = this._cacheBusterURL(src);
         var defaultCallback = () => {
         };
         ok = ok || defaultCallback;

package/src/plugins/STLLoaderPlugin/STLDefaultDataSource.js

@@ -5,6 +5,22 @@
  */
 class STLDefaultDataSource {
 
+    constructor(cfg = {}) {
+        this.cacheBuster = (cfg.cacheBuster !== false);
+    }
+
+    _cacheBusterURL(url) {
+        if (!this.cacheBuster) {
+            return url;
+        }
+        const timestamp = new Date().getTime();
+        if (url.indexOf('?') > -1) {
+            return url + '&_=' + timestamp;
+        } else {
+            return url + '?_=' + timestamp;
+        }
+    }
+
     /**
      * Gets STL data.
      *
@@ -13,6 +29,7 @@ class STLDefaultDataSource {
      * @param {Function} error Fired on error while loading the STL file.
      */
     getSTL(src, ok, error) {
+        src = this._cacheBusterURL(src);
         const request = new XMLHttpRequest();
         request.overrideMimeType("application/json");
         request.open('GET', src, true);

package/src/plugins/WebIFCLoaderPlugin/WebIFCDefaultDataSource.js

@@ -3,7 +3,20 @@
  */
 class WebIFCDefaultDataSource {
 
-    constructor() {
+    constructor(cfg = {}) {
+        this.cacheBuster = (cfg.cacheBuster !== false);
+    }
+
+    _cacheBusterURL(url) {
+        if (!this.cacheBuster) {
+            return url;
+        }
+        const timestamp = new Date().getTime();
+        if (url.indexOf('?') > -1) {
+            return url + '&_=' + timestamp;
+        } else {
+            return url + '?_=' + timestamp;
+        }
     }
 
     /**
@@ -14,6 +27,8 @@ class WebIFCDefaultDataSource {
      * @param {Function} error Callback fired on error.
      */
     getIFC(src, ok, error) {
+        src = this._cacheBusterURL(src);
+
         var defaultCallback = () => {
         };
         ok = ok || defaultCallback;

package/src/plugins/XKTLoaderPlugin/XKTDefaultDataSource.js

@@ -1,11 +1,25 @@
 import {utils} from "../../viewer/scene/utils.js";
+import {math} from "../../viewer";
 
 /**
  * Default data access strategy for {@link XKTLoaderPlugin}.
  */
 class XKTDefaultDataSource {
 
-    constructor() {
+    constructor(cfg = {}) {
+        this.cacheBuster = (cfg.cacheBuster !== false);
+    }
+
+    _cacheBusterURL(url) {
+        if (!this.cacheBuster) {
+            return url;
+        }
+        const timestamp = new Date().getTime();
+        if (url.indexOf('?') > -1) {
+            return url + '&_=' + timestamp;
+        } else {
+            return url + '?_=' + timestamp;
+        }
     }
 
     /**
@@ -16,7 +30,7 @@ class XKTDefaultDataSource {
      * @param {Function} error Fired on error while loading the manifest JSON asset.
      */
     getManifest(manifestSrc, ok, error) {
-        utils.loadJSON(manifestSrc,
+        utils.loadJSON(this._cacheBusterURL(manifestSrc),
             (json) => {
                 ok(json);
             },
@@ -33,7 +47,7 @@ class XKTDefaultDataSource {
      * @param {Function} error Fired on error while loading the metamodel JSON asset.
      */
     getMetaModel(metaModelSrc, ok, error) {
-        utils.loadJSON(metaModelSrc,
+        utils.loadJSON(this._cacheBusterURL(metaModelSrc),
             (json) => {
                 ok(json);
             },
@@ -75,7 +89,7 @@ class XKTDefaultDataSource {
             }
         } else {
             const request = new XMLHttpRequest();
-            request.open('GET', src, true);
+            request.open('GET', this._cacheBusterURL(src), true);
             request.responseType = 'arraybuffer';
             request.onreadystatechange = function () {
                 if (request.readyState === 4) {