@xtctwins/tctwins-bimx-viewer 0.1.19 → 0.1.20

package/dist/tctwins-bimx-viewer.min.es.js

@@ -24661,14 +24661,17 @@ entity:scene.objects[_this124._lastPickedEntityId]},true);}cameraControl.fire("h
 _this124._lastPickedEntityId=pickedEntityId;}}cameraControl.fire("hover",pickController.pickResult,true);if(pickController.pickResult.worldPos||pickController.pickResult.snappedWorldPos){// Hovering the surface of an entity
 cameraControl.fire("hoverSurface",pickController.pickResult,true);}}else{if(_this124._lastPickedEntityId!==undefined){cameraControl.fire("hoverOut",{// Hovered off an entity
 entity:scene.objects[_this124._lastPickedEntityId]},true);_this124._lastPickedEntityId=undefined;}cameraControl.fire("hoverOff",{// Not hovering on any entity
-canvasPos:pickController.pickCursorPos},true);}}});this.canvas.addEventListener("mousemove",tickifiedMouseMoveFn);this.canvas.addEventListener("dblclick",this._canvasDblClickHandler=function(e){states.mouseDownClientX=e.clientX;states.mouseDownClientY=e.clientY;states.mouseDownCursorX=states.pointerCanvasPos[0];states.mouseDownCursorY=states.pointerCanvasPos[1];if(!configs.firstPerson&&configs.followPointer){pickController.pickCursorPos=states.pointerCanvasPos;pickController.schedulePickSurface=true;pickController.update();}var pickResult=pickController.pickResult;if(pickResult){cameraControl.fire("doublePicked",pickController.pickResult,true);if(pickController.pickedSurface){cameraControl.fire("doublePickedSurface",pickController.pickResult,true);}}else{cameraControl.fire("doublePickedNothing",{canvasPos:states.pointerCanvasPos},true);}});this.canvas.addEventListener("mousedown",this._canvasMouseDownHandler=function(e){if(e.which===1){leftDown=true;}if(e.which===3){rightDown=true;}var leftButtonDown=e.which===1;if(!leftButtonDown){return;}if(!(configs.active&&configs.pointerEnabled)){return;}// Left mouse button down to start pivoting
-states.mouseDownClientX=e.clientX;states.mouseDownClientY=e.clientY;states.mouseDownCursorX=states.pointerCanvasPos[0];states.mouseDownCursorY=states.pointerCanvasPos[1];if(!configs.firstPerson&&configs.followPointer){pickController.pickCursorPos=states.pointerCanvasPos;pickController.schedulePickSurface=true;pickController.update();if(e.which===1){// Left button
+canvasPos:pickController.pickCursorPos},true);}}});this.canvas.addEventListener("mousemove",tickifiedMouseMoveFn);this.canvas.addEventListener("dblclick",this._canvasDblClickHandler=function(e){states.mouseDownClientX=e.clientX;states.mouseDownClientY=e.clientY;states.mouseDownCursorX=states.pointerCanvasPos[0];states.mouseDownCursorY=states.pointerCanvasPos[1];if(configs.followPointer){// if (!configs.firstPerson && configs.followPointer) {
+pickController.pickCursorPos=states.pointerCanvasPos;pickController.schedulePickSurface=true;pickController.update();}var pickResult=pickController.pickResult;if(pickResult){cameraControl.fire("doublePicked",pickController.pickResult,true);if(pickController.pickedSurface){cameraControl.fire("doublePickedSurface",pickController.pickResult,true);}}else{cameraControl.fire("doublePickedNothing",{canvasPos:states.pointerCanvasPos},true);}});this.canvas.addEventListener("mousedown",this._canvasMouseDownHandler=function(e){if(e.which===1){leftDown=true;}if(e.which===3){rightDown=true;}var leftButtonDown=e.which===1;if(!leftButtonDown){return;}if(!(configs.active&&configs.pointerEnabled)){return;}// Left mouse button down to start pivoting
+states.mouseDownClientX=e.clientX;states.mouseDownClientY=e.clientY;states.mouseDownCursorX=states.pointerCanvasPos[0];states.mouseDownCursorY=states.pointerCanvasPos[1];if(!configs.firstPerson&&configs.followPointer){// if (!configs.firstPerson && configs.followPointer) {
+pickController.pickCursorPos=states.pointerCanvasPos;pickController.schedulePickSurface=true;pickController.update();if(e.which===1){// Left button
 var pickResult=pickController.pickResult;if(pickResult&&pickResult.worldPos){pivotController.setCanvasPivotPos(states.pointerCanvasPos);cameraControl.fire("mouseDownEntity",pickController.pickResult,true);}else{if(configs.smartPivot){pivotController.setCanvasPivotPos(states.pointerCanvasPos);}else{pivotController.setPivotPos(scene.camera.look);}pivotController.startPivot();cameraControl.fire("mouseDownNothing",pickController.pickResult,true);}}}});document.addEventListener("mouseup",this._documentMouseUpHandler=function(e){if(e.which===1){leftDown=false;}if(e.which===3){rightDown=false;}if(pivotController.getPivoting()){pivotController.endPivot();}});this.canvas.addEventListener("mouseup",this._canvasMouseUpHandler=function(e){if(!(configs.active&&configs.pointerEnabled)){return;}var leftButtonUp=e.which===1;if(!leftButtonUp){return;}// Left mouse button up to possibly pick or double-pick
 pivotController.hidePivot();if(Math.abs(e.clientX-states.mouseDownClientX)>3||Math.abs(e.clientY-states.mouseDownClientY)>3){return;}var pickedSubs=cameraControl.hasSubs("picked");var pickedNothingSubs=cameraControl.hasSubs("pickedNothing");var pickedSurfaceSubs=cameraControl.hasSubs("pickedSurface");var doublePickedSubs=cameraControl.hasSubs("doublePicked");var doublePickedSurfaceSubs=cameraControl.hasSubs("doublePickedSurface");var doublePickedNothingSubs=cameraControl.hasSubs("doublePickedNothing");if(!configs.doublePickFlyTo&&!doublePickedSubs&&!doublePickedSurfaceSubs&&!doublePickedNothingSubs){//  Avoid the single/double click differentiation timeout
 if(pickedSubs||pickedNothingSubs||pickedSurfaceSubs){pickController.pickCursorPos=states.pointerCanvasPos;pickController.schedulePickEntity=true;pickController.schedulePickSurface=pickedSurfaceSubs;pickController.update();if(pickController.pickResult){cameraControl.fire("picked",pickController.pickResult,true);if(pickController.pickedSurface){cameraControl.fire("pickedSurface",pickController.pickResult,true);}}else{cameraControl.fire("pickedNothing",{canvasPos:states.pointerCanvasPos},true);}}_this124._clicks=0;return;}// this._clicks++;
 // if (this._clicks === 1) {
 // First click
-pickController.pickCursorPos=states.pointerCanvasPos;pickController.schedulePickEntity=configs.doublePickFlyTo;pickController.schedulePickSurface=pickedSurfaceSubs;pickController.update();var firstClickPickResult=pickController.pickResult;var firstClickPickSurface=pickController.pickedSurface;_this124._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);}_this124._clicks=0;},configs.doubleClickTimeFrame);// }
+pickController.pickCursorPos=states.pointerCanvasPos;pickController.schedulePickEntity=configs.doublePickFlyTo;pickController.schedulePickSurface=pickedSurfaceSubs;pickController.update();var firstClickPickResult=pickController.pickResult;var firstClickPickSurface=pickController.pickedSurface;_this124._timeout=setTimeout(function(){if(firstClickPickResult){cameraControl.fire("picked",firstClickPickResult,true);if(firstClickPickSurface){cameraControl.fire("pickedSurface",firstClickPickResult,true);if(configs.followPointer){// 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);}_this124._clicks=0;},configs.doubleClickTimeFrame);// }
 //  else {
 // 	// Second click
 // 	if (this._timeout !== null) {
@@ -24730,7 +24733,7 @@ if(!keyDownMap[input.KEY_CTRL]&&!keyDownMap[input.KEY_ALT]){var dollyBackwards=c
 var speedUP=cameraControl._isKeyDownForAction(cameraControl.SPEED_UP,keyDownMap);var speedDown=cameraControl._isKeyDownForAction(cameraControl.SPEED_DOWN,keyDownMap);if(speedUP||speedDown){if(enableSetSpeedUp){if(_this125._movespeed<=2.5){if(_this125._movespeed==0.2){_this125._movespeed+=0.3;}else if(_this125._movespeed==0.5||_this125._movespeed==1||_this125._movespeed==1.5||_this125._movespeed==2){_this125._movespeed+=0.5;}else if(_this125._movespeed==2.5){_this125._movespeed+=1.5;}}else{_this125._movespeed=4;}_this125._cameraControl.fire("personModeSpeedUp",_this125._movespeed);enableSetSpeedUp=false;}if(enableSetSpeedDown){if(_this125._movespeed==4){_this125._movespeed-=1.5;}if(_this125._movespeed==1||_this125._movespeed==1.5||_this125._movespeed==2||_this125._movespeed==2.5){_this125._movespeed-=0.5;}else{_this125._movespeed=0.2;}_this125._cameraControl.fire("personModeSpeedDown",_this125._movespeed);enableSetSpeedDown=false;}}//判断是否能用
 var panForwards=cameraControl._isKeyDownForAction(cameraControl.PAN_FORWARDS,keyDownMap);var panBackwards=cameraControl._isKeyDownForAction(cameraControl.PAN_BACKWARDS,keyDownMap);var panLeft=cameraControl._isKeyDownForAction(cameraControl.PAN_LEFT,keyDownMap);var panRight=cameraControl._isKeyDownForAction(cameraControl.PAN_RIGHT,keyDownMap);var panUp=cameraControl._isKeyDownForAction(cameraControl.PAN_UP,keyDownMap);var panDown=cameraControl._isKeyDownForAction(cameraControl.PAN_DOWN,keyDownMap);// const panDelta = (keyDownMap[input.KEY_ALT] ? 0.3 : 1.0) * elapsedSecs * configs.keyboardPanRate; // ALT for slower pan rate
 var panDelta=_this125._movespeed*elapsedSecs*configs.keyboardPanRate;// ALT for slower pan rate
-if(panForwards||panBackwards||panLeft||panRight||panUp||panDown){if(!configs.firstPerson&&configs.followPointer){controllers.pivotController.startPivot();}if(panDown){updates.panDeltaY+=panDelta;}else if(panUp){updates.panDeltaY+=-panDelta;}if(panRight){updates.panDeltaX+=-panDelta;}else if(panLeft){updates.panDeltaX+=panDelta;}if(panBackwards){updates.panDeltaZ+=panDelta;}else if(panForwards){updates.panDeltaZ+=-panDelta;}}});}return _createClass(KeyboardPanRotateDollyHandler,[{key:"movespeed",get:function get(){return this._movespeed;},set:function set(value){this._movespeed=value;}},{key:"speedUp",value:function speedUp(){if(this._movespeed<=2.5){if(this._movespeed==0.2){this._movespeed+=0.3;}else if(this._movespeed==0.5||this._movespeed==1||this._movespeed==1.5||this._movespeed==2){this._movespeed+=0.5;}else if(this._movespeed==2.5){this._movespeed+=1.5;}}else{this._movespeed=4;}this._cameraControl.fire("personModeSpeedUp",this._movespeed);}},{key:"speedDown",value:function speedDown(){if(this._movespeed==4){this._movespeed-=1.5;}if(this._movespeed==1||this._movespeed==1.5||this._movespeed==2||this._movespeed==2.5){this._movespeed-=0.5;}else{this._movespeed=0.2;}this._cameraControl.fire("personModeSpeedDown",this._movespeed);}},{key:"reset",value:function reset(){}},{key:"destroy",value:function destroy(){this._scene.off(this._onTick);this.input.off(this._onSceneMouseMove);this.input.off(this._onSceneKeyDown);this.input.off(this._onSceneKeyUp);}}]);}();var SCALE_DOLLY_EACH_FRAME=1;// Recalculate dolly speed for eye->target distance on each Nth frame
+if(panForwards||panBackwards||panLeft||panRight||panUp||panDown){if(!configs.firstPerson&&configs.followPointer){controllers.pivotController.startPivot();}if(panDown){updates.panDeltaY+=panDelta;}else if(panUp){updates.panDeltaY+=-panDelta;}if(panRight){updates.panDeltaX+=-panDelta;}else if(panLeft){updates.panDeltaX+=panDelta;}if(panBackwards){updates.panDeltaZ+=panDelta;}else if(panForwards){updates.panDeltaZ+=-panDelta;}}});}return _createClass(KeyboardPanRotateDollyHandler,[{key:"movespeed",get:function get(){return this._movespeed;},set:function set(value){this._movespeed=value;}},{key:"speedUp",value:function speedUp(){if(this._movespeed<=2.5){if(this._movespeed==0.2){this._movespeed+=0.3;}else if(this._movespeed==0.5||this._movespeed==1||this._movespeed==1.5||this._movespeed==2){this._movespeed+=0.5;}else if(this._movespeed==2.5){this._movespeed+=1.5;}else if(this._movespee==4){this._movespeed+=4;}}else{this._movespeed=8;}this._cameraControl.fire("personModeSpeedUp",this._movespeed);}},{key:"speedDown",value:function speedDown(){if(this._movespeed==8){this._movespeed-=4;}else if(this._movespeed==4){this._movespeed-=1.5;}else if(this._movespeed==1||this._movespeed==1.5||this._movespeed==2||this._movespeed==2.5){this._movespeed-=0.5;}else{this._movespeed=0.2;}this._cameraControl.fire("personModeSpeedDown",this._movespeed);}},{key:"reset",value:function reset(){}},{key:"destroy",value:function destroy(){this._scene.off(this._onTick);this.input.off(this._onSceneMouseMove);this.input.off(this._onSceneKeyDown);this.input.off(this._onSceneKeyUp);}}]);}();var SCALE_DOLLY_EACH_FRAME=1;// Recalculate dolly speed for eye->target distance on each Nth frame
 var EPSILON=0.001;var tempVec3=math.vec3();/**
  * Handles camera updates on each "tick" that were scheduled by the various controllers.
  *
@@ -76245,12 +76248,16 @@ class MeasureTool extends _Controller__WEBPACK_IMPORTED_MODULE_0__["default"] {
     }
     _initEventHandle() {
         this.eventTrigger.on("clickAngleMeasure", () => {
+            if (!this._active)
+                return;
             if (!this.getActiveByType("angle")) {
                 this.setActiveByType("angle", true);
                 this.measureDistanceTool.refreshMouseState();
             }
         });
         this.eventTrigger.on("clickDistanceMeasure", () => {
+            if (!this._active)
+                return;
             if (!this.getActiveByType("distance")) {
                 this.setActiveByType("distance", true);
                 this.measureAngleTool.refreshMouseState();

package/dist/version.d.ts

@@ -1,2 +1,2 @@
 
-export const VERSION = "0.1.18";
+export const VERSION = "0.1.20";

package/dist/version.js

@@ -1,2 +1,2 @@
 
-export const VERSION = "0.1.18";
+export const VERSION = "0.1.20";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtctwins/tctwins-bimx-viewer",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "private": false,
   "description": "BIM viewer built on xtctwins",
   "main": "./dist/tctwins-bimx-viewer.min.es.js",