@xeokit/xeokit-sdk 2.2.2 → 2.2.5-beta

package/dist/xeokit-sdk.es.js

@@ -2716,30 +2716,6 @@ const math = {
      * @param z
      * @param m
      */
-    OLDtranslateMat4c(x, y, z, m) {
-
-        const m12 = m[12];
-        m[0] += m12 * x;
-        m[4] += m12 * y;
-        m[8] += m12 * z;
-
-        const m13 = m[13];
-        m[1] += m13 * x;
-        m[5] += m13 * y;
-        m[9] += m13 * z;
-
-        const m14 = m[14];
-        m[2] += m14 * x;
-        m[6] += m14 * y;
-        m[10] += m14 * z;
-
-        const m15 = m[15];
-        m[3] += m15 * x;
-        m[7] += m15 * y;
-        m[11] += m15 * z;
-
-        return m;
-    },
 
     translateMat4c(x, y, z, m) {
 
@@ -8165,6 +8141,8 @@ class PerformanceNode {
         this._offsetAABB = math.AABB3(aabb);
 
         this._offset = math.vec3();
+        this._colorizeUpdated = false;
+        this._opacityUpdated = false;
 
         if (this._isObject) {
             model.scene._registerObject(this);
@@ -8577,6 +8555,7 @@ class PerformanceNode {
         if (this._isObject) {
             const colorized = (!!color);
             this.scene._objectColorizeUpdated(this, colorized);
+            this._colorizeUpdated = colorized;
         }
         this.model.glRedraw();
     }
@@ -8631,6 +8610,7 @@ class PerformanceNode {
         }
         if (this._isObject) {
             this.scene._objectOpacityUpdated(this, opacityUpdated);
+            this._opacityUpdated = opacityUpdated;
         }
         this.model.glRedraw();
     }
@@ -8777,8 +8757,12 @@ class PerformanceNode {
             if (this.highlighted) {
                 scene._objectHighlightedUpdated(this);
             }
-            this.scene._objectColorizeUpdated(this, false);
-            this.scene._objectOpacityUpdated(this, false);
+            if (this._opacityUpdated) {
+                this.scene._objectColorizeUpdated(this, false);
+            }
+            if (this._opacityUpdated) {
+                this.scene._objectOpacityUpdated(this, false);
+            }
             this.scene._objectOffsetUpdated(this, false);
         }
         for (let i = 0, len = this.meshes.length; i < len; i++) {
@@ -12146,7 +12130,7 @@ class Canvas extends Component {
                      * @event boundary
                      * @param value The property's new value
                      */
-                    if (!newResolutionScale) {
+                    if (!newResolutionScale || newCanvasSize) {
                         this.fire("boundary", boundary);
                     }
 
@@ -15974,7 +15958,9 @@ const Renderer = function (scene, options) {
 
             if (highlightedFillOpaqueBinLen > 0 || highlightedEdgesOpaqueBinLen > 0) {
                 frameCtx.lastProgramId = null;
-                gl.clear(gl.DEPTH_BUFFER_BIT);
+                if ( scene.highlightMaterial.glowThrough) {
+                    gl.clear(gl.DEPTH_BUFFER_BIT);
+                }
                 if (highlightedEdgesOpaqueBinLen > 0) {
                     for (i = 0; i < highlightedEdgesOpaqueBinLen; i++) {
                         highlightedEdgesOpaqueBin[i].drawEdgesHighlighted(frameCtx);
@@ -15989,17 +15975,17 @@ const Renderer = function (scene, options) {
 
             if (highlightedFillTransparentBinLen > 0 || highlightedEdgesTransparentBinLen > 0 || highlightedFillOpaqueBinLen > 0) {
                 frameCtx.lastProgramId = null;
-                gl.clear(gl.DEPTH_BUFFER_BIT);
-                gl.enable(gl.CULL_FACE);
+                if (scene.selectedMaterial.glowThrough) {
+                    gl.clear(gl.DEPTH_BUFFER_BIT);
+                }
                 gl.enable(gl.BLEND);
-
                 if (canvasTransparent) {
                     gl.blendEquation(gl.FUNC_ADD);
                     gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
                 } else {
                     gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
                 }
-
+                gl.enable(gl.CULL_FACE);
                 if (highlightedEdgesTransparentBinLen > 0) {
                     for (i = 0; i < highlightedEdgesTransparentBinLen; i++) {
                         highlightedEdgesTransparentBin[i].drawEdgesHighlighted(frameCtx);
@@ -16015,7 +16001,9 @@ const Renderer = function (scene, options) {
 
             if (selectedFillOpaqueBinLen > 0 || selectedEdgesOpaqueBinLen > 0) {
                 frameCtx.lastProgramId = null;
-                gl.clear(gl.DEPTH_BUFFER_BIT);
+                if (scene.selectedMaterial.glowThrough) {
+                    gl.clear(gl.DEPTH_BUFFER_BIT);
+                }
                 if (selectedEdgesOpaqueBinLen > 0) {
                     for (i = 0; i < selectedEdgesOpaqueBinLen; i++) {
                         selectedEdgesOpaqueBin[i].drawEdgesSelected(frameCtx);
@@ -16030,10 +16018,11 @@ const Renderer = function (scene, options) {
 
             if (selectedFillTransparentBinLen > 0 || selectedEdgesTransparentBinLen > 0) {
                 frameCtx.lastProgramId = null;
-                gl.clear(gl.DEPTH_BUFFER_BIT);
+                if (scene.selectedMaterial.glowThrough) {
+                    gl.clear(gl.DEPTH_BUFFER_BIT);
+                }
                 gl.enable(gl.CULL_FACE);
                 gl.enable(gl.BLEND);
-
                 if (canvasTransparent) {
                     gl.blendEquation(gl.FUNC_ADD);
                     gl.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
@@ -23178,6 +23167,7 @@ class EmphasisMaterial extends Material {
      * @param {Number} [cfg.edgeWidth=1] Width of xray edges, in pixels.
      * @param {String} [cfg.preset] Selects a preset EmphasisMaterial configuration - see {@link EmphasisMaterial#presets}.
      * @param {Boolean} [cfg.backfaces=false] Whether to render geometry backfaces when emphasising.
+     * @param {Boolean} [cfg.glowThrough=true] Whether to make the emphasized object appear to float on top of other objects, as if it were "glowing through" them.
      */
     constructor(owner, cfg = {}) {
 
@@ -23192,7 +23182,8 @@ class EmphasisMaterial extends Material {
             edgeColor: null,
             edgeAlpha: null,
             edgeWidth: null,
-            backfaces: true
+            backfaces: true,
+            glowThrough: true
         });
 
         this._preset = "default";
@@ -23223,6 +23214,9 @@ class EmphasisMaterial extends Material {
             if (cfg.backfaces !== undefined) {
                 this.backfaces = cfg.backfaces;
             }
+            if (cfg.glowThrough !== undefined) {
+                this.glowThrough = cfg.glowThrough;
+            }
         } else {
             this.fill = cfg.fill;
             this.fillColor = cfg.fillColor;
@@ -23232,6 +23226,7 @@ class EmphasisMaterial extends Material {
             this.edgeAlpha = cfg.edgeAlpha;
             this.edgeWidth = cfg.edgeWidth;
             this.backfaces = cfg.backfaces;
+            this.glowThrough = cfg.glowThrough;
         }
     }
 
@@ -23453,7 +23448,7 @@ class EmphasisMaterial extends Material {
     }
 
     /**
-     * Sets whether to render backfaces when {@link EmphasisMaterial#fill} is ````true````..
+     * Sets whether to render backfaces when {@link EmphasisMaterial#fill} is ````true````.
      *
      * Default is ````false````.
      *
@@ -23469,9 +23464,9 @@ class EmphasisMaterial extends Material {
     }
 
     /**
-     * Gets whether to render backfaces when {@link EmphasisMaterial#fill} is ````true````..
+     * Gets whether to render backfaces when {@link EmphasisMaterial#fill} is ````true````.
      *
-     * Default is ````false````.
+     * Default is ````true````.
      *
      * @type {Boolean}
      */
@@ -23479,6 +23474,35 @@ class EmphasisMaterial extends Material {
         return this._state.backfaces;
     }
 
+    /**
+     * Sets whether to render emphasized objects over the top of other objects, as if they were "glowing through".
+     *
+     * Default is ````true````.
+     *
+     * Note: updating this property will not affect the appearance of objects that are already emphasized.
+     *
+     * @type {Boolean}
+     */
+    set glowThrough(value) {
+        value = (value !== false);
+        if (this._state.glowThrough === value) {
+            return;
+        }
+        this._state.glowThrough = value;
+        this.glRedraw();
+    }
+
+    /**
+     * Sets whether to render emphasized objects over the top of other objects, as if they were "glowing through".
+     *
+     * Default is ````true````.
+     *
+     * @type {Boolean}
+     */
+    get glowThrough() {
+        return this._state.glowThrough;
+    }
+
     /**
      * Selects a preset EmphasisMaterial configuration.
      *
@@ -23503,6 +23527,7 @@ class EmphasisMaterial extends Material {
         this.edgeColor = preset.edgeColor;
         this.edgeAlpha = preset.edgeAlpha;
         this.edgeWidth = preset.edgeWidth;
+        this.glowThrough = preset.glowThrough;
         this._preset = value;
     }
 
@@ -27386,7 +27411,7 @@ class Scene extends Component {
      * registered by {@link Entity#id} in {@link Scene#visibleObjects}.
      *
      * @param {String[]} ids Array of {@link Entity#id} values.
-     * @param {Boolean} visible Whether or not to cull.
+     * @param {Boolean} visible Whether or not to set visible.
      * @returns {Boolean} True if any {@link Entity}s were updated, else false if all updates were redundant and not applied.
      */
     setObjectsVisible(ids, visible) {
@@ -27403,7 +27428,7 @@ class Scene extends Component {
      * An {@link Entity} represents an object when {@link Entity#isObject} is ````true````.
      *
      * @param {String[]} ids Array of {@link Entity#id} values.
-     * @param {Boolean} collidable Whether or not to cull.
+     * @param {Boolean} collidable Whether or not to set collidable.
      * @returns {Boolean} True if any {@link Entity}s were updated, else false if all updates were redundant and not applied.
      */
     setObjectsCollidable(ids, collidable) {
@@ -27424,7 +27449,7 @@ class Scene extends Component {
      * @returns {Boolean} True if any {@link Entity}s were updated, else false if all updates were redundant and not applied.
      */
     setObjectsCulled(ids, culled) {
-        return this.withObjects(ids, this.objects, entity => {
+        return this.withObjects(ids, entity => {
             const changed = (entity.culled !== culled);
             entity.culled = culled;
             return changed;
@@ -27440,7 +27465,7 @@ class Scene extends Component {
      * registered by {@link Entity#id} in {@link Scene#selectedObjects}.
      *
      * @param {String[]} ids Array of {@link Entity#id} values.
-     * @param {Boolean} selected Whether or not to highlight.
+     * @param {Boolean} selected Whether or not to select.
      * @returns {Boolean} True if any {@link Entity}s were updated, else false if all updates were redundant and not applied.
      */
     setObjectsSelected(ids, selected) {
@@ -27476,9 +27501,6 @@ class Scene extends Component {
      *
      * An {@link Entity} represents an object when {@link Entity#isObject} is ````true````.
      *
-     * Each {@link Entity} on which both {@link Entity#isObject} and {@link Entity#xrayed} are ````true```` is
-     * registered by {@link Entity#id} in {@link Scene#xrayedObjects}.
-     *
      * @param {String[]} ids Array of {@link Entity#id} values.
      * @param {Boolean} xrayed Whether or not to xray.
      * @returns {Boolean} True if any {@link Entity}s were updated, else false if all updates were redundant and not applied.
@@ -27546,7 +27568,7 @@ class Scene extends Component {
      * An {@link Entity} represents an object when {@link Entity#isObject} is ````true````.
      *
      * @param {String[]} ids Array of {@link Entity#id} values.
-     * @param {Boolean} pickable Whether or not to enable picking.
+     * @param {Boolean} pickable Whether or not to set pickable.
      * @returns {Boolean} True if any {@link Entity}s were updated, else false if all updates were redundant and not applied.
      */
     setObjectsPickable(ids, pickable) {
@@ -27572,13 +27594,10 @@ class Scene extends Component {
     }
 
     /**
-     * Iterates with a callback over {@link Entity#visible} on {@link Entity}s that represent objects.
+     * Iterates with a callback over {@link Entity}s that represent objects.
      *
      * An {@link Entity} represents an object when {@link Entity#isObject} is ````true````.
      *
-     * Each {@link Entity} on which both {@link Entity#isObject} and {@link Entity#visible} are ````true```` is
-     * registered by {@link Entity#id} in {@link Scene#visibleObjects}.
-     *
      * @param {String[]} ids Array of {@link Entity#id} values.
      * @param {Function} callback Callback to execute on eacn {@link Entity}.
      * @returns {Boolean} True if any {@link Entity}s were updated, else false if all updates were redundant and not applied.
@@ -46549,7 +46568,7 @@ class TrianglesBatchingLayer {
         // Color
 
         let f0;
-        if (!visible || culled || xrayed) { // Highlight & select are layered on top of color - not mutually exclusive
+        if (!visible || culled || xrayed || (highlighted && !this.model.scene.highlightMaterial.glowThrough) || (selected && !this.model.scene.selectedMaterial.glowThrough)) { // Highlight & select are layered on top of color - not mutually exclusive
             f0 = RENDER_PASSES.NOT_RENDERED;
         } else {
             if (transparent) {
@@ -53666,7 +53685,7 @@ class TrianglesInstancingLayer {
         // Normal fill
 
         let f0;
-        if (!visible || culled || xrayed) { // Highlight & select are layered on top of color - not mutually exclusive
+        if (!visible || culled || xrayed || (highlighted && !this.model.scene.highlightMaterial.glowThrough) || (selected && !this.model.scene.selectedMaterial.glowThrough)) { // Highlight & select are layered on top of color - not mutually exclusive
             f0 = RENDER_PASSES.NOT_RENDERED;
         } else {
             if (meshTransparent) {
@@ -55416,7 +55435,7 @@ class LinesBatchingLayer {
         // Color
 
         let f0;
-        if (!visible || culled || xrayed) {
+        if (!visible || culled || xrayed || (highlighted && !this.model.scene.highlightMaterial.glowThrough) || (selected && !this.model.scene.selectedMaterial.glowThrough)) { // Highlight & select are layered on top of color - not mutually exclusive
             f0 = RENDER_PASSES.NOT_RENDERED;
         } else {
             if (transparent) {
@@ -56883,7 +56902,7 @@ class LinesInstancingLayer {
         // Normal fill
 
         let f0;
-        if (!visible || culled || xrayed) {
+        if (!visible || culled || xrayed || (highlighted && !this.model.scene.highlightMaterial.glowThrough) || (selected && !this.model.scene.selectedMaterial.glowThrough)) { // Highlight & select are layered on top of color - not mutually exclusive
             f0 = RENDER_PASSES.NOT_RENDERED;
         } else {
             if (meshTransparent) {
@@ -59449,7 +59468,7 @@ class PointsBatchingLayer {
         // Normal fill
 
         let f0;
-        if (!visible || culled || xrayed) {
+        if (!visible || culled || xrayed || (highlighted && !this.model.scene.highlightMaterial.glowThrough) || (selected && !this.model.scene.selectedMaterial.glowThrough)) { // Highlight & select are layered on top of color - not mutually exclusive
             f0 = RENDER_PASSES.NOT_RENDERED;
         } else {
             if (transparent) {
@@ -62842,7 +62861,7 @@ class PointsInstancingLayer {
         // Normal fill
 
         let f0;
-        if (!visible || culled || xrayed) {
+        if (!visible || culled || xrayed || (highlighted && !this.model.scene.highlightMaterial.glowThrough) || (selected && !this.model.scene.selectedMaterial.glowThrough)) { // Highlight & select are layered on top of color - not mutually exclusive
             f0 = RENDER_PASSES.NOT_RENDERED;
         } else {
             if (meshTransparent) {