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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.5.2-beta-9",
+  "version": "2.5.2-beta-10",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/GLTFLoaderPlugin/GLTFDefaultDataSource.js

@@ -1,4 +1,5 @@
 import {utils} from "../../viewer/scene/utils.js";
+import {core} from "../../viewer/scene/core";
 
 /**
  * Default data access strategy for {@link GLTFLoaderPlugin}.
@@ -104,13 +105,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(glTFSrc);

package/src/plugins/XKTLoaderPlugin/XKTLoaderPlugin.js

@@ -957,14 +957,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) => {
@@ -1042,7 +1041,7 @@ class XKTLoaderPlugin extends Plugin {
                                     globalizeObjectIds: options.globalizeObjectIds
                                 });
                                 i++;
-                                window.setTimeout( loadNext, 100);
+                                this.scheduleTask( loadNext, 100);
                             }, error);
                         }
                     }
@@ -1057,7 +1056,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/src/viewer/Plugin.js

@@ -1,4 +1,5 @@
 import {Map} from "./scene/utils/Map.js";
+import {core} from "./scene/core";
 
 /**
  @desc Base class for {@link Viewer} plugin classes.
@@ -38,6 +39,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.
      *

package/src/viewer/scene/Component.js

@@ -814,6 +814,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.

package/src/viewer/scene/core.js

@@ -15,6 +15,7 @@ let lastTime = 0;
 let elapsedTime;
 let totalFPS = 0;
 
+
 /**
  * @private
  */
@@ -100,7 +101,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);
     };
@@ -154,7 +155,22 @@ const frame = function () {
     lastTime = time;
 };
 
-window.setInterval(frame, 1000 / 30);
+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();
+    }
+}
+
+const interval = new WorkerInterval(frame, 100);
 
 const renderFrame = function () {
     let time = Date.now();

package/src/viewer/scene/utils/FileLoader.js

@@ -1,5 +1,6 @@
 import {Cache} from './Cache.js';
 import {Loader} from './Loader.js';
+import {core} from "../core";
 
 const loading = {};
 
@@ -20,7 +21,7 @@ class FileLoader extends Loader {
         const cached = Cache.get(url);
         if (cached !== undefined) {
             this.manager.itemStart(url);
-            setTimeout(() => {
+            core.scheduleTask(() => {
                 if (onLoad) {
                     onLoad(cached);
                 }

package/src/viewer/scene/utils.js

@@ -1,6 +1,8 @@
 /**
  * @private
  */
+import {core} from "./core";
+
 function xmlToJson(node, attributeRenamer) {
     if (node.nodeType === node.TEXT_NODE) {
         var v = node.nodeValue;
@@ -206,13 +208,13 @@ function loadArraybuffer(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();