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

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);
     };
@@ -135,8 +136,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();
+    }
+}
+
+const interval = new WorkerInterval(frame, 100);
+
+const renderFrame = function () {
     let time = Date.now();
     elapsedTime = time - lastTime;
     if (lastTime > 0 && elapsedTime > 0) { // Log FPS stats
@@ -151,10 +187,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();
@@ -228,15 +265,4 @@ 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);
-
 export {core};

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();