@xeokit/xeokit-sdk 2.4.0-alpha-21 → 2.4.0-alpha-22

package/dist/xeokit-sdk.cjs.js

@@ -9965,11 +9965,16 @@ class AngleMeasurement extends Component {
             cfg.onContextMenu(event, this);
         } : null;
 
+        const onMouseWheel = (event) => {
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new WheelEvent('wheel', event));
+        };
+
         this._originDot = new Dot(this._container, {
             fillColor: this._color,
             zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
         this._cornerDot = new Dot(this._container, {
@@ -9977,6 +9982,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
         this._targetDot = new Dot(this._container, {
@@ -9984,6 +9990,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
 
@@ -9993,6 +10000,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
         this._targetWire = new Wire(this._container, {
@@ -10001,6 +10009,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
 
@@ -10011,6 +10020,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex + 2,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
 
@@ -99254,9 +99264,6 @@ class KeyboardPanRotateDollyHandler {
             if (!(configs.active && configs.pointerEnabled) || (!scene.input.keyboardEnabled)) {
                 return;
             }
-            if (!states.mouseover) {
-                return;
-            }
             keyDownMap[keyCode] = false;
 
             if (keyCode === input.KEY_SHIFT) {

package/dist/xeokit-sdk.es.js

@@ -9961,11 +9961,16 @@ class AngleMeasurement extends Component {
             cfg.onContextMenu(event, this);
         } : null;
 
+        const onMouseWheel = (event) => {
+            this.plugin.viewer.scene.canvas.canvas.dispatchEvent(new WheelEvent('wheel', event));
+        };
+
         this._originDot = new Dot(this._container, {
             fillColor: this._color,
             zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
         this._cornerDot = new Dot(this._container, {
@@ -9973,6 +9978,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
         this._targetDot = new Dot(this._container, {
@@ -9980,6 +9986,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 2: undefined,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
 
@@ -9989,6 +9996,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
         this._targetWire = new Wire(this._container, {
@@ -9997,6 +10005,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex !== undefined ? plugin.zIndex + 1: undefined,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
 
@@ -10007,6 +10016,7 @@ class AngleMeasurement extends Component {
             zIndex: plugin.zIndex + 2,
             onMouseOver,
             onMouseLeave,
+            onMouseWheel,
             onContextMenu
         });
 
@@ -99250,9 +99260,6 @@ class KeyboardPanRotateDollyHandler {
             if (!(configs.active && configs.pointerEnabled) || (!scene.input.keyboardEnabled)) {
                 return;
             }
-            if (!states.mouseover) {
-                return;
-            }
             keyDownMap[keyCode] = false;
 
             if (keyCode === input.KEY_SHIFT) {

package/dist/xeokit-sdk.es5.js

@@ -2414,7 +2414,7 @@ wireClickableStyle['-webkit-transform-origin']="0 0";wireClickableStyle['-moz-tr
      */function AngleMeasurement(plugin){var _this11;var cfg=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};_classCallCheck(this,AngleMeasurement);_this11=_super2.call(this,plugin.viewer.scene,cfg);/**
          * The {@link AngleMeasurementsPlugin} that owns this AngleMeasurement.
          * @type {AngleMeasurementsPlugin}
-         */_this11.plugin=plugin;_this11._container=cfg.container;if(!_this11._container){throw"config missing: container";}_this11._color=cfg.color||plugin.defaultColor;var scene=_this11.plugin.viewer.scene;_this11._originMarker=new Marker(scene,cfg.origin);_this11._cornerMarker=new Marker(scene,cfg.corner);_this11._targetMarker=new Marker(scene,cfg.target);_this11._originWorld=math.vec3();_this11._cornerWorld=math.vec3();_this11._targetWorld=math.vec3();_this11._wp=new Float64Array(12);_this11._vp=new Float64Array(12);_this11._pp=new Float64Array(12);_this11._cp=new Int16Array(6);var onMouseOver=cfg.onMouseOver?function(event){cfg.onMouseOver(event,_assertThisInitialized(_this11));}:null;var onMouseLeave=cfg.onMouseLeave?function(event){cfg.onMouseLeave(event,_assertThisInitialized(_this11));}:null;var onContextMenu=cfg.onContextMenu?function(event){cfg.onContextMenu(event,_assertThisInitialized(_this11));}:null;_this11._originDot=new Dot(_this11._container,{fillColor:_this11._color,zIndex:plugin.zIndex!==undefined?plugin.zIndex+2:undefined,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onContextMenu:onContextMenu});_this11._cornerDot=new Dot(_this11._container,{fillColor:_this11._color,zIndex:plugin.zIndex!==undefined?plugin.zIndex+2:undefined,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onContextMenu:onContextMenu});_this11._targetDot=new Dot(_this11._container,{fillColor:_this11._color,zIndex:plugin.zIndex!==undefined?plugin.zIndex+2:undefined,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onContextMenu:onContextMenu});_this11._originWire=new Wire(_this11._container,{color:_this11._color||"blue",thickness:1,zIndex:plugin.zIndex,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onContextMenu:onContextMenu});_this11._targetWire=new Wire(_this11._container,{color:_this11._color||"red",thickness:1,zIndex:plugin.zIndex!==undefined?plugin.zIndex+1:undefined,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onContextMenu:onContextMenu});_this11._angleLabel=new Label(_this11._container,{fillColor:_this11._color||"#00BBFF",prefix:"",text:"",zIndex:plugin.zIndex+2,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onContextMenu:onContextMenu});_this11._wpDirty=false;_this11._vpDirty=false;_this11._cpDirty=false;_this11._visible=false;_this11._originVisible=false;_this11._cornerVisible=false;_this11._targetVisible=false;_this11._originWireVisible=false;_this11._targetWireVisible=false;_this11._angleVisible=false;_this11._labelsVisible=false;_this11._clickable=false;_this11._originMarker.on("worldPos",function(value){_this11._originWorld.set(value||[0,0,0]);_this11._wpDirty=true;_this11._needUpdate(0);// No lag
+         */_this11.plugin=plugin;_this11._container=cfg.container;if(!_this11._container){throw"config missing: container";}_this11._color=cfg.color||plugin.defaultColor;var scene=_this11.plugin.viewer.scene;_this11._originMarker=new Marker(scene,cfg.origin);_this11._cornerMarker=new Marker(scene,cfg.corner);_this11._targetMarker=new Marker(scene,cfg.target);_this11._originWorld=math.vec3();_this11._cornerWorld=math.vec3();_this11._targetWorld=math.vec3();_this11._wp=new Float64Array(12);_this11._vp=new Float64Array(12);_this11._pp=new Float64Array(12);_this11._cp=new Int16Array(6);var onMouseOver=cfg.onMouseOver?function(event){cfg.onMouseOver(event,_assertThisInitialized(_this11));}:null;var onMouseLeave=cfg.onMouseLeave?function(event){cfg.onMouseLeave(event,_assertThisInitialized(_this11));}:null;var onContextMenu=cfg.onContextMenu?function(event){cfg.onContextMenu(event,_assertThisInitialized(_this11));}:null;var onMouseWheel=function onMouseWheel(event){_this11.plugin.viewer.scene.canvas.canvas.dispatchEvent(new WheelEvent('wheel',event));};_this11._originDot=new Dot(_this11._container,{fillColor:_this11._color,zIndex:plugin.zIndex!==undefined?plugin.zIndex+2:undefined,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onMouseWheel:onMouseWheel,onContextMenu:onContextMenu});_this11._cornerDot=new Dot(_this11._container,{fillColor:_this11._color,zIndex:plugin.zIndex!==undefined?plugin.zIndex+2:undefined,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onMouseWheel:onMouseWheel,onContextMenu:onContextMenu});_this11._targetDot=new Dot(_this11._container,{fillColor:_this11._color,zIndex:plugin.zIndex!==undefined?plugin.zIndex+2:undefined,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onMouseWheel:onMouseWheel,onContextMenu:onContextMenu});_this11._originWire=new Wire(_this11._container,{color:_this11._color||"blue",thickness:1,zIndex:plugin.zIndex,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onMouseWheel:onMouseWheel,onContextMenu:onContextMenu});_this11._targetWire=new Wire(_this11._container,{color:_this11._color||"red",thickness:1,zIndex:plugin.zIndex!==undefined?plugin.zIndex+1:undefined,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onMouseWheel:onMouseWheel,onContextMenu:onContextMenu});_this11._angleLabel=new Label(_this11._container,{fillColor:_this11._color||"#00BBFF",prefix:"",text:"",zIndex:plugin.zIndex+2,onMouseOver:onMouseOver,onMouseLeave:onMouseLeave,onMouseWheel:onMouseWheel,onContextMenu:onContextMenu});_this11._wpDirty=false;_this11._vpDirty=false;_this11._cpDirty=false;_this11._visible=false;_this11._originVisible=false;_this11._cornerVisible=false;_this11._targetVisible=false;_this11._originWireVisible=false;_this11._targetWireVisible=false;_this11._angleVisible=false;_this11._labelsVisible=false;_this11._clickable=false;_this11._originMarker.on("worldPos",function(value){_this11._originWorld.set(value||[0,0,0]);_this11._wpDirty=true;_this11._needUpdate(0);// No lag
 });_this11._cornerMarker.on("worldPos",function(value){_this11._cornerWorld.set(value||[0,0,0]);_this11._wpDirty=true;_this11._needUpdate(0);// No lag
 });_this11._targetMarker.on("worldPos",function(value){_this11._targetWorld.set(value||[0,0,0]);_this11._wpDirty=true;_this11._needUpdate(0);// No lag
 });_this11._onViewMatrix=scene.camera.on("viewMatrix",function(){_this11._vpDirty=true;_this11._needUpdate(0);// No lag
@@ -21911,7 +21911,7 @@ if(pickedSubs||pickedNothingSubs||pickedSurfaceSubs){pickController.pickCursorPo
 pickController.pickCursorPos=states.pointerCanvasPos;pickController.schedulePickEntity=configs.doublePickFlyTo;pickController.schedulePickSurface=pickedSurfaceSubs;pickController.update();var firstClickPickResult=pickController.pickResult;var firstClickPickSurface=pickController.pickedSurface;_this93._timeout=setTimeout(function(){if(firstClickPickResult){cameraControl.fire("picked",firstClickPickResult,true);if(firstClickPickSurface){cameraControl.fire("pickedSurface",firstClickPickResult,true);if(!configs.firstPerson&&configs.followPointer){controllers.pivotController.setPivotPos(firstClickPickResult.worldPos);if(controllers.pivotController.startPivot()){controllers.pivotController.showPivot();}}}}else{cameraControl.fire("pickedNothing",{canvasPos:states.pointerCanvasPos},true);}_this93._clicks=0;},configs.doubleClickTimeFrame);}else{// Second click
 if(_this93._timeout!==null){window.clearTimeout(_this93._timeout);_this93._timeout=null;}pickController.pickCursorPos=states.pointerCanvasPos;pickController.schedulePickEntity=configs.doublePickFlyTo||doublePickedSubs||doublePickedSurfaceSubs;pickController.schedulePickSurface=pickController.schedulePickEntity&&doublePickedSurfaceSubs;pickController.update();if(pickController.pickResult){cameraControl.fire("doublePicked",pickController.pickResult,true);if(pickController.pickedSurface){cameraControl.fire("doublePickedSurface",pickController.pickResult,true);}if(configs.doublePickFlyTo){flyCameraTo(pickController.pickResult);if(!configs.firstPerson&&configs.followPointer){var pickedEntityAABB=pickController.pickResult.entity.aabb;var pickedEntityCenterPos=math.getAABB3Center(pickedEntityAABB);controllers.pivotController.setPivotPos(pickedEntityCenterPos);if(controllers.pivotController.startPivot()){controllers.pivotController.showPivot();}}}}else{cameraControl.fire("doublePickedNothing",{canvasPos:states.pointerCanvasPos},true);if(configs.doublePickFlyTo){flyCameraTo();if(!configs.firstPerson&&configs.followPointer){var sceneAABB=scene.aabb;var sceneCenterPos=math.getAABB3Center(sceneAABB);controllers.pivotController.setPivotPos(sceneCenterPos);if(controllers.pivotController.startPivot()){controllers.pivotController.showPivot();}}}}_this93._clicks=0;}},false);}_createClass(MousePickHandler,[{key:"reset",value:function reset(){this._clicks=0;this._lastPickedEntityId=null;if(this._timeout){window.clearTimeout(this._timeout);this._timeout=null;}}},{key:"destroy",value:function destroy(){var canvas=this._scene.canvas.canvas;canvas.removeEventListener("mousemove",this._canvasMouseMoveHandler);canvas.removeEventListener("mousedown",this._canvasMouseDownHandler);document.removeEventListener("mouseup",this._documentMouseUpHandler);canvas.removeEventListener("mouseup",this._canvasMouseUpHandler);if(this._timeout){window.clearTimeout(this._timeout);this._timeout=null;}}}]);return MousePickHandler;}();/**
  * @private
- */var KeyboardPanRotateDollyHandler=/*#__PURE__*/function(){function KeyboardPanRotateDollyHandler(scene,controllers,configs,states,updates){_classCallCheck(this,KeyboardPanRotateDollyHandler);this._scene=scene;var input=scene.input;var keyDownMap=[];var canvas=scene.canvas.canvas;var mouseMovedSinceLastKeyboardDolly=true;this._onSceneMouseMove=input.on("mousemove",function(){mouseMovedSinceLastKeyboardDolly=true;});this._onSceneKeyDown=input.on("keydown",function(keyCode){if(!(configs.active&&configs.pointerEnabled)||!scene.input.keyboardEnabled){return;}if(!states.mouseover){return;}keyDownMap[keyCode]=true;if(keyCode===input.KEY_SHIFT){canvas.style.cursor="move";}});this._onSceneKeyUp=input.on("keyup",function(keyCode){if(!(configs.active&&configs.pointerEnabled)||!scene.input.keyboardEnabled){return;}if(!states.mouseover){return;}keyDownMap[keyCode]=false;if(keyCode===input.KEY_SHIFT){canvas.style.cursor=null;}});this._onTick=scene.on("tick",function(e){if(!(configs.active&&configs.pointerEnabled)||!scene.input.keyboardEnabled){return;}if(!states.mouseover){return;}var cameraControl=controllers.cameraControl;var elapsedSecs=e.deltaTime/1000.0;//-------------------------------------------------------------------------------------------------
+ */var KeyboardPanRotateDollyHandler=/*#__PURE__*/function(){function KeyboardPanRotateDollyHandler(scene,controllers,configs,states,updates){_classCallCheck(this,KeyboardPanRotateDollyHandler);this._scene=scene;var input=scene.input;var keyDownMap=[];var canvas=scene.canvas.canvas;var mouseMovedSinceLastKeyboardDolly=true;this._onSceneMouseMove=input.on("mousemove",function(){mouseMovedSinceLastKeyboardDolly=true;});this._onSceneKeyDown=input.on("keydown",function(keyCode){if(!(configs.active&&configs.pointerEnabled)||!scene.input.keyboardEnabled){return;}if(!states.mouseover){return;}keyDownMap[keyCode]=true;if(keyCode===input.KEY_SHIFT){canvas.style.cursor="move";}});this._onSceneKeyUp=input.on("keyup",function(keyCode){if(!(configs.active&&configs.pointerEnabled)||!scene.input.keyboardEnabled){return;}keyDownMap[keyCode]=false;if(keyCode===input.KEY_SHIFT){canvas.style.cursor=null;}});this._onTick=scene.on("tick",function(e){if(!(configs.active&&configs.pointerEnabled)||!scene.input.keyboardEnabled){return;}if(!states.mouseover){return;}var cameraControl=controllers.cameraControl;var elapsedSecs=e.deltaTime/1000.0;//-------------------------------------------------------------------------------------------------
 // Keyboard rotation
 //-------------------------------------------------------------------------------------------------
 if(!configs.planView){var rotateYPos=cameraControl._isKeyDownForAction(cameraControl.ROTATE_Y_POS,keyDownMap);var rotateYNeg=cameraControl._isKeyDownForAction(cameraControl.ROTATE_Y_NEG,keyDownMap);var rotateXPos=cameraControl._isKeyDownForAction(cameraControl.ROTATE_X_POS,keyDownMap);var rotateXNeg=cameraControl._isKeyDownForAction(cameraControl.ROTATE_X_NEG,keyDownMap);var orbitDelta=elapsedSecs*configs.keyboardRotationRate;if(rotateYPos||rotateYNeg||rotateXPos||rotateXNeg){if(!configs.firstPerson&&configs.followPointer){controllers.pivotController.startPivot();}if(rotateYPos){updates.rotateDeltaY+=orbitDelta;}else if(rotateYNeg){updates.rotateDeltaY-=orbitDelta;}if(rotateXPos){updates.rotateDeltaX+=orbitDelta;}else if(rotateXNeg){updates.rotateDeltaX-=orbitDelta;}if(!configs.firstPerson&&configs.followPointer){controllers.pivotController.startPivot();}}}//-------------------------------------------------------------------------------------------------