@xeokit/xeokit-sdk 2.6.0-beta-1 → 2.6.0-beta-4

package/dist/xeokit-sdk.cjs.js

@@ -7495,22 +7495,25 @@ const frame = function () {
     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();
-    }
+function customSetInterval(callback, interval) {
+    let expected = Date.now() + interval;
+    function loop() {
+        const elapsed = Date.now() - expected;
+        callback();
+        expected += interval;
+        setTimeout(loop, Math.max(0, interval - elapsed));
+    }
+    loop();
+    return {
+        cancel: function() {
+            // No need to do anything, setTimeout cannot be directly cancelled
+        }
+    };
 }
 
-new WorkerInterval(frame, 100);
+customSetInterval(() => {
+    frame();
+}, 100);
 
 const renderFrame = function () {
     let time = Date.now();
@@ -10840,14 +10843,13 @@ class Dot {
         this._x = 0;
         this._y = 0;
 
-        this._visible = true;
         this._dot = document.createElement('div');
         this._dot.className += this._dot.className ? ' viewer-ruler-dot' : 'viewer-ruler-dot';
 
         this._dotClickable = document.createElement('div');
         this._dotClickable.className += this._dotClickable.className ? ' viewer-ruler-dot-clickable' : 'viewer-ruler-dot-clickable';
 
-        this._visible = true;
+        this._visible = !!cfg.visible;
         this._culled = false;
 
         var dot = this._dot;
@@ -80721,6 +80723,8 @@ class SceneModel extends Component {
         this._vboBatchingLayers = {};
         this._dtxLayers = {};
 
+        this._meshList = [];
+
         this.layerList = []; // For GL state efficiency when drawing, InstancingLayers are in first part, BatchingLayers are in second
         this._entityList = [];
 
@@ -80730,11 +80734,9 @@ class SceneModel extends Component {
         this._textureSets = {};
         this._transforms = {};
         this._meshes = {};
+        this._unusedMeshes = {};
         this._entities = {};
 
-        this._scheduledMeshes = {};
-        this._meshesCfgsBeforeMeshCreation = {};
-
         /** @private **/
         this.renderFlags = new RenderFlags();
 
@@ -82303,7 +82305,7 @@ class SceneModel extends Component {
      * @param {Number} [cfg.opacity=1] Opacity in range ````[0..1]````. Overridden by texture set ````colorTexture````.
      * @param {Number} [cfg.metallic=0] Metallic factor in range ````[0..1]````. Overridden by texture set ````metallicRoughnessTexture````.
      * @param {Number} [cfg.roughness=1] Roughness factor in range ````[0..1]````. Overridden by texture set ````metallicRoughnessTexture````.
-     * @returns {Boolean} True = successfully mesh was created. False = error during creation of a mesh.
+     * @returns {SceneModelMesh} The new mesh.
      */
     createMesh(cfg) {
 
@@ -82312,7 +82314,7 @@ class SceneModel extends Component {
             return false;
         }
 
-        if (this._scheduledMeshes[cfg.id]) {
+        if (this._meshes[cfg.id]) {
             this.error(`[createMesh] SceneModel already has a mesh with this ID: ${cfg.id}`);
             return false;
         }
@@ -82632,17 +82634,7 @@ class SceneModel extends Component {
 
         cfg.numPrimitives = this._getNumPrimitives(cfg);
 
-        this._meshesCfgsBeforeMeshCreation[cfg.id] = cfg;
-
-        return true;
-    }
-
-    _createDefaultIndices(numIndices) {
-        const indices = [];
-        for (let i = 0; i < numIndices; i++) {
-            indices.push(i);
-        }
-        return indices;
+        return this._createMesh(cfg);
     }
 
     _createMesh(cfg) {
@@ -82674,6 +82666,9 @@ class SceneModel extends Component {
             cfg.meshMatrix = cfg.transform.worldMatrix;
         }
         mesh.portionId = mesh.layer.createPortion(mesh, cfg);
+        this._meshes[cfg.id] = mesh;
+        this._unusedMeshes[cfg.id] = mesh;
+        this._meshList.push(mesh);
         return mesh;
     }
 
@@ -83034,19 +83029,15 @@ class SceneModel extends Component {
             const meshId = cfg.meshIds[i];
             let mesh = this._meshes[meshId]; // Trying to get already created mesh
             if (!mesh) { // Checks if there is already created mesh for this meshId
-                let meshCfg = this._meshesCfgsBeforeMeshCreation[meshId]; // Trying to get already created cfg
-                if (!meshCfg) { // Checks if there is already created cfg for this meshId
-                    this.error(`Mesh with this ID not found: "${meshId}" - ignoring this mesh`); // There is no such cfg
-                    continue;
-                }
-                mesh = this._createMesh(meshCfg); // There is no such mesh yet, but there is already created cfg, so it creates this mesh
-                this._meshes[cfg.id] = mesh; // Now it will also add this mesh to dictionary of created meshes
+                this.error(`Mesh with this ID not found: "${meshId}" - ignoring this mesh`); // There is no such cfg
+                continue;
             }
             if (mesh.parent) {
                 this.error(`Mesh with ID "${meshId}" already belongs to object with ID "${mesh.parent.id}" - ignoring this mesh`);
                 continue;
             }
             meshes.push(mesh);
+            delete this._unusedMeshes[meshId];
         }
         const lodCullable = true;
         const entity = new SceneModelEntity(
@@ -83070,6 +83061,7 @@ class SceneModel extends Component {
         if (this.destroyed) {
             return;
         }
+        this._createDummyEntityForUnusedMeshes();
         for (let i = 0, len = this.layerList.length; i < len; i++) {
             const layer = this.layerList[i];
             layer.finalize();
@@ -83146,6 +83138,21 @@ class SceneModel extends Component {
         }
     }
 
+    /** @private */
+    _createDummyEntityForUnusedMeshes() {
+        const unusedMeshIds = Object.keys(this._unusedMeshes);
+        if (unusedMeshIds.length > 0) {
+            const entityId = `${this.id}-dummyEntityForUnusedMeshes`;
+            this.warn(`Creating dummy SceneModelEntity "${entityId}" for unused SceneMeshes: [${unusedMeshIds.join(",")}]`);
+            this.createEntity({
+                id: entityId,
+                meshIds: unusedMeshIds,
+                isObject: true
+            });
+        }
+        this._unusedMeshes = {};
+    }
+
     _getActiveSectionPlanesForLayer(layer) {
         const renderFlags = this.renderFlags;
         const sectionPlanes = this.scene._sectionPlanesState.sectionPlanes;

package/dist/xeokit-sdk.es.js

@@ -7491,22 +7491,25 @@ const frame = function () {
     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();
-    }
+function customSetInterval(callback, interval) {
+    let expected = Date.now() + interval;
+    function loop() {
+        const elapsed = Date.now() - expected;
+        callback();
+        expected += interval;
+        setTimeout(loop, Math.max(0, interval - elapsed));
+    }
+    loop();
+    return {
+        cancel: function() {
+            // No need to do anything, setTimeout cannot be directly cancelled
+        }
+    };
 }
 
-new WorkerInterval(frame, 100);
+customSetInterval(() => {
+    frame();
+}, 100);
 
 const renderFrame = function () {
     let time = Date.now();
@@ -10836,14 +10839,13 @@ class Dot {
         this._x = 0;
         this._y = 0;
 
-        this._visible = true;
         this._dot = document.createElement('div');
         this._dot.className += this._dot.className ? ' viewer-ruler-dot' : 'viewer-ruler-dot';
 
         this._dotClickable = document.createElement('div');
         this._dotClickable.className += this._dotClickable.className ? ' viewer-ruler-dot-clickable' : 'viewer-ruler-dot-clickable';
 
-        this._visible = true;
+        this._visible = !!cfg.visible;
         this._culled = false;
 
         var dot = this._dot;
@@ -80717,6 +80719,8 @@ class SceneModel extends Component {
         this._vboBatchingLayers = {};
         this._dtxLayers = {};
 
+        this._meshList = [];
+
         this.layerList = []; // For GL state efficiency when drawing, InstancingLayers are in first part, BatchingLayers are in second
         this._entityList = [];
 
@@ -80726,11 +80730,9 @@ class SceneModel extends Component {
         this._textureSets = {};
         this._transforms = {};
         this._meshes = {};
+        this._unusedMeshes = {};
         this._entities = {};
 
-        this._scheduledMeshes = {};
-        this._meshesCfgsBeforeMeshCreation = {};
-
         /** @private **/
         this.renderFlags = new RenderFlags();
 
@@ -82299,7 +82301,7 @@ class SceneModel extends Component {
      * @param {Number} [cfg.opacity=1] Opacity in range ````[0..1]````. Overridden by texture set ````colorTexture````.
      * @param {Number} [cfg.metallic=0] Metallic factor in range ````[0..1]````. Overridden by texture set ````metallicRoughnessTexture````.
      * @param {Number} [cfg.roughness=1] Roughness factor in range ````[0..1]````. Overridden by texture set ````metallicRoughnessTexture````.
-     * @returns {Boolean} True = successfully mesh was created. False = error during creation of a mesh.
+     * @returns {SceneModelMesh} The new mesh.
      */
     createMesh(cfg) {
 
@@ -82308,7 +82310,7 @@ class SceneModel extends Component {
             return false;
         }
 
-        if (this._scheduledMeshes[cfg.id]) {
+        if (this._meshes[cfg.id]) {
             this.error(`[createMesh] SceneModel already has a mesh with this ID: ${cfg.id}`);
             return false;
         }
@@ -82628,17 +82630,7 @@ class SceneModel extends Component {
 
         cfg.numPrimitives = this._getNumPrimitives(cfg);
 
-        this._meshesCfgsBeforeMeshCreation[cfg.id] = cfg;
-
-        return true;
-    }
-
-    _createDefaultIndices(numIndices) {
-        const indices = [];
-        for (let i = 0; i < numIndices; i++) {
-            indices.push(i);
-        }
-        return indices;
+        return this._createMesh(cfg);
     }
 
     _createMesh(cfg) {
@@ -82670,6 +82662,9 @@ class SceneModel extends Component {
             cfg.meshMatrix = cfg.transform.worldMatrix;
         }
         mesh.portionId = mesh.layer.createPortion(mesh, cfg);
+        this._meshes[cfg.id] = mesh;
+        this._unusedMeshes[cfg.id] = mesh;
+        this._meshList.push(mesh);
         return mesh;
     }
 
@@ -83030,19 +83025,15 @@ class SceneModel extends Component {
             const meshId = cfg.meshIds[i];
             let mesh = this._meshes[meshId]; // Trying to get already created mesh
             if (!mesh) { // Checks if there is already created mesh for this meshId
-                let meshCfg = this._meshesCfgsBeforeMeshCreation[meshId]; // Trying to get already created cfg
-                if (!meshCfg) { // Checks if there is already created cfg for this meshId
-                    this.error(`Mesh with this ID not found: "${meshId}" - ignoring this mesh`); // There is no such cfg
-                    continue;
-                }
-                mesh = this._createMesh(meshCfg); // There is no such mesh yet, but there is already created cfg, so it creates this mesh
-                this._meshes[cfg.id] = mesh; // Now it will also add this mesh to dictionary of created meshes
+                this.error(`Mesh with this ID not found: "${meshId}" - ignoring this mesh`); // There is no such cfg
+                continue;
             }
             if (mesh.parent) {
                 this.error(`Mesh with ID "${meshId}" already belongs to object with ID "${mesh.parent.id}" - ignoring this mesh`);
                 continue;
             }
             meshes.push(mesh);
+            delete this._unusedMeshes[meshId];
         }
         const lodCullable = true;
         const entity = new SceneModelEntity(
@@ -83066,6 +83057,7 @@ class SceneModel extends Component {
         if (this.destroyed) {
             return;
         }
+        this._createDummyEntityForUnusedMeshes();
         for (let i = 0, len = this.layerList.length; i < len; i++) {
             const layer = this.layerList[i];
             layer.finalize();
@@ -83142,6 +83134,21 @@ class SceneModel extends Component {
         }
     }
 
+    /** @private */
+    _createDummyEntityForUnusedMeshes() {
+        const unusedMeshIds = Object.keys(this._unusedMeshes);
+        if (unusedMeshIds.length > 0) {
+            const entityId = `${this.id}-dummyEntityForUnusedMeshes`;
+            this.warn(`Creating dummy SceneModelEntity "${entityId}" for unused SceneMeshes: [${unusedMeshIds.join(",")}]`);
+            this.createEntity({
+                id: entityId,
+                meshIds: unusedMeshIds,
+                isObject: true
+            });
+        }
+        this._unusedMeshes = {};
+    }
+
     _getActiveSectionPlanesForLayer(layer) {
         const renderFlags = this.renderFlags;
         const sectionPlanes = this.scene._sectionPlanesState.sectionPlanes;