@xeokit/xeokit-sdk 2.5.2-beta-8 → 2.5.2-beta-10

package/dist/xeokit-sdk.cjs.js

@@ -6895,6 +6895,7 @@ const stats = {
 /**
  * @private
  */
+
 function xmlToJson(node, attributeRenamer) {
     if (node.nodeType === node.TEXT_NODE) {
         var v = node.nodeValue;
@@ -7100,13 +7101,13 @@ function loadArraybuffer$1(url, ok, err) {
             for (var i = 0; i < data.length; i++) {
                 view[i] = data.charCodeAt(i);
             }
-            window.setTimeout(function () {
+            core.scheduleTask(() => {
                 ok(buffer);
-            }, 0);
+            });
         } catch (error) {
-            window.setTimeout(function () {
+            core.scheduleTask(() => {
                 err(error);
-            }, 0);
+            });
         }
     } else {
         const request = new XMLHttpRequest();
@@ -7354,6 +7355,7 @@ let lastTime = 0;
 let elapsedTime;
 let totalFPS = 0;
 
+
 /**
  * @private
  */
@@ -7439,7 +7441,7 @@ function Core() {
      * @param {Function} callback Callback that runs the task.
      * @param {Object} [scope] Scope for the callback.
      */
-    this.scheduleTask = function (callback, scope) {
+    this.scheduleTask = function (callback, scope = null) {
         taskQueue.push(callback);
         taskQueue.push(scope);
     };
@@ -7474,8 +7476,43 @@ function Core() {
  */
 const core = new Core();
 
-
 const frame = function () {
+    let time = Date.now();
+    elapsedTime = time - lastTime;
+    if (lastTime > 0 && elapsedTime > 0) { // Log FPS stats
+        var newFPS = 1000 / elapsedTime; // Moving average of FPS
+        totalFPS += newFPS;
+        fpsSamples.push(newFPS);
+        if (fpsSamples.length >= numFPSSamples) {
+            totalFPS -= fpsSamples.shift();
+        }
+        stats.frame.fps = Math.round(totalFPS / fpsSamples.length);
+    }
+    for (let id in core.scenes) {
+        core.scenes[id].compile();
+    }
+    runTasks(time);
+    lastTime = time;
+};
+
+class WorkerInterval {
+    worker = null;
+
+    constructor(callback, interval) {
+        const blob = new Blob([`setInterval(() => postMessage(0), ${interval});`]);
+        const workerScript = URL.createObjectURL(blob);
+        this.worker = new Worker(workerScript);
+        this.worker.onmessage = callback;
+    }
+
+    stop() {
+        this.worker.terminate();
+    }
+}
+
+new WorkerInterval(frame, 100);
+
+const renderFrame = function () {
     let time = Date.now();
     elapsedTime = time - lastTime;
     if (lastTime > 0 && elapsedTime > 0) { // Log FPS stats
@@ -7490,10 +7527,11 @@ const frame = function () {
     runTasks(time);
     fireTickEvents(time);
     renderScenes();
-    lastTime = time;
-    (window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(frame);
+    (window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(renderFrame);
 };
 
+renderFrame();
+
 function runTasks(time) { // Process as many enqueued tasks as we can within the per-frame task budget
     const tasksRun = core.runTasks(time + taskBudget);
     const tasksScheduled = core.getNumTasks();
@@ -7567,17 +7605,6 @@ function renderScenes() {
     }
 }
 
-(window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(frame);
-
-function compileScenes() {
-
-    for (let id in core.scenes) {
-        core.scenes[id].compile();
-    }
-}
-
-window.setInterval(compileScenes, 1000 / 60);
-
 /**
  * @desc Base class for all xeokit components.
  *
@@ -8390,6 +8417,14 @@ class Component {
         }
     }
 
+    /**
+     * Schedule a task to perform on the next browser interval
+     * @param task
+     */
+    scheduleTask(task) {
+        core.scheduleTask(task, null);
+    }
+
     /**
      * Protected virtual template method, optionally implemented
      * by sub-classes to perform a scheduled task.
@@ -9145,6 +9180,14 @@ class Plugin {
         viewer.addPlugin(this);
     }
 
+    /**
+     * Schedule a task to perform on the next browser interval
+     * @param task
+     */
+    scheduleTask(task) {
+        core.scheduleTask(task, null);
+    }
+
     /**
      * Fires an event on this Plugin.
      *
@@ -12922,7 +12965,7 @@ class Annotation extends Marker {
             if (utils.isArray(markerHTML)) {
                 markerHTML = markerHTML.join("");
             }
-            markerHTML = this._renderTemplate(markerHTML);
+            markerHTML = this._renderTemplate(markerHTML.trim());
             const markerFragment = document.createRange().createContextualFragment(markerHTML);
             this._marker = markerFragment.firstChild;
             this._container.appendChild(this._marker);
@@ -12949,7 +12992,7 @@ class Annotation extends Marker {
             if (utils.isArray(labelHTML)) {
                 labelHTML = labelHTML.join("");
             }
-            labelHTML = this._renderTemplate(labelHTML);
+            labelHTML = this._renderTemplate(labelHTML.trim());
             const labelFragment = document.createRange().createContextualFragment(labelHTML);
             this._label = labelFragment.firstChild;
             this._container.appendChild(this._label);
@@ -77525,7 +77568,7 @@ class FileLoader extends Loader {
         const cached = Cache$1.get(url);
         if (cached !== undefined) {
             this.manager.itemStart(url);
-            setTimeout(() => {
+            core.scheduleTask(() => {
                 if (onLoad) {
                     onLoad(cached);
                 }
@@ -86758,13 +86801,13 @@ function loadArraybuffer(glTFSrc, binarySrc, ok, err) {
             for (var i = 0; i < data.length; i++) {
                 view[i] = data.charCodeAt(i);
             }
-            window.setTimeout(function () {
+            core.scheduleTask(function () {
                 ok(buffer);
-            }, 0);
+            });
         } catch (error) {
-            window.setTimeout(function () {
+            core.scheduleTask(function () {
                 err(error);
-            }, 0);
+            });
         }
     } else {
         const basePath = getBasePath$1(glTFSrc);
@@ -127719,14 +127762,13 @@ class XKTLoaderPlugin extends Plugin {
             sceneModel.once("destroyed", () => {
                 this.viewer.metaScene.destroyMetaModel(metaModel.id);
             });
-            window.setTimeout(() => {
-
+            this.scheduleTask(() => {
                 if (sceneModel.destroyed) {
                     return;
                 }
                 sceneModel.scene.fire("modelLoaded", sceneModel.id); // FIXME: Assumes listeners know order of these two events
                 sceneModel.fire("loaded", true, false); // Don't forget the event, for late subscribers
-            }, 100);
+            });
         };
 
         const error = (errMsg) => {
@@ -127804,7 +127846,7 @@ class XKTLoaderPlugin extends Plugin {
                                     globalizeObjectIds: options.globalizeObjectIds
                                 });
                                 i++;
-                                window.setTimeout( loadNext, 100);
+                                this.scheduleTask( loadNext, 100);
                             }, error);
                         }
                     };
@@ -127819,7 +127861,7 @@ class XKTLoaderPlugin extends Plugin {
                             this._dataSource.getXKT(`${baseDir}${xktFiles[i]}`, (arrayBuffer) => {
                                 this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
                                 i++;
-                                window.setTimeout(loadNext, 100);
+                                this.scheduleTask(loadNext, 100);
                             }, error);
                         }
                     };

package/dist/xeokit-sdk.es.js

@@ -6891,6 +6891,7 @@ const stats = {
 /**
  * @private
  */
+
 function xmlToJson(node, attributeRenamer) {
     if (node.nodeType === node.TEXT_NODE) {
         var v = node.nodeValue;
@@ -7096,13 +7097,13 @@ function loadArraybuffer$1(url, ok, err) {
             for (var i = 0; i < data.length; i++) {
                 view[i] = data.charCodeAt(i);
             }
-            window.setTimeout(function () {
+            core.scheduleTask(() => {
                 ok(buffer);
-            }, 0);
+            });
         } catch (error) {
-            window.setTimeout(function () {
+            core.scheduleTask(() => {
                 err(error);
-            }, 0);
+            });
         }
     } else {
         const request = new XMLHttpRequest();
@@ -7350,6 +7351,7 @@ let lastTime = 0;
 let elapsedTime;
 let totalFPS = 0;
 
+
 /**
  * @private
  */
@@ -7435,7 +7437,7 @@ function Core() {
      * @param {Function} callback Callback that runs the task.
      * @param {Object} [scope] Scope for the callback.
      */
-    this.scheduleTask = function (callback, scope) {
+    this.scheduleTask = function (callback, scope = null) {
         taskQueue.push(callback);
         taskQueue.push(scope);
     };
@@ -7470,8 +7472,43 @@ function Core() {
  */
 const core = new Core();
 
-
 const frame = function () {
+    let time = Date.now();
+    elapsedTime = time - lastTime;
+    if (lastTime > 0 && elapsedTime > 0) { // Log FPS stats
+        var newFPS = 1000 / elapsedTime; // Moving average of FPS
+        totalFPS += newFPS;
+        fpsSamples.push(newFPS);
+        if (fpsSamples.length >= numFPSSamples) {
+            totalFPS -= fpsSamples.shift();
+        }
+        stats.frame.fps = Math.round(totalFPS / fpsSamples.length);
+    }
+    for (let id in core.scenes) {
+        core.scenes[id].compile();
+    }
+    runTasks(time);
+    lastTime = time;
+};
+
+class WorkerInterval {
+    worker = null;
+
+    constructor(callback, interval) {
+        const blob = new Blob([`setInterval(() => postMessage(0), ${interval});`]);
+        const workerScript = URL.createObjectURL(blob);
+        this.worker = new Worker(workerScript);
+        this.worker.onmessage = callback;
+    }
+
+    stop() {
+        this.worker.terminate();
+    }
+}
+
+new WorkerInterval(frame, 100);
+
+const renderFrame = function () {
     let time = Date.now();
     elapsedTime = time - lastTime;
     if (lastTime > 0 && elapsedTime > 0) { // Log FPS stats
@@ -7486,10 +7523,11 @@ const frame = function () {
     runTasks(time);
     fireTickEvents(time);
     renderScenes();
-    lastTime = time;
-    (window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(frame);
+    (window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(renderFrame);
 };
 
+renderFrame();
+
 function runTasks(time) { // Process as many enqueued tasks as we can within the per-frame task budget
     const tasksRun = core.runTasks(time + taskBudget);
     const tasksScheduled = core.getNumTasks();
@@ -7563,17 +7601,6 @@ function renderScenes() {
     }
 }
 
-(window.requestPostAnimationFrame !== undefined) ? window.requestPostAnimationFrame(frame) : requestAnimationFrame(frame);
-
-function compileScenes() {
-
-    for (let id in core.scenes) {
-        core.scenes[id].compile();
-    }
-}
-
-window.setInterval(compileScenes, 1000 / 60);
-
 /**
  * @desc Base class for all xeokit components.
  *
@@ -8386,6 +8413,14 @@ class Component {
         }
     }
 
+    /**
+     * Schedule a task to perform on the next browser interval
+     * @param task
+     */
+    scheduleTask(task) {
+        core.scheduleTask(task, null);
+    }
+
     /**
      * Protected virtual template method, optionally implemented
      * by sub-classes to perform a scheduled task.
@@ -9141,6 +9176,14 @@ class Plugin {
         viewer.addPlugin(this);
     }
 
+    /**
+     * Schedule a task to perform on the next browser interval
+     * @param task
+     */
+    scheduleTask(task) {
+        core.scheduleTask(task, null);
+    }
+
     /**
      * Fires an event on this Plugin.
      *
@@ -12918,7 +12961,7 @@ class Annotation extends Marker {
             if (utils.isArray(markerHTML)) {
                 markerHTML = markerHTML.join("");
             }
-            markerHTML = this._renderTemplate(markerHTML);
+            markerHTML = this._renderTemplate(markerHTML.trim());
             const markerFragment = document.createRange().createContextualFragment(markerHTML);
             this._marker = markerFragment.firstChild;
             this._container.appendChild(this._marker);
@@ -12945,7 +12988,7 @@ class Annotation extends Marker {
             if (utils.isArray(labelHTML)) {
                 labelHTML = labelHTML.join("");
             }
-            labelHTML = this._renderTemplate(labelHTML);
+            labelHTML = this._renderTemplate(labelHTML.trim());
             const labelFragment = document.createRange().createContextualFragment(labelHTML);
             this._label = labelFragment.firstChild;
             this._container.appendChild(this._label);
@@ -77521,7 +77564,7 @@ class FileLoader extends Loader {
         const cached = Cache$1.get(url);
         if (cached !== undefined) {
             this.manager.itemStart(url);
-            setTimeout(() => {
+            core.scheduleTask(() => {
                 if (onLoad) {
                     onLoad(cached);
                 }
@@ -86754,13 +86797,13 @@ function loadArraybuffer(glTFSrc, binarySrc, ok, err) {
             for (var i = 0; i < data.length; i++) {
                 view[i] = data.charCodeAt(i);
             }
-            window.setTimeout(function () {
+            core.scheduleTask(function () {
                 ok(buffer);
-            }, 0);
+            });
         } catch (error) {
-            window.setTimeout(function () {
+            core.scheduleTask(function () {
                 err(error);
-            }, 0);
+            });
         }
     } else {
         const basePath = getBasePath$1(glTFSrc);
@@ -127715,14 +127758,13 @@ class XKTLoaderPlugin extends Plugin {
             sceneModel.once("destroyed", () => {
                 this.viewer.metaScene.destroyMetaModel(metaModel.id);
             });
-            window.setTimeout(() => {
-
+            this.scheduleTask(() => {
                 if (sceneModel.destroyed) {
                     return;
                 }
                 sceneModel.scene.fire("modelLoaded", sceneModel.id); // FIXME: Assumes listeners know order of these two events
                 sceneModel.fire("loaded", true, false); // Don't forget the event, for late subscribers
-            }, 100);
+            });
         };
 
         const error = (errMsg) => {
@@ -127800,7 +127842,7 @@ class XKTLoaderPlugin extends Plugin {
                                     globalizeObjectIds: options.globalizeObjectIds
                                 });
                                 i++;
-                                window.setTimeout( loadNext, 100);
+                                this.scheduleTask( loadNext, 100);
                             }, error);
                         }
                     };
@@ -127815,7 +127857,7 @@ class XKTLoaderPlugin extends Plugin {
                             this._dataSource.getXKT(`${baseDir}${xktFiles[i]}`, (arrayBuffer) => {
                                 this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
                                 i++;
-                                window.setTimeout(loadNext, 100);
+                                this.scheduleTask(loadNext, 100);
                             }, error);
                         }
                     };