@xeokit/xeokit-sdk 2.4.0-alpha-99 → 2.4.0-alpha-101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.4.0-alpha-99",
+  "version": "2.4.0-alpha-101",
   "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/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -311,7 +311,6 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
             this.pointerLens.visible = false;
         }
         this.reset();
-        this.viewer
         const canvas = this.scene.canvas.canvas;
         canvas.removeEventListener("mousedown", this._onMouseDown);
         canvas.removeEventListener("mouseup", this._onMouseUp);

package/src/plugins/NavCubePlugin/CubeTextureCanvas.js

@@ -15,8 +15,8 @@ function CubeTextureCanvas(viewer, navCubeScene, cfg = {}) {
     const facesZUp = [
         {boundary: [6, 6, 6, 6], color: cfg.frontColor || cfg.color || "#55FF55"},
         {boundary: [18, 6, 6, 6], color: cfg.backColor || cfg.color || "#55FF55"},
-        {boundary: [12, 6, 6, 6], color: cfg.leftColor || cfg.color || "#FF5555"},
-        {boundary: [0, 6, 6, 6], color: cfg.rightColor || cfg.color || "#FF5555"},
+        {boundary: [12, 6, 6, 6], color: cfg.rightColor || cfg.color || "#FF5555"},
+        {boundary: [0, 6, 6, 6], color: cfg.leftColor || cfg.color || "#FF5555"},
         {boundary: [6, 0, 6, 6], color: cfg.topColor || cfg.color || "#7777FF"},
         {boundary: [6, 12, 6, 6], color: cfg.bottomColor || cfg.color || "#7777FF"}
     ];
@@ -53,8 +53,8 @@ function CubeTextureCanvas(viewer, navCubeScene, cfg = {}) {
     const facesYUp = [
         {boundary: [6, 6, 6, 6], color: cfg.frontColor || cfg.color || "#55FF55"},
         {boundary: [18, 6, 6, 6], color: cfg.backColor || cfg.color || "#55FF55"},
-        {boundary: [12, 6, 6, 6], color: cfg.leftColor || cfg.color || "#FF5555"},
-        {boundary: [0, 6, 6, 6], color: cfg.rightColor || cfg.color || "#FF5555"},
+        {boundary: [12, 6, 6, 6], color: cfg.rightColor || cfg.color || "#FF5555"},
+        {boundary: [0, 6, 6, 6], color: cfg.leftColor || cfg.color || "#FF5555"},
         {boundary: [6, 0, 6, 6], color: cfg.topColor || cfg.color || "#7777FF"},
         {boundary: [6, 12, 6, 6], color: cfg.bottomColor || cfg.color || "#7777FF"}
     ];

package/src/viewer/scene/model/MeshClusteringManager.js

@@ -0,0 +1,31 @@
+export class MeshClusteringManager {
+
+    constructor(sceneModel) {
+        this.sceneModel = sceneModel;
+        this.meshes = [];
+        this.entities = [];
+        this.clusteredMeshes = [];
+    }
+
+    addMeshCfg(meshCfg) {
+        this.meshes.push(meshCfg);
+    }
+
+    addEntityCfg(entityCfg) {
+        this.entities.push(entityCfg);
+    }
+
+    doClustering() {
+        this.clusteredMeshes = this.meshes;
+    }
+
+    finalize() {
+        this.doClustering();
+        for (let i = 0, len = this.clusteredMeshes.length; i < len; i++) {
+            this.sceneModel.addMesh(this.clusteredMeshes[i]);
+        }
+        for (let i = 0, len = this.entities.length; i < len; i++) {
+            this.sceneModel.addEntity(this.entities[i]);
+        }
+    }
+}

package/src/viewer/scene/model/dtx/triangles/renderers/TrianglesDataTextureSnapDepthBufInitRenderer.js

@@ -371,7 +371,6 @@ export class TrianglesDataTextureSnapDepthBufInitRenderer {
         src.push("float tmp = clipPos.w;")
         src.push("clipPos.xyzw /= tmp;")
         src.push("clipPos.xy = remapClipPos(clipPos.xy);");
-        src.push("clipPos.z += 0.0001;"); // small Z offset
         src.push("clipPos.xyzw *= tmp;")
         if (SNAPPING_LOG_DEPTH_BUF_ENABLED) {
             src.push("vFragDepth = 1.0 + clipPos.w;");
@@ -429,7 +428,10 @@ export class TrianglesDataTextureSnapDepthBufInitRenderer {
             src.push("  }");
         }
         if (SNAPPING_LOG_DEPTH_BUF_ENABLED) {
-            src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    float dx = dFdx(vFragDepth);")
+            src.push("    float dy = dFdy(vFragDepth);")
+            src.push("    float diff = sqrt(dx*dx+dy*dy);");
+            src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth + diff ) * logDepthBufFC * 0.5;");
         }
         src.push("outCoords = ivec4(relativeToOriginPosition.xyz * uCoordinateScaler.xyz, - uLayerNumber);")
         src.push("}");

package/src/viewer/scene/model/vbo/snapBatching/SnapBatchingDepthBufInitRenderer.js

@@ -217,7 +217,6 @@ export class SnapBatchingDepthBufInitRenderer extends VBOSceneModelRenderer {
         src.push("float tmp = clipPos.w;")
         src.push("clipPos.xyzw /= tmp;")
         src.push("clipPos.xy = remapClipPos(clipPos.xy);");
-        src.push("clipPos.z += 0.0001;"); // small Z offset
         src.push("clipPos.xyzw *= tmp;")
         if (SNAPPING_LOG_DEPTH_BUF_ENABLED) {
             src.push("vFragDepth = 1.0 + clipPos.w;");
@@ -275,7 +274,10 @@ export class SnapBatchingDepthBufInitRenderer extends VBOSceneModelRenderer {
             src.push("  }");
         }
         if (SNAPPING_LOG_DEPTH_BUF_ENABLED) {
-            src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    float dx = dFdx(vFragDepth);")
+            src.push("    float dy = dFdy(vFragDepth);")
+            src.push("    float diff = sqrt(dx*dx+dy*dy);");
+            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("}");

package/src/viewer/scene/model/vbo/snapInstancing/SnapInstancingDepthBufInitRenderer.js

@@ -249,7 +249,6 @@ class SnapInstancingDepthBufInitRenderer extends VBOSceneModelRenderer {
         src.push("float tmp = clipPos.w;")
         src.push("clipPos.xyzw /= tmp;")
         src.push("clipPos.xy = remapClipPos(clipPos.xy);");
-        src.push("clipPos.z += 0.0001;"); // small Z offset
         src.push("clipPos.xyzw *= tmp;")
         if (SNAPPING_LOG_DEPTH_BUF_ENABLED) {
             src.push("vFragDepth = 1.0 + clipPos.w;");
@@ -307,7 +306,10 @@ class SnapInstancingDepthBufInitRenderer extends VBOSceneModelRenderer {
             src.push("}");
         }
         if (SNAPPING_LOG_DEPTH_BUF_ENABLED) {
-            src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    float dx = dFdx(vFragDepth);")
+            src.push("    float dy = dFdy(vFragDepth);")
+            src.push("    float diff = sqrt(dx*dx+dy*dy);");
+            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("}");

package/src/plugins/LODCullingPlugin/LODCullingPlugin.js

@@ -1,209 +0,0 @@
-
-import {LODManager} from "./LODManager.js";
-import {Plugin} from "../../viewer";
-
-/**
- * Manages LOD culling for {@link SceneModel} implementations.
- */
-export class LODCullingPlugin extends Plugin {
-
-    constructor(viewer, cfg = {}) {
-
-        super("LODCulling", viewer);
-
-        this._scene = viewer.scene;
-        this._lodLevels = [2000, 600, 150, 80, 20];
-        this._neverCullTypes = [];
-        this._neverCullTypesMap = {};
-        this._lodManagers = {};
-        this._lodManagerList = [];
-
-        this.enabled = cfg.enabled;
-        this.targetFPS = cfg.targetFPS;
-
-        this._init();
-    }
-
-    _init() {
-
-        const MAX_NUM_TICKS = 4;
-        const tickTimeArray = new Array(MAX_NUM_TICKS);
-
-        let numTick = 0;
-        let currentFPS = -1;
-        let preRenderTime = Date.now();
-        let deltaTime = 0;
-        let sceneTick = 0;
-        let lastTickCameraMoved = sceneTick;
-
-        this._scene.on("rendering", () => { // Apply LOD-culling before rendering the scene
-            if (currentFPS === -1) {
-                return;
-            }
-            for (let i = 0, len = this._lodManagerList.length; i < len; i++) {
-                this._lodManagerList[i].applyLodCulling(currentFPS);
-            }
-        });
-
-        this._scene.on("rendered", () => {
-            preRenderTime = Date.now();
-            window.requestAnimationFrame(() => {
-                numTick++;
-                const newTime = Date.now();
-                deltaTime = newTime - preRenderTime;
-                preRenderTime = newTime;
-                tickTimeArray[numTick % MAX_NUM_TICKS] = deltaTime;
-                let sumTickTimes = 0;
-                if (numTick > MAX_NUM_TICKS) {
-                    for (let i = 0; i < MAX_NUM_TICKS; i++) {
-                        sumTickTimes += tickTimeArray[i];
-                    }
-                    currentFPS = MAX_NUM_TICKS / sumTickTimes * 1000;
-                }
-            });
-        });
-
-        this._scene.camera.on("matrix", () => {
-            lastTickCameraMoved = sceneTick;
-        });
-
-        this._scene.on("tick", () => {
-            if ((sceneTick - lastTickCameraMoved) > 3) {
-                for (let i = 0, len = this._lodManagerList.length; i < len; i++) {   // Call LOD-culling tasks
-                    this._lodManagerList[i].resetLodCulling();
-                }
-            }
-            sceneTick++;
-        });
-
-        this._onModelLoaded = viewer.scene.on("modelLoaded", (modelId) => {
-            const sceneModel = this.viewer.scene.models[modelId];
-            if (sceneModel) {
-                this._getLODManager(sceneModel);
-            }
-        });
-    }
-
-    /**
-     * Sets whether LOD is enabled for the {@link Scene}.
-     *
-     * Default value is ````false````.
-     *
-     * @type {Boolean}
-     */
-    set enabled(value) {
-        value = !!value;
-        if (this._enabled === value) {
-            return;
-        }
-        this._enabled = value;
-        this.glRedraw();
-    }
-
-    /**
-     * Gets whether LOD is enabled for the {@link Scene}.
-     *
-     * Default value is ````false````.
-     *
-     * @type {Boolean}
-     */
-    get enabled() {
-        return this._enabled;
-    }
-
-    /**
-     * Sets the maximum area that LOD takes into account when checking for possible occlusion for each fragment.
-     *
-     * Default value is ````30.0````.
-     *
-     * @type {Number}
-     */
-    set targetFPS(value) {
-        if (value === undefined || value === null) {
-            value = 30.0;
-        }
-        if (this._targetFPS === value) {
-            return;
-        }
-        this._targetFPS = value;
-        this.glRedraw();
-    }
-
-    /**
-     * Gets the maximum area that LOD takes into account when checking for possible occlusion for each fragment.
-     *
-     * Default value is ````30.0````.
-     *
-     * @type {Number}
-     */
-    get targetFPS() {
-        return this._targetFPS;
-    }
-
-    /**
-     * Sets the {@link MetaObject} types that are never culled.
-     *
-     * Default value is ````[]````.
-     *
-     * @type {string[]}
-     */
-    set neverCullTypes(value) {
-        if (value === undefined || value === null) {
-            value = [];
-        }
-        this._neverCullTypes = value;
-        this._neverCullTypesMap = {};
-        for (let i = 0, len = this._neverCullTypes.length; i < len; i++) {
-            this._neverCullTypesMap[this._neverCullTypes[i]] = true;
-        }
-      //  this.glRedraw();
-    }
-
-    /**
-     * Gets the {@link MetaObject} types that are never culled.
-     *
-     * Default value is ````[]````.
-     *
-     * @type {string[]}
-     */
-    get neverCullTypes() {
-        return this._neverCullTypes;
-    }
-
-    /**
-     * @private
-     * @returns {*|{}}
-     */
-    get neverCullTypesMap() {
-        return this._neverCullTypesMap;
-    }
-    
-    /**
-     * Called within SceneModel constructors
-     * @private
-     */
-    _getLODManager(sceneModel) {
-        const lodManager = new LODManager(this.scene, sceneModel, this._lodLevels, this._targetFPS);
-        this._lodManagers[lodManager.id] = lodManager;
-        this._lodManagerList = Object.values(this._lodManagers);
-        return lodManager;
-    }
-
-    /**
-     * Called within SceneModel destructors
-     * @private
-     */
-    _putLODManager(lodManager) {
-        delete this._lodManagers[lodManager.id];
-        this._lodManagerList = Object.values(this._lodManagers);
-    }
-
-    /**
-     * Destroys this component.
-     *
-     * @private
-     */
-    destroy() {
-        super.destroy();
-    }
-}

package/src/plugins/LODCullingPlugin/LODManager.js

@@ -1,82 +0,0 @@
-import {LODState} from "./LODState.js";
-
-/**
- * @private
- */
-export class LODManager {
-
-    constructor(scene, sceneModel, lodLevels, targetFps) {
-        this.id = sceneModel.id;
-        this.scene = scene;
-        this.sceneModel = sceneModel;
-        this.lodState = new LODState(lodLevels, targetFps);
-        this.lodState.initializeLodState(sceneModel);
-    }
-
-    /**
-     * Cull any objects belonging to the current `LOD` level, and increase the `LOD` level.
-     */
-    _increaseLODLevelIndex() {
-        const lodState = this.lodState;
-        if (lodState.lodLevelIndex === lodState.primLODLevels.length) {
-            return false;
-        }
-        const entitiesInLOD = lodState.entitiesInLOD [lodState.primLODLevels[lodState.lodLevelIndex]] || [];
-        for (let i = 0, len = entitiesInLOD.length; i < len; i++) {
-            entitiesInLOD[i].culledLOD = true;
-        }
-        lodState.lodLevelIndex++;
-        return true;
-    }
-
-    /**
-     * Un-cull any objects belonging to the current `LOD` level, and decrease the `LOD` level.
-     */
-    _decreaseLODLevelIndex() {
-        const lodState = this.lodState;
-        if (lodState.lodLevelIndex === 0) {
-            return false;
-        }
-        const entitiesInLOD = lodState.entitiesInLOD [lodState.primLODLevels[lodState.lodLevelIndex - 1]] || [];
-        for (let i = 0, len = entitiesInLOD.length; i < len; i++) {
-            entitiesInLOD[i].culledLOD = false;
-        }
-        lodState.lodLevelIndex--;
-        return true;
-    }
-
-    /**
-     * Apply LOD culling.
-     *
-     * Will update LOD level, if needed, based on current FPS and target FPS,
-     * and then will cull/uncull the needed objects according to the LOD level.
-     *
-     * @param {number} currentFPS The current FPS (frames per second)
-     * @returns {boolean} Whether the LOD level was changed. This is, if some object was culled/unculled.
-     */
-    applyLodCulling(currentFPS) {
-        let lodState = this.lodState;
-        let retVal = false;
-        if (currentFPS < lodState.targetFps) {
-            if (++lodState.consecutiveFramesWithoutTargetFps > 2) {
-                lodState.consecutiveFramesWithoutTargetFps = 0;
-                retVal = this._increaseLODLevelIndex();
-            }
-        } else if (currentFPS > (lodState.targetFps + 4)) {
-            if (++lodState.consecutiveFramesWithTargetFps > 2) {
-                lodState.consecutiveFramesWithTargetFps = 0;
-                retVal = this._decreaseLODLevelIndex();
-            }
-        }
-        return retVal;
-    }
-
-    resetLodCulling() {
-        let retVal = false;
-        let decreasedLevel = false;
-        do {
-            retVal |= (decreasedLevel = this._decreaseLODLevelIndex());
-        } while (decreasedLevel);
-        return retVal;
-    }
-}

package/src/plugins/LODCullingPlugin/LODState.js

@@ -1,130 +0,0 @@
-import {math} from "../math/math.js";
-
-/**
- * Data structure containing pre-initialized `LOD` data.
- *
- * Will be used by the rest of `LOD` related code.
- *
- * @private
- */
-
-export class LODState {
-
-    /**
-     * @param {Array<number>} primLODLevels The primtive counts for the LOD levels, for example ```[ 2000, 600, 150, 80, 20 ]```
-     * @param {number} targetFps The target FPS (_Frames Per Second_) for the dynamic culling of objects in the different LOD levels.
-     */
-    constructor(primLODLevels, targetFps) {
-
-        /**
-         * An array ordered DESC with the number of primtives allowed in each LOD bucket.
-         *
-         * @type {Array<number>}
-         */
-        this.primLODLevels = primLODLevels;
-
-        /**
-         * A computed dictionary for `primtive-number-buckets` where:
-         * - key: the number of primtives allowed for the objects in the bucket.
-         * - value: all PerformanceNodes that have the number of primtives or more.
-         *
-         * @type {Map<number, Array<DataTextureSceneModelNode>>}
-         */
-        this.entitiesInLOD = {};
-
-        /**
-         * A computed dictionary for `primtive-number-buckets` where:
-         * - key: the number of primtives allowed for the objects in the bucket.
-         * - value: the sum of primtives counts for all PeformanceNodes in the bucket.
-         *
-         * @type {Map<number, number>}
-         */
-        this.primCountInLOD = {};
-
-        /**
-         * The target FPS for the `LOD` mechanism:
-         * - if real FPS are below this number, the next `LOD` level will be applied.
-         *
-         * - if real FPS are...
-         *   - above this number plus a margin
-         *   - and for some consecutive frames
-         *  ... then the previous `LOD` level will be applied.
-         *
-         * @type {number}
-         */
-        this.targetFps = targetFps;
-
-        // /**
-        //  * Not used at the moment.
-        //  */
-        // this.restoreTime = LOD_RESTORE_TIME;
-
-        /**
-         * Current `LOD` level. Starts at 0.
-         *
-         * @type {number}
-         */
-        this.lodLevelIndex = 0;
-
-        /**
-         * Number of consecutive frames in current `LOD` level where FPS was above `targetFps`
-         *
-         * @type {number}
-         */
-        this.consecutiveFramesWithTargetFps = 0;
-
-        /**
-         * Number of consecutive frames in current `LOD` level where FPS was below `targetFps`
-         *
-         * @type {number}
-         */
-        this.consecutiveFramesWithoutTargetFps = 0;
-    }
-
-    /**
-     * @param {SceneModel} sceneModel
-     */
-    initializeLodState(sceneModel) {
-        const entityList = Object.values(sceneModel.objects);
-        if (entityList.length === 0) {
-            return;
-        }
-        const neverCullTypesMap = sceneModel.scene.lod.neverCullTypesMap;
-        const metaScene = sceneModel.scene.viewer.metaScene;
-        const entitiesInLOD = {};
-        const primCountInLOD = {};
-        const maxSize = 20;
-        const minComplexity = 25;
-
-        for (let i = 0, len = entityList.length; i < len; i++) {
-            const entity = entityList[i];
-            const metaObject = metaScene.metaObjects[entity.id];
-            if (metaObject && neverCullTypesMap[metaObject.type]) {
-                continue;
-            }
-            const entityComplexity = entity.numPrimitives;
-            const entitySize = math.getAABB3Diag(entity.aabb);
-            // const isCullable = ((minComplexity <= entityComplexity) && (entitySize <= maxSize));
-            // if (!isCullable) {
-            //     continue;
-            // }
-            let lodLevel = 0, len;
-            for (lodLevel = 0, len = this.primLODLevels.length; lodLevel < len; lodLevel++) {
-                if (entity.numPrimitives >= this.primLODLevels [lodLevel]) {
-                    break;
-                }
-            }
-            const lodPrims = this.primLODLevels [lodLevel] || 0;
-            if (!(lodPrims in entitiesInLOD)) {
-                entitiesInLOD [lodPrims] = [];
-            }
-            entitiesInLOD [lodPrims].push(entity);
-            if (!(lodPrims in primCountInLOD)) {
-                primCountInLOD [lodPrims] = 0;
-            }
-            primCountInLOD [lodPrims] += entity.numPrimitives;
-        }
-        this.entitiesInLOD = entitiesInLOD;
-        this.primCountInLOD = primCountInLOD;
-    }
-}

package/src/plugins/LODCullingPlugin/index.js

@@ -1 +0,0 @@
-export * from "./LOD.js";