@xeokit/xeokit-sdk 2.4.0-alpha-104 → 2.4.0-alpha-105

package/dist/xeokit-sdk.cjs.js

@@ -11030,6 +11030,7 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                     if (mouseHovering) {
                         this._currentAngleMeasurement.targetVisible = true;
                         this._currentAngleMeasurement.angleVisible = true;
+                        this._currentAngleMeasurement.clickable = true;
                         this.angleMeasurementsPlugin.fire("measurementEnd", this._currentAngleMeasurement);
                         this._currentAngleMeasurement = null;
                         this._mouseState = MOUSE_FINDING_ORIGIN;

package/dist/xeokit-sdk.es.js

@@ -11026,6 +11026,7 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
                     if (mouseHovering) {
                         this._currentAngleMeasurement.targetVisible = true;
                         this._currentAngleMeasurement.angleVisible = true;
+                        this._currentAngleMeasurement.clickable = true;
                         this.angleMeasurementsPlugin.fire("measurementEnd", this._currentAngleMeasurement);
                         this._currentAngleMeasurement = null;
                         this._mouseState = MOUSE_FINDING_ORIGIN;

package/dist/xeokit-sdk.es5.js

@@ -2550,7 +2550,7 @@ this._originDot.setVisible(this._visible&&this._originVisible);this._cornerDot.s
      * @returns {boolean} Whether snap-to-vertex and snap-to-edge are enabled for this AngleMeasurementsMouseControl.
      */function get(){return this._snapping;}/**
      * Activates this AngleMeasurementsMouseControl, ready to respond to input.
-     */,set:function set(snapping){if(snapping!==this._snapping){this._snapping=snapping;this.deactivate();this.activate();}else{this._snapping=snapping;}}},{key:"activate",value:function activate(){var _this15=this;if(this._active){return;}this.angleMeasurementsPlugin;var scene=this.scene;scene.input;var canvas=scene.canvas.canvas;var clickTolerance=20;var cameraControl=this.angleMeasurementsPlugin.viewer.cameraControl;var pointerLens=this.pointerLens;var mouseHovering=false;var mouseHoverEntity=false;var lastMouseCanvasX=0;var lastMouseCanvasY=0;var mouseWorldPos=math.vec3();var mouseHoverCanvasPos=math.vec2();this._currentAngleMeasurement=null;this._onMouseHoverSurface=cameraControl.on(this._snapping?"hoverSnapOrSurface":"hoverSurface",function(event){if(event.snappedToVertex||event.snappedToEdge){if(pointerLens){pointerLens.visible=true;pointerLens.centerPos=event.cursorPos||event.canvasPos;pointerLens.cursorPos=event.canvasPos;pointerLens.snapped=true;}_this15.markerDiv.style.background="greenyellow";_this15.markerDiv.style.border="2px solid green";}else{if(pointerLens){pointerLens.visible=true;pointerLens.centerPos=event.cursorPos||event.canvasPos;pointerLens.cursorPos=event.canvasPos;pointerLens.snapped=false;}_this15.markerDiv.style.background="pink";_this15.markerDiv.style.border="2px solid red";}mouseHovering=true;mouseHoverEntity=event.entity;mouseWorldPos.set(event.worldPos);mouseHoverCanvasPos.set(event.canvasPos);switch(_this15._mouseState){case MOUSE_FINDING_ORIGIN:_this15.markerDiv.style.marginLeft="".concat(event.canvasPos[0]-5,"px");_this15.markerDiv.style.marginTop="".concat(event.canvasPos[1]-5,"px");break;case MOUSE_FINDING_CORNER:if(_this15._currentAngleMeasurement){_this15._currentAngleMeasurement.originWireVisible=true;_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.cornerVisible=true;_this15._currentAngleMeasurement.angleVisible=false;_this15._currentAngleMeasurement.corner.worldPos=event.worldPos;}_this15.markerDiv.style.marginLeft="-10000px";_this15.markerDiv.style.marginTop="-10000px";canvas.style.cursor="pointer";break;case MOUSE_FINDING_TARGET:if(_this15._currentAngleMeasurement){_this15._currentAngleMeasurement.targetWireVisible=true;_this15._currentAngleMeasurement.targetVisible=true;_this15._currentAngleMeasurement.angleVisible=true;_this15._currentAngleMeasurement.target.worldPos=event.worldPos;}_this15.markerDiv.style.marginLeft="-10000px";_this15.markerDiv.style.marginTop="-10000px";canvas.style.cursor="pointer";break;}});canvas.addEventListener('mousedown',this._onMouseDown=function(e){if(e.which!==1){return;}lastMouseCanvasX=e.clientX;lastMouseCanvasY=e.clientY;});canvas.addEventListener("mouseup",this._onMouseUp=function(e){if(e.which!==1){return;}if(e.clientX>lastMouseCanvasX+clickTolerance||e.clientX<lastMouseCanvasX-clickTolerance||e.clientY>lastMouseCanvasY+clickTolerance||e.clientY<lastMouseCanvasY-clickTolerance){return;}switch(_this15._mouseState){case MOUSE_FINDING_ORIGIN:if(mouseHovering){_this15._currentAngleMeasurement=_this15.angleMeasurementsPlugin.createMeasurement({id:math.createUUID(),origin:{entity:mouseHoverEntity,worldPos:mouseWorldPos},corner:{entity:mouseHoverEntity,worldPos:mouseWorldPos},target:{entity:mouseHoverEntity,worldPos:mouseWorldPos},approximate:true});_this15._currentAngleMeasurement.clickable=false;_this15._currentAngleMeasurement.originVisible=true;_this15._currentAngleMeasurement.originWireVisible=true;_this15._currentAngleMeasurement.cornerVisible=false;_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.targetVisible=false;_this15._currentAngleMeasurement.angleVisible=false;_this15._mouseState=MOUSE_FINDING_CORNER;_this15.angleMeasurementsPlugin.fire("measurementStart",_this15._currentAngleMeasurement);}break;case MOUSE_FINDING_CORNER:if(mouseHovering){_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.targetVisible=true;_this15._currentAngleMeasurement.angleVisible=true;_this15._mouseState=MOUSE_FINDING_TARGET;}else{if(_this15._currentAngleMeasurement){_this15._currentAngleMeasurement.destroy();_this15._currentAngleMeasurement=null;_this15._mouseState=MOUSE_FINDING_ORIGIN;_this15.angleMeasurementsPlugin.fire("measurementCancel",_this15._currentAngleMeasurement);}}break;case MOUSE_FINDING_TARGET:if(mouseHovering){_this15._currentAngleMeasurement.targetVisible=true;_this15._currentAngleMeasurement.angleVisible=true;_this15.angleMeasurementsPlugin.fire("measurementEnd",_this15._currentAngleMeasurement);_this15._currentAngleMeasurement=null;_this15._mouseState=MOUSE_FINDING_ORIGIN;}else{if(_this15._currentAngleMeasurement){_this15._currentAngleMeasurement.destroy();_this15._currentAngleMeasurement=null;_this15._mouseState=MOUSE_FINDING_ORIGIN;_this15.angleMeasurementsPlugin.fire("measurementCancel",_this15._currentAngleMeasurement);}}break;}});this._onMouseHoverOff=cameraControl.on(this._snapping?"hoverSnapOrSurfaceOff":"hoverOff",function(event){mouseHovering=false;if(pointerLens){pointerLens.visible=true;pointerLens.centerPos=event.cursorPos;pointerLens.cursorPos=event.cursorPos;pointerLens.snapped=false;}_this15.markerDiv.style.marginLeft="-100px";_this15.markerDiv.style.marginTop="-100px";if(_this15._currentAngleMeasurement){switch(_this15._mouseState){case MOUSE_FINDING_ORIGIN:_this15._currentAngleMeasurement.originVisible=false;break;case MOUSE_FINDING_CORNER:_this15._currentAngleMeasurement.cornerVisible=false;_this15._currentAngleMeasurement.originWireVisible=false;_this15._currentAngleMeasurement.targetVisible=false;_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.angleVisible=false;break;case MOUSE_FINDING_TARGET:_this15._currentAngleMeasurement.targetVisible=false;_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.angleVisible=false;break;}canvas.style.cursor="default";}});this._active=true;}/**
+     */,set:function set(snapping){if(snapping!==this._snapping){this._snapping=snapping;this.deactivate();this.activate();}else{this._snapping=snapping;}}},{key:"activate",value:function activate(){var _this15=this;if(this._active){return;}this.angleMeasurementsPlugin;var scene=this.scene;scene.input;var canvas=scene.canvas.canvas;var clickTolerance=20;var cameraControl=this.angleMeasurementsPlugin.viewer.cameraControl;var pointerLens=this.pointerLens;var mouseHovering=false;var mouseHoverEntity=false;var lastMouseCanvasX=0;var lastMouseCanvasY=0;var mouseWorldPos=math.vec3();var mouseHoverCanvasPos=math.vec2();this._currentAngleMeasurement=null;this._onMouseHoverSurface=cameraControl.on(this._snapping?"hoverSnapOrSurface":"hoverSurface",function(event){if(event.snappedToVertex||event.snappedToEdge){if(pointerLens){pointerLens.visible=true;pointerLens.centerPos=event.cursorPos||event.canvasPos;pointerLens.cursorPos=event.canvasPos;pointerLens.snapped=true;}_this15.markerDiv.style.background="greenyellow";_this15.markerDiv.style.border="2px solid green";}else{if(pointerLens){pointerLens.visible=true;pointerLens.centerPos=event.cursorPos||event.canvasPos;pointerLens.cursorPos=event.canvasPos;pointerLens.snapped=false;}_this15.markerDiv.style.background="pink";_this15.markerDiv.style.border="2px solid red";}mouseHovering=true;mouseHoverEntity=event.entity;mouseWorldPos.set(event.worldPos);mouseHoverCanvasPos.set(event.canvasPos);switch(_this15._mouseState){case MOUSE_FINDING_ORIGIN:_this15.markerDiv.style.marginLeft="".concat(event.canvasPos[0]-5,"px");_this15.markerDiv.style.marginTop="".concat(event.canvasPos[1]-5,"px");break;case MOUSE_FINDING_CORNER:if(_this15._currentAngleMeasurement){_this15._currentAngleMeasurement.originWireVisible=true;_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.cornerVisible=true;_this15._currentAngleMeasurement.angleVisible=false;_this15._currentAngleMeasurement.corner.worldPos=event.worldPos;}_this15.markerDiv.style.marginLeft="-10000px";_this15.markerDiv.style.marginTop="-10000px";canvas.style.cursor="pointer";break;case MOUSE_FINDING_TARGET:if(_this15._currentAngleMeasurement){_this15._currentAngleMeasurement.targetWireVisible=true;_this15._currentAngleMeasurement.targetVisible=true;_this15._currentAngleMeasurement.angleVisible=true;_this15._currentAngleMeasurement.target.worldPos=event.worldPos;}_this15.markerDiv.style.marginLeft="-10000px";_this15.markerDiv.style.marginTop="-10000px";canvas.style.cursor="pointer";break;}});canvas.addEventListener('mousedown',this._onMouseDown=function(e){if(e.which!==1){return;}lastMouseCanvasX=e.clientX;lastMouseCanvasY=e.clientY;});canvas.addEventListener("mouseup",this._onMouseUp=function(e){if(e.which!==1){return;}if(e.clientX>lastMouseCanvasX+clickTolerance||e.clientX<lastMouseCanvasX-clickTolerance||e.clientY>lastMouseCanvasY+clickTolerance||e.clientY<lastMouseCanvasY-clickTolerance){return;}switch(_this15._mouseState){case MOUSE_FINDING_ORIGIN:if(mouseHovering){_this15._currentAngleMeasurement=_this15.angleMeasurementsPlugin.createMeasurement({id:math.createUUID(),origin:{entity:mouseHoverEntity,worldPos:mouseWorldPos},corner:{entity:mouseHoverEntity,worldPos:mouseWorldPos},target:{entity:mouseHoverEntity,worldPos:mouseWorldPos},approximate:true});_this15._currentAngleMeasurement.clickable=false;_this15._currentAngleMeasurement.originVisible=true;_this15._currentAngleMeasurement.originWireVisible=true;_this15._currentAngleMeasurement.cornerVisible=false;_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.targetVisible=false;_this15._currentAngleMeasurement.angleVisible=false;_this15._mouseState=MOUSE_FINDING_CORNER;_this15.angleMeasurementsPlugin.fire("measurementStart",_this15._currentAngleMeasurement);}break;case MOUSE_FINDING_CORNER:if(mouseHovering){_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.targetVisible=true;_this15._currentAngleMeasurement.angleVisible=true;_this15._mouseState=MOUSE_FINDING_TARGET;}else{if(_this15._currentAngleMeasurement){_this15._currentAngleMeasurement.destroy();_this15._currentAngleMeasurement=null;_this15._mouseState=MOUSE_FINDING_ORIGIN;_this15.angleMeasurementsPlugin.fire("measurementCancel",_this15._currentAngleMeasurement);}}break;case MOUSE_FINDING_TARGET:if(mouseHovering){_this15._currentAngleMeasurement.targetVisible=true;_this15._currentAngleMeasurement.angleVisible=true;_this15._currentAngleMeasurement.clickable=true;_this15.angleMeasurementsPlugin.fire("measurementEnd",_this15._currentAngleMeasurement);_this15._currentAngleMeasurement=null;_this15._mouseState=MOUSE_FINDING_ORIGIN;}else{if(_this15._currentAngleMeasurement){_this15._currentAngleMeasurement.destroy();_this15._currentAngleMeasurement=null;_this15._mouseState=MOUSE_FINDING_ORIGIN;_this15.angleMeasurementsPlugin.fire("measurementCancel",_this15._currentAngleMeasurement);}}break;}});this._onMouseHoverOff=cameraControl.on(this._snapping?"hoverSnapOrSurfaceOff":"hoverOff",function(event){mouseHovering=false;if(pointerLens){pointerLens.visible=true;pointerLens.centerPos=event.cursorPos;pointerLens.cursorPos=event.cursorPos;pointerLens.snapped=false;}_this15.markerDiv.style.marginLeft="-100px";_this15.markerDiv.style.marginTop="-100px";if(_this15._currentAngleMeasurement){switch(_this15._mouseState){case MOUSE_FINDING_ORIGIN:_this15._currentAngleMeasurement.originVisible=false;break;case MOUSE_FINDING_CORNER:_this15._currentAngleMeasurement.cornerVisible=false;_this15._currentAngleMeasurement.originWireVisible=false;_this15._currentAngleMeasurement.targetVisible=false;_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.angleVisible=false;break;case MOUSE_FINDING_TARGET:_this15._currentAngleMeasurement.targetVisible=false;_this15._currentAngleMeasurement.targetWireVisible=false;_this15._currentAngleMeasurement.angleVisible=false;break;}canvas.style.cursor="default";}});this._active=true;}/**
      * Deactivates this AngleMeasurementsMouseControl, making it unresponsive to input.
      *
      * Destroys any {@link AngleMeasurement} under construction by this AngleMeasurementsMouseControl.