@xeokit/xeokit-sdk 2.6.0-beta-7 → 2.6.0-beta-9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.0-beta-7",
+  "version": "2.6.0-beta-9",
   "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/FastNavPlugin/FastNavPlugin.js

@@ -71,6 +71,7 @@ import {Plugin} from "../../viewer/Plugin.js";
  *      hidePBR: true,                  // No physically-based rendering while we interact (default is true)
  *      hideTransparentObjects: true,   // Hide transparent objects while we interact (default is false)
  *      scaleCanvasResolution: true,    // Scale canvas resolution while we interact (default is false)
+ *      defaultScaleCanvasResolutionFactor: 1.0, // Factor by which we scale canvas resolution when we stop interacting (default is 1.0)
  *      scaleCanvasResolutionFactor: 0.5,  // Factor by which we scale canvas resolution when we interact (default is 0.6)
  *      delayBeforeRestore: true,       // When we stop interacting, delay before restoring normal render (default is true)
  *      delayBeforeRestoreSeconds: 0.5  // The delay duration, in seconds (default is 0.5)
@@ -103,6 +104,7 @@ class FastNavPlugin extends Plugin {
      * @param {Boolean} [cfg.hideEdges=true] Whether to temporarily hide edges whenever we interact with the Viewer.
      * @param {Boolean} [cfg.hideTransparentObjects=false] Whether to temporarily hide transparent objects whenever we interact with the Viewer.
      * @param {Number} [cfg.scaleCanvasResolution=false] Whether to temporarily down-scale the canvas resolution whenever we interact with the Viewer.
+     * @param {Number} [cfg.defaultScaleCanvasResolutionFactor=0.6] The factor by which we downscale the canvas resolution whenever we stop interacting with the Viewer.
      * @param {Number} [cfg.scaleCanvasResolutionFactor=0.6] The factor by which we downscale the canvas resolution whenever we interact with the Viewer.
      * @param {Boolean} [cfg.delayBeforeRestore=true] Whether to temporarily have a delay before restoring normal rendering after we stop interacting with the Viewer.
      * @param {Number} [cfg.delayBeforeRestoreSeconds=0.5] Delay in seconds before restoring normal rendering after we stop interacting with the Viewer.
@@ -117,6 +119,7 @@ class FastNavPlugin extends Plugin {
         this._hideEdges = cfg.hideEdges !== false;
         this._hideTransparentObjects = !!cfg.hideTransparentObjects;
         this._scaleCanvasResolution = !!cfg.scaleCanvasResolution;
+        this._defaultScaleCanvasResolutionFactor = cfg.defaultScaleCanvasResolutionFactor || 1.0;
         this._scaleCanvasResolutionFactor = cfg.scaleCanvasResolutionFactor || 0.6;
         this._delayBeforeRestore = (cfg.delayBeforeRestore !== false);
         this._delayBeforeRestoreSeconds = cfg.delayBeforeRestoreSeconds || 0.5;
@@ -135,14 +138,14 @@ class FastNavPlugin extends Plugin {
                 if (this._scaleCanvasResolution) {
                     viewer.scene.canvas.resolutionScale = this._scaleCanvasResolutionFactor;
                 } else {
-                    viewer.scene.canvas.resolutionScale = 1;
+                    viewer.scene.canvas.resolutionScale = this._defaultScaleCanvasResolutionFactor;
                 }
                 fastMode = true;
             }
         };
 
         const switchToHighQuality = () => {
-            viewer.scene.canvas.resolutionScale = 1;
+            viewer.scene.canvas.resolutionScale = this._defaultScaleCanvasResolutionFactor;
             viewer.scene._renderer.setEdgesEnabled(true);
             viewer.scene._renderer.setColorTextureEnabled(true);
             viewer.scene._renderer.setPBREnabled(true);
@@ -310,7 +313,7 @@ class FastNavPlugin extends Plugin {
     }
 
     /**
-     * Sets whether to temporarily scale the canvas resolution whenever we interact with the Viewer.
+     * Sets the factor to which we restore the canvas resolution scale when we stop interacting with the viewer.
      *
      * Default is ````false````.
      *
@@ -322,6 +325,34 @@ class FastNavPlugin extends Plugin {
         this._scaleCanvasResolution = scaleCanvasResolution;
     }
 
+    /**
+     * Gets the factor to which we restore the canvas resolution scale when we stop interacting with the viewer.
+     *
+     * Default is ````1.0````.
+     *
+     * Enable canvas resolution scaling by setting {@link FastNavPlugin#scaleCanvasResolution} ````true````.
+     *
+     * @return {Number} Factor by scale canvas resolution when we stop interacting with the viewer.
+     */
+    get defaultScaleCanvasResolutionFactor() {
+        return this._defaultScaleCanvasResolutionFactor;
+    }
+
+    /**
+     * Sets the factor to which we restore the canvas resolution scale when we stop interacting with the viewer.
+     *
+     * Accepted range is ````[0.0 .. 1.0]````.
+     *
+     * Default is ````1.0````.
+     *
+     * Enable canvas resolution scaling by setting {@link FastNavPlugin#scaleCanvasResolution} ````true````.
+     *
+     * @param {Number} defaultScaleCanvasResolutionFactor Factor by scale canvas resolution when we stop interacting with the viewer.
+     */
+    set defaultScaleCanvasResolutionFactor(defaultScaleCanvasResolutionFactor) {
+        this._defaultScaleCanvasResolutionFactor = defaultScaleCanvasResolutionFactor || 1.0;
+    }
+
     /**
      * Gets the factor by which we temporarily scale the canvas resolution when we interact with the viewer.
      *

package/src/viewer/scene/CameraControl/lib/CameraUpdater.js

@@ -103,6 +103,9 @@ class CameraUpdater {
                         }
                     }
                 }
+            } else {
+              dollyDistFactor = 1;
+              followPointerWorldPos = null;
             }
 
             const dollyDeltaForDist = (updates.dollyDelta * dollyDistFactor);
@@ -309,4 +312,4 @@ class CameraUpdater {
     }
 }
 
-export {CameraUpdater};
+export {CameraUpdater};

package/src/viewer/scene/model/dtx/triangles/DTXTrianglesLayer.js

@@ -860,7 +860,9 @@ export class DTXTrianglesLayer {
         // 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)) {
             f0 = RENDER_PASSES.NOT_RENDERED;
         } else {
             if (transparent) {