@xeokit/xeokit-sdk 2.4.2-beta-49 → 2.5.1-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.4.2-beta-49",
+  "version": "2.5.1-beta",
   "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/AngleMeasurementsPlugin/AngleMeasurement.js

@@ -52,10 +52,12 @@ class AngleMeasurement extends Component {
 
         const onMouseOver = cfg.onMouseOver ? (event) => {
             cfg.onMouseOver(event, this);
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mouseover', event));
         } : null;
 
         const onMouseLeave = cfg.onMouseLeave ? (event) => {
             cfg.onMouseLeave(event, this);
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mouseleave', event));
         } : null;
 
         const onContextMenu = cfg.onContextMenu ? (event) => {
@@ -66,12 +68,27 @@ class AngleMeasurement extends Component {
             this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new WheelEvent('wheel', event));
         };
 
+        const onMouseDown = (event) => {
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mousedown', event));
+        } ;
+
+        const onMouseUp =  (event) => {
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mouseup', event));
+        };
+
+        const onMouseMove =  (event) => {
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mousemove', event));
+        };
+
         this._originDot = new Dot(this._container, {
             fillColor: this._color,
             zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2 : undefined,
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
         this._cornerDot = new Dot(this._container, {
@@ -80,6 +97,9 @@ class AngleMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
         this._targetDot = new Dot(this._container, {
@@ -88,6 +108,9 @@ class AngleMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -98,6 +121,9 @@ class AngleMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
         this._targetWire = new Wire(this._container, {
@@ -107,6 +133,9 @@ class AngleMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -118,6 +147,9 @@ class AngleMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 

package/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsPlugin.js

@@ -352,6 +352,7 @@ export class AngleMeasurementsPlugin extends Plugin {
         measurement.on("destroyed", () => {
             delete this._measurements[measurement.id];
         });
+        measurement.clickable = true;
         this.fire("measurementCreated", measurement);
         return measurement;
     }

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurement.js

@@ -62,12 +62,26 @@ class DistanceMeasurement extends Component {
 
         const onMouseOver = cfg.onMouseOver ? (event) => {
             cfg.onMouseOver(event, this);
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mouseover', event));
         } : null;
 
         const onMouseLeave = cfg.onMouseLeave ? (event) => {
             cfg.onMouseLeave(event, this);
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mouseleave', event));
         } : null;
 
+        const onMouseDown = (event) => {
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mousedown', event));
+        } ;
+
+        const onMouseUp =  (event) => {
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mouseup', event));
+        };
+
+        const onMouseMove =  (event) => {
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new MouseEvent('mousemove', event));
+        };
+
         const onContextMenu = cfg.onContextMenu ? (event) => {
             cfg.onContextMenu(event, this);
         } : null;
@@ -82,6 +96,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -91,6 +108,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -102,6 +122,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -113,6 +136,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -124,6 +150,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -135,6 +164,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -146,6 +178,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -157,6 +192,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -168,6 +206,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 
@@ -179,6 +220,9 @@ class DistanceMeasurement extends Component {
             onMouseOver,
             onMouseLeave,
             onMouseWheel,
+            onMouseDown,
+            onMouseUp,
+            onMouseMove,
             onContextMenu
         });
 

package/src/plugins/lib/html/Dot.js

@@ -56,9 +56,14 @@ class Dot {
         }
         parentElement.appendChild(dotClickable);
 
+        dotClickable.addEventListener('click', (event) => {
+            parentElement.dispatchEvent(new MouseEvent('mouseover', event));
+        });
+
         if (cfg.onMouseOver) {
             dotClickable.addEventListener('mouseover', (event) => {
                 cfg.onMouseOver(event, this);
+                parentElement.dispatchEvent(new MouseEvent('mouseover', event));
             });
         }
 
@@ -74,6 +79,24 @@ class Dot {
             });
         }
 
+        if (cfg.onMouseDown) {
+            dotClickable.addEventListener('mousedown', (event) => {
+                cfg.onMouseDown(event, this);
+            });
+        }
+
+        if (cfg.onMouseUp) {
+            dotClickable.addEventListener('mouseup', (event) => {
+                cfg.onMouseUp(event, this);
+            });
+        }
+
+        if (cfg.onMouseMove) {
+            dotClickable.addEventListener('mousemove', (event) => {
+                cfg.onMouseMove(event, this);
+            });
+        }
+
         if (cfg.onContextMenu) {
             dotClickable.addEventListener('contextmenu', (event) => {
                 cfg.onContextMenu(event, this);

package/src/plugins/lib/html/Label.js

@@ -63,6 +63,24 @@ class Label {
             });
         }
 
+        if (cfg.onMouseDown) {
+            label.addEventListener('mousedown', (event) => {
+                cfg.onMouseDown(event, this);
+            });
+        }
+
+        if (cfg.onMouseUp) {
+            label.addEventListener('mouseup', (event) => {
+                cfg.onMouseUp(event, this);
+            });
+        }
+
+        if (cfg.onMouseMove) {
+            label.addEventListener('mousemove', (event) => {
+                cfg.onMouseMove(event, this);
+            });
+        }
+
         if (cfg.onContextMenu) {
             label.addEventListener('contextmenu', (event) => {
                 cfg.onContextMenu(event, this);

package/src/plugins/lib/html/Wire.js

@@ -95,6 +95,24 @@ class Wire {
             });
         }
 
+        if (cfg.onMouseDown) {
+            wireClickable.addEventListener('mousedown', (event) => {
+                cfg.onMouseDown(event, this);
+            });
+        }
+
+        if (cfg.onMouseUp) {
+            wireClickable.addEventListener('mouseup', (event) => {
+                cfg.onMouseUp(event, this);
+            });
+        }
+
+        if (cfg.onMouseMove) {
+            wireClickable.addEventListener('mousemove', (event) => {
+                cfg.onMouseMove(event, this);
+            });
+        }
+
         if (cfg.onContextMenu) {
             wireClickable.addEventListener('contextmenu', (event) => {
                 cfg.onContextMenu(event, this);

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;
-    }
-}