@xeokit/xeokit-sdk 2.4.2-beta-13 → 2.4.2-beta-14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.4.2-beta-13",
+  "version": "2.4.2-beta-14",
   "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/extras/MarqueePicker/MarqueePicker.js

@@ -7,20 +7,6 @@ import {Frustum, frustumIntersectsAABB3, setFrustum} from "../../viewer/scene/ma
  */
 export class MarqueePicker extends Component {
 
-    /**
-     * Pick mode that picks {@link Entity}s that intersect the marquee box.
-     *
-     * @type {number}
-     */
-    static PICK_MODE_INTERSECTS = 0;
-
-    /**
-     * Pick mode that picks {@link Entity}s that are completely inside the marquee box.
-     *
-     * @type {number}
-     */
-    static PICK_MODE_INSIDE = 1;
-
     /**
      * Creates a MarqueePicker.
      *
@@ -269,3 +255,17 @@ export class MarqueePicker extends Component {
         }
     }
 }
+
+/**
+ * Pick mode that picks {@link Entity}s that intersect the marquee box.
+ *
+ * @type {number}
+ */
+MarqueePicker.PICK_MODE_INTERSECTS = 0;
+
+/**
+ * Pick mode that picks {@link Entity}s that are completely inside the marquee box.
+ *
+ * @type {number}
+ */
+MarqueePicker.PICK_MODE_INSIDE = 1;

package/src/viewer/scene/CameraControl/lib/controllers/PickController.js

@@ -69,13 +69,29 @@ class PickController {
 
         this._lastPickedEntityId = null;
 
-        this._needFireEvents = false;
+        this._needFireEvents = 0;
+
+        this._needToUpdate = false;
+
+        this._tickSub = this._scene.on("tick", () => {
+            this.runUpdate();
+        });
+    }
+
+    update() {
+        this._needToUpdate = true;
     }
 
     /**
      * Immediately attempts a pick, if scheduled.
      */
-    update() {
+    runUpdate() {
+
+        if (!this._needToUpdate) {
+            return;
+        }
+
+        this._needToUpdate = false;
 
         if (!this._configs.pointerEnabled) {
             return;
@@ -90,8 +106,6 @@ class PickController {
         this.snappedOrPicked = false;
         this.hoveredSnappedOrSurfaceOff = false;
 
-        this._needFireEvents = false;
-
         const hasHoverSurfaceSubs = this._cameraControl.hasSubs("hoverSurface");
 
         if (this.scheduleSnapOrPick) {
@@ -104,7 +118,7 @@ class PickController {
             if (snapPickResult && snapPickResult.snappedWorldPos) {
                 this.snapPickResult = snapPickResult;
                 this.snappedOrPicked = true;
-                this._needFireEvents = true;
+                this._needFireEvents++;
             } else {
                 this.schedulePickSurface = true; // Fallback
                 this.snapPickResult = null;
@@ -117,7 +131,7 @@ class PickController {
                 if (pickResultCanvasPos[0] === this.pickCursorPos[0] && pickResultCanvasPos[1] === this.pickCursorPos[1]) {
                     this.picked = true;
                     this.pickedSurface = true;
-                    this._needFireEvents = hasHoverSurfaceSubs;
+                    this._needFireEvents += hasHoverSurfaceSubs ? 1 : 0;
                     this.schedulePickEntity = false;
                     this.schedulePickSurface = false;
                     if (this.scheduleSnapOrPick) {
@@ -137,7 +151,6 @@ class PickController {
                 if (pickResultCanvasPos[0] === this.pickCursorPos[0] && pickResultCanvasPos[1] === this.pickCursorPos[1]) {
                     this.picked = true;
                     this.pickedSurface = false;
-                    this._needFireEvents = false;
                     this.schedulePickEntity = false;
                     this.schedulePickSurface = false;
                     return;
@@ -158,10 +171,10 @@ class PickController {
                 } else {
                     this.pickedSurface = true;
                 }
-                this._needFireEvents = true;
+                this._needFireEvents++;
             } else if (this.scheduleSnapOrPick) {
                 this.hoveredSnappedOrSurfaceOff = true;
-                this._needFireEvents = true;
+                this._needFireEvents++;
             }
 
         } else { // schedulePickEntity == true
@@ -173,7 +186,7 @@ class PickController {
             if (this.pickResult) {
                 this.picked = true;
                 this.pickedSurface = false;
-                this._needFireEvents = true;
+                this._needFireEvents++;
             }
         }
 
@@ -184,7 +197,7 @@ class PickController {
 
     fireEvents() {
 
-        if (!this._needFireEvents) {
+        if (this._needFireEvents == 0) {
             return;
         }
 
@@ -254,10 +267,11 @@ class PickController {
 
         this.pickResult = null;
 
-        this._needFireEvents = false;
+        this._needFireEvents = 0;
     }
 
     destroy() {
+        this._scene.off(this._tickSub);
     }
 }