@xeokit/xeokit-sdk 2.5.2-beta-2 → 2.5.2-beta-4

package/dist/xeokit-sdk.cjs.js

@@ -7569,6 +7569,15 @@ 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.
  *
@@ -10160,24 +10169,26 @@ class SceneModelEntity {
         if (this._isObject) {
             scene._deregisterObject(this);
             if (this.visible) {
-                scene._objectVisibilityUpdated(this, false);
+                scene._deRegisterVisibleObject(this);
             }
             if (this.xrayed) {
-                scene._objectXRayedUpdated(this);
+                scene._deRegisterXRayedObject(this);
             }
             if (this.selected) {
-                scene._objectSelectedUpdated(this);
+                scene._deRegisterSelectedObject(this);
             }
             if (this.highlighted) {
-                scene._objectHighlightedUpdated(this);
+                scene._deRegisterHighlightedObject(this);
             }
-            if (this._opacityUpdated) {
-                this.scene._objectColorizeUpdated(this, false);
+            if (this._colorizeUpdated) {
+                this.scene._deRegisterColorizedObject(this);
             }
             if (this._opacityUpdated) {
-                this.scene._objectOpacityUpdated(this, false);
+                this.scene._deRegisterOpacityObject(this);
+            }
+            if (this._offset && (this._offset[0] !== 0 || this._offset[1] !== 0 || this._offset[2] !== 0)) {
+                this.scene._deRegisterOffsetObject(this);
             }
-            this.scene._objectOffsetUpdated(this, false);
         }
         for (let i = 0, len = this.meshes.length; i < len; i++) {
             this.meshes[i]._destroy();
@@ -28423,12 +28434,12 @@ class Scene extends Component {
                 }
             };
 
-            this.setNumCachedSectionPlanes = function(numCachedSectionPlanes) {
+            this.setNumCachedSectionPlanes = function (numCachedSectionPlanes) {
                 this._numCachedSectionPlanes = numCachedSectionPlanes;
                 hash = null;
             };
 
-            this.getNumCachedSectionPlanes = function() {
+            this.getNumCachedSectionPlanes = function () {
                 return this._numCachedSectionPlanes;
             };
 
@@ -28821,6 +28832,12 @@ class Scene extends Component {
         }
     }
 
+    _deRegisterVisibleObject(entity) {
+        delete this.visibleObjects[entity.id];
+        this._numVisibleObjects--;
+        this._visibleObjectIds = null; // Lazy regenerate
+    }
+
     _objectXRayedUpdated(entity, notify = true) {
         if (entity.xrayed) {
             this.xrayedObjects[entity.id] = entity;
@@ -28835,7 +28852,13 @@ class Scene extends Component {
         }
     }
 
-    _objectHighlightedUpdated(entity, notify = true) {
+    _deRegisterXRayedObject(entity) {
+        delete this.xrayedObjects[entity.id];
+        this._numXRayedObjects--;
+        this._xrayedObjectIds = null; // Lazy regenerate
+    }
+
+    _objectHighlightedUpdated(entity) {
         if (entity.highlighted) {
             this.highlightedObjects[entity.id] = entity;
             this._numHighlightedObjects++;
@@ -28844,9 +28867,12 @@ class Scene extends Component {
             this._numHighlightedObjects--;
         }
         this._highlightedObjectIds = null; // Lazy regenerate
-        if (notify) {
-            this.fire("objectHighlighted", entity, true);
-        }
+    }
+
+    _deRegisterHighlightedObject(entity) {
+        delete this.highlightedObjects[entity.id];
+        this._numHighlightedObjects--;
+        this._highlightedObjectIds = null; // Lazy regenerate
     }
 
     _objectSelectedUpdated(entity, notify = true) {
@@ -28863,6 +28889,13 @@ class Scene extends Component {
         }
     }
 
+    _deRegisterSelectedObject(entity) {
+        delete this.selectedObjects[entity.id];
+        this._numSelectedObjects--;
+        this._selectedObjectIds = null; // Lazy regenerate
+    }
+
+
     _objectColorizeUpdated(entity, colorized) {
         if (colorized) {
             this.colorizedObjects[entity.id] = entity;
@@ -28874,6 +28907,12 @@ class Scene extends Component {
         this._colorizedObjectIds = null; // Lazy regenerate
     }
 
+    _deRegisterColorizedObject(entity) {
+        delete this.colorizedObjects[entity.id];
+        this._numColorizedObjects--;
+        this._colorizedObjectIds = null; // Lazy regenerate
+    }
+
     _objectOpacityUpdated(entity, opacityUpdated) {
         if (opacityUpdated) {
             this.opacityObjects[entity.id] = entity;
@@ -28885,6 +28924,12 @@ class Scene extends Component {
         this._opacityObjectIds = null; // Lazy regenerate
     }
 
+    _deRegisterOpacityObject(entity) {
+        delete this.opacityObjects[entity.id];
+        this._numOpacityObjects--;
+        this._opacityObjectIds = null; // Lazy regenerate
+    }
+
     _objectOffsetUpdated(entity, offset) {
         if (!offset || offset[0] === 0 && offset[1] === 0 && offset[2] === 0) {
             this.offsetObjects[entity.id] = entity;
@@ -28896,6 +28941,12 @@ class Scene extends Component {
         this._offsetObjectIds = null; // Lazy regenerate
     }
 
+    _deRegisterOffsetObject(entity) {
+        delete this.offsetObjects[entity.id];
+        this._numOffsetObjects--;
+        this._offsetObjectIds = null; // Lazy regenerate
+    }
+
     _webglContextLost() {
         //  this.loading++;
         this.canvas.spinner.processes++;
@@ -29164,6 +29215,18 @@ class Scene extends Component {
         this._saveAmbientColor();
     }
 
+
+    /**
+     * @private
+     */
+    compile() {
+        if (this._needRecompile) {
+            this._recompile();
+            this._renderer.imageDirty();
+            this._needRecompile = false;
+        }
+    }
+
     _recompile() {
         for (const id in this._compilables) {
             if (this._compilables.hasOwnProperty(id)) {
@@ -63688,10 +63751,10 @@ class VBOBatchingPointsSnapInitRenderer extends VBORenderer {
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz*coordinateScaler.xyz, -layerNumber);");
 
-        src.push("vec3 xTangent = dFdx( vWorldPosition.xyz );");
-        src.push("vec3 yTangent = dFdy( vWorldPosition.xyz );");
-        src.push("vec3 worldNormal = normalize( cross( xTangent, yTangent ) );");
-        src.push(`outNormal = ivec4(worldNormal * float(${math.MAX_INT}), 1.0);`);
+        // src.push("vec3 xTangent = dFdx( vWorldPosition.xyz );");
+        // src.push("vec3 yTangent = dFdy( vWorldPosition.xyz );");
+        // src.push("vec3 worldNormal = normalize( cross( xTangent, yTangent ) );");
+         src.push(`outNormal = ivec4(1.0, 1.0, 1.0, 1.0);`);
         src.push("outPickColor = uvec4(vPickColor);");
         src.push("}");
         return src;
@@ -66242,10 +66305,7 @@ class VBOInstancingPointsSnapInitRenderer extends VBORenderer {
         }
         src.push("in highp vec3 relativeToOriginPosition;");
         src.push("layout(location = 0) out highp ivec4 outCoords;");
-        ///////////////////////////////////////////
-        // TODO: normal placeholder?
-        // Primitive type?
-        ///////////////////////////////////////////
+        src.push("layout(location = 1) out highp ivec4 outNormal;");
         src.push("layout(location = 2) out lowp uvec4 outPickColor;");
         src.push("void main(void) {");
         if (clipping) {
@@ -66267,6 +66327,10 @@ class VBOInstancingPointsSnapInitRenderer extends VBORenderer {
             src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth + diff ) * logDepthBufFC * 0.5;");
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz*coordinateScaler.xyz, -layerNumber);");
+        // src.push("vec3 xTangent = dFdx( vWorldPosition.xyz );");
+        // src.push("vec3 yTangent = dFdy( vWorldPosition.xyz );");
+        // src.push("vec3 worldNormal = normalize( cross( xTangent, yTangent ) );");
+        src.push(`outNormal = ivec4(1.0, 1.0, 1.0, 1.0);`);
         src.push("outPickColor = uvec4(vPickColor);");
         src.push("}");
         return src;
@@ -72812,7 +72876,7 @@ class DTXTrianglesSnapInitRenderer {
         const clipping = scene._sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
         const src = [];
         src.push("#version 300 es");
-        src.push("// TrianglesDataTextureSnapDepthBufInitRenderer vertex shader");
+        src.push("// DTXTrianglesSnapInitRenderer vertex shader");
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -72954,6 +73018,9 @@ class DTXTrianglesSnapInitRenderer {
             src.push("vFlags2 = flags2.r;");
         }
         src.push("vPickColor = vec4(texelFetch (uObjectPerObjectColorsAndFlags, ivec2(objectIndexCoords.x*8+1, objectIndexCoords.y), 0));");
+
+        // TODO: Normalized color? See here:
+        //src.push("vPickColor = vec4(texelFetch (uObjectPerObjectColorsAndFlags, ivec2(objectIndexCoords.x*8+1, objectIndexCoords.y), 0)) /255.0;");
         src.push("vec4 clipPos = projMatrix * viewPosition;");
         src.push("float tmp = clipPos.w;");
         src.push("clipPos.xyzw /= tmp;");
@@ -72974,7 +73041,7 @@ class DTXTrianglesSnapInitRenderer {
         const clipping = scene._sectionPlanesState.getNumAllocatedSectionPlanes() > 0;
         const src = [];
         src.push('#version 300 es');
-        src.push("// TrianglesDataTextureSnapDepthBufInitRenderer fragment shader");
+        src.push("// DTXTrianglesSnapInitRenderer fragment shader");
         src.push("#ifdef GL_FRAGMENT_PRECISION_HIGH");
         src.push("precision highp float;");
         src.push("precision highp int;");
@@ -83099,31 +83166,6 @@ function createDTXBuckets(geometry, enableVertexWelding, enableIndexBucketing) {
     return buckets;
 }
 
-/**
- * @desc A high-performance model representation for efficient rendering and low memory usage.
- *
- * * PerformanceModel was replaced with {@link SceneModel} in ````xeokit-sdk v2.4````.
- * * PerformanceModel currently extends {@link SceneModel}, in order to maintain backward-compatibility until we remove PerformanceModel.
- * * See {@link SceneModel} for API details.
- *
- * @deprecated
- * @implements {Drawable}
- * @implements {Entity}
- * @extends {SceneModel}
- */
-class PerformanceModel extends SceneModel {
-
-    /**
-     * See {@link VBOSceneModel} for details.
-     *
-     * @param owner
-     * @param cfg
-     */
-    constructor(owner, cfg = {}) {
-        super(owner, cfg);
-    }
-}
-
 /**
  * A set of 3D line segments.
  *
@@ -91572,6 +91614,31 @@ class QuadraticBezierCurve extends Curve {
     }
 }
 
+/**
+ * @desc A high-performance model representation for efficient rendering and low memory usage.
+ *
+ * * PerformanceModel was replaced with {@link SceneModel} in ````xeokit-sdk v2.4````.
+ * * PerformanceModel currently extends {@link SceneModel}, in order to maintain backward-compatibility until we remove PerformanceModel.
+ * * See {@link SceneModel} for API details.
+ *
+ * @deprecated
+ * @implements {Drawable}
+ * @implements {Entity}
+ * @extends {SceneModel}
+ */
+class PerformanceModel extends SceneModel {
+
+    /**
+     * See {@link VBOSceneModel} for details.
+     *
+     * @param owner
+     * @param cfg
+     */
+    constructor(owner, cfg = {}) {
+        super(owner, cfg);
+    }
+}
+
 /**
  * @desc A Skybox.
  */
@@ -118095,9 +118162,9 @@ const EMPTY_IMAGE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAA
 /**
  * @desc A {@link Viewer} plugin that provides methods for visualizing IfcBuildingStoreys.
  *
- *  <a href="https://xeokit.github.io/xeokit-sdk/examples/#storeyViews_StoreyViewsPlugin_recipe2"><img src="http://xeokit.io/img/docs/StoreyViewsPlugin/minimap.gif"></a>
+ *  <a href="https://xeokit.github.io/xeokit-sdk/examples/navigation/#StoreyViewsPlugin_recipe3"><img src="http://xeokit.io/img/docs/StoreyViewsPlugin/minimap.gif"></a>
  *
- * [[Run this example](https://xeokit.github.io/xeokit-sdk/examples/#storeyViews_StoreyViewsPlugin_recipe2)]
+ * [[Run this example](https://xeokit.github.io/xeokit-sdk/examples/navigation/#StoreyViewsPlugin_recipe3)]
  *
  * ## Overview
  *
@@ -127522,13 +127589,14 @@ class XKTLoaderPlugin extends Plugin {
             sceneModel.once("destroyed", () => {
                 this.viewer.metaScene.destroyMetaModel(metaModel.id);
             });
-            sceneModel.scene.once("tick", () => {
+            window.setTimeout(() => {
+
                 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) => {
@@ -127606,7 +127674,7 @@ class XKTLoaderPlugin extends Plugin {
                                     globalizeObjectIds: options.globalizeObjectIds
                                 });
                                 i++;
-                                this.viewer.scene.once("tick", loadNext);
+                                window.setTimeout( loadNext, 100);
                             }, error);
                         }
                     };
@@ -127621,7 +127689,7 @@ class XKTLoaderPlugin extends Plugin {
                             this._dataSource.getXKT(`${baseDir}${xktFiles[i]}`, (arrayBuffer) => {
                                 this._parseModel(arrayBuffer, params, options, sceneModel, metaModel, manifestCtx);
                                 i++;
-                                this.viewer.scene.once("tick", loadNext);
+                                window.setTimeout(loadNext, 100);
                             }, error);
                         }
                     };