@xtctwins/tctwins-core 1.0.29 → 1.0.30

package/dist/tctwins-core.es.js

@@ -11435,6 +11435,7 @@ class AngleMeasurement extends Component {
 			this._needUpdate();
 		});
 
+		this.precision = cfg.precision !== undefined ? cfg.precision : 2;
 		this.approximate = cfg.approximate;
 		this.visible = cfg.visible;
 
@@ -11571,12 +11572,12 @@ class AngleMeasurement extends Component {
 				math.normalizeVec3(targetVec);
 				const angle = Math.abs(math.angleVec3(originVec, targetVec));
 				this._angle = angle / math.DEGTORAD;
-				this._angleLabel.setText(tilde + this._angle.toFixed(2) + "°");
+				this._angleLabel.setText(tilde + this._angle.toFixed(this._precision) + "°");
 			} else {
 				this._angleLabel.setText("");
 			}
 
-			// this._angleLabel.setText((Math.abs(math.lenVec3(math.subVec3(this._targetWorld, this._originWorld, distVec3)) * scale).toFixed(2)) + unitAbbrev);
+			// this._angleLabel.setText((Math.abs(math.lenVec3(math.subVec3(this._targetWorld, this._originWorld, distVec3)) * scale).toFixed(this._precision)) + unitAbbrev);
 
 			this._originDot.setVisible(this._visible && this._originVisible);
 			this._cornerDot.setVisible(this._visible && this._cornerVisible);
@@ -11630,6 +11631,23 @@ class AngleMeasurement extends Component {
 		return this._approximate;
 	}
 
+	/**
+	 * 设置精度
+	 * @param {number} precision
+	 */
+	set precision(precision) {
+		if (this._precision === precision) {
+			return;
+		}
+		this._precision = precision;
+		this._cpDirty = true;
+		this._needUpdate(0);
+	}
+
+	get precision() {
+		return this._precision;
+	}
+
 	/**
 	 * Gets the origin {@link Marker}.
 	 *
@@ -12246,11 +12264,16 @@ s	 * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-spa
 		angleMeasurementsPlugin.on("mouseLeave", (e) => {
 			hover = false;
 		});
+
+		angleMeasurementsPlugin.on("measureDelete", (e) => {
+			hover = false;
+		});
+
 		const scene = this.scene;
 		scene.input;
 		const canvas = scene.canvas.canvas;
 		const clickTolerance = 20;
-		const cameraControl = this.angleMeasurementsPlugin.viewer.cameraControl;
+		const cameraControl = angleMeasurementsPlugin.viewer.cameraControl;
 		const pointerLens = this.pointerLens;
 		let mouseHovering = false;
 		let hoveredEntity = null;
@@ -12350,7 +12373,7 @@ s	 * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-spa
 				switch (this._mouseState) {
 					case MOUSE_FINDING_ORIGIN:
 						if (mouseHovering) {
-							this._currentAngleMeasurement = this.angleMeasurementsPlugin.createMeasurement({
+							this._currentAngleMeasurement = angleMeasurementsPlugin.createMeasurement({
 								id: math.createUUID(),
 								origin: {
 									worldPos: mouseWorldPos
@@ -12361,6 +12384,7 @@ s	 * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-spa
 								target: {
 									worldPos: mouseWorldPos
 								},
+								precision: angleMeasurementsPlugin.precision,
 								approximate: true
 							});
 							this._currentAngleMeasurement.clickable = false;
@@ -12372,7 +12396,7 @@ s	 * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-spa
 							this._currentAngleMeasurement.angleVisible = false;
 							this._currentAngleMeasurement.origin.entity = hoveredEntity;
 							this._mouseState = MOUSE_FINDING_CORNER;
-							this.angleMeasurementsPlugin.fire("measurementStart", this._currentAngleMeasurement);
+							angleMeasurementsPlugin.fire("measurementStart", this._currentAngleMeasurement);
 						}
 						break;
 					case MOUSE_FINDING_CORNER:
@@ -12388,7 +12412,7 @@ s	 * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-spa
 								this._currentAngleMeasurement = null;
 								hoveredEntity = null;
 								this._mouseState = MOUSE_FINDING_ORIGIN;
-								this.angleMeasurementsPlugin.fire("measurementCancel", this._currentAngleMeasurement);
+								angleMeasurementsPlugin.fire("measurementCancel", this._currentAngleMeasurement);
 							}
 						}
 						break;
@@ -12399,7 +12423,7 @@ s	 * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-spa
 							this._currentAngleMeasurement.target.entity = hoveredEntity;
 							this._currentAngleMeasurement.clickable = true;
 							hoveredEntity = null;
-							this.angleMeasurementsPlugin.fire("measurementEnd", this._currentAngleMeasurement);
+							angleMeasurementsPlugin.fire("measurementEnd", this._currentAngleMeasurement);
 							this._currentAngleMeasurement = null;
 							this._mouseState = MOUSE_FINDING_ORIGIN;
 						} else {
@@ -12408,7 +12432,7 @@ s	 * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-spa
 								this._currentAngleMeasurement = null;
 								hoveredEntity = null;
 								this._mouseState = MOUSE_FINDING_ORIGIN;
-								this.angleMeasurementsPlugin.fire("measurementCancel", this._currentAngleMeasurement);
+								angleMeasurementsPlugin.fire("measurementCancel", this._currentAngleMeasurement);
 							}
 						}
 						break;
@@ -12775,6 +12799,8 @@ class AngleMeasurementsPlugin extends Plugin {
 		this.defaultLabelsVisible = cfg.defaultLabelsVisible !== false;
 		this.zIndex = cfg.zIndex || 10000;
 
+		this.precision = cfg.precision !== undefined ? cfg.precision : 2;
+
 		this._onMouseOver = (event, measurement) => {
 			this.fire("mouseOver", {
 				plugin: this,
@@ -12821,6 +12847,28 @@ class AngleMeasurementsPlugin extends Plugin {
 		};
 	}
 
+	/**
+	 * 设置精度
+	 * @param {number} precision
+	 */
+	set precision(precision) {
+		if (this._precision == precision) return;
+		this._precision = precision;
+		if (this.measureNum > 0) {
+			for (let id in this.measurements) {
+				this.measurements[id].precision = precision;
+			}
+		}
+	}
+
+	get precision() {
+		return this._precision;
+	}
+
+	get measureNum() {
+		return Object.keys(this.measurements).length;
+	}
+
 	/**
 	 * Gets the plugin's HTML container element, if any.
 	 * @returns {*|HTMLElement|HTMLElement}
@@ -12909,7 +12957,9 @@ class AngleMeasurementsPlugin extends Plugin {
 			onMouseLeave: this._onMouseLeave,
 			onMouseClick: this._onMouseClick,
 			onTouchStart: this._onTouchStart,
-			onContextMenu: this._onContextMenu
+			onContextMenu: this._onContextMenu,
+
+			precision: this._precision
 		});
 		this._measurements[measurement.id] = measurement;
 		measurement.on("destroyed", () => {
@@ -13402,7 +13452,8 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
 									target: {
 										worldPos: snapPickResult.worldPos,
 										entity: snapPickResult.entity
-									}
+									},
+									precision: plugin.precision
 								});
 								this._currentAngleMeasurement.clickable = false;
 								this._currentAngleMeasurement.originVisible = true;
@@ -13415,7 +13466,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
 							} else {
 								this._currentAngleMeasurement.origin.worldPos = pointerWorldPos;
 							}
-							this.angleMeasurementsPlugin.fire("measurementStart", this._currentAngleMeasurement);
+							plugin.fire("measurementStart", this._currentAngleMeasurement);
 							// if (this.pointerLens) {
 							//     this.pointerLens.cursorPos = pickResult.canvasPos;
 							//     this.pointerLens.snapped = false;
@@ -13597,7 +13648,7 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
 										this._currentAngleMeasurement.targetVisible = true;
 										this._currentAngleMeasurement.targetWireVisible = true;
 										this._currentAngleMeasurement.angleVisible = true;
-										this.angleMeasurementsPlugin.fire("measurementStart", this._currentAngleMeasurement);
+										plugin.fire("measurementStart", this._currentAngleMeasurement);
 									} else {
 										if (this.pointerLens) {
 											this.pointerLens.cursorPos = null;
@@ -13871,7 +13922,8 @@ class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
 									},
 									target: {
 										worldPos: pickResult.worldPos
-									}
+									},
+									precision: plugin.precision
 								});
 								// this._currentAngleMeasurement.clickable = false;
 								this._currentAngleMeasurement.originVisible = true;
@@ -86206,7 +86258,9 @@ class DistanceMeasurement extends Component {
 			this._needUpdate();
 		});
 
-		this.approximate = cfg.approximate;
+		this.precision = cfg.precision !== undefined ? cfg.precision : 2;
+		this.approximate = cfg.approximate !== undefined ? cfg.approximate : true;
+
 		this.visible = cfg.visible;
 		this.originVisible = cfg.originVisible;
 		this.targetVisible = cfg.targetVisible;
@@ -86376,7 +86430,7 @@ class DistanceMeasurement extends Component {
 				const tilde = this._approximate ? "  " : " = ";
 
 				this._length = Math.abs(math.lenVec3(math.subVec3(this._targetWorld, this._originWorld, distVec3)));
-				this._lengthLabel.setText(tilde + (this._length * scale).toFixed(2) + unitAbbrev);
+				this._lengthLabel.setText(tilde + (this._length * scale).toFixed(this._precision) + unitAbbrev);
 
 				const xAxisCanvasLength = Math.abs(lengthWire(cp[0], cp[1], cp[2], cp[3]));
 				const yAxisCanvasLength = Math.abs(lengthWire(cp[2], cp[3], cp[4], cp[5]));
@@ -86396,7 +86450,9 @@ class DistanceMeasurement extends Component {
 
 				if (!this._xAxisLabelCulled) {
 					this._xAxisLabel.setText(
-						tilde + Math.abs((this._targetWorld[0] - this._originWorld[0]) * scale).toFixed(2) + unitAbbrev
+						tilde +
+							Math.abs((this._targetWorld[0] - this._originWorld[0]) * scale).toFixed(this._precision) +
+							unitAbbrev
 					);
 					this._xAxisLabel.setCulled(!this.axisVisible);
 				} else {
@@ -86405,7 +86461,9 @@ class DistanceMeasurement extends Component {
 
 				if (!this._yAxisLabelCulled) {
 					this._yAxisLabel.setText(
-						tilde + Math.abs((this._targetWorld[1] - this._originWorld[1]) * scale).toFixed(2) + unitAbbrev
+						tilde +
+							Math.abs((this._targetWorld[1] - this._originWorld[1]) * scale).toFixed(this._precision) +
+							unitAbbrev
 					);
 					this._yAxisLabel.setCulled(!this.axisVisible);
 				} else {
@@ -86414,7 +86472,9 @@ class DistanceMeasurement extends Component {
 
 				if (!this._zAxisLabelCulled) {
 					this._zAxisLabel.setText(
-						tilde + Math.abs((this._targetWorld[2] - this._originWorld[2]) * scale).toFixed(2) + unitAbbrev
+						tilde +
+							Math.abs((this._targetWorld[2] - this._originWorld[2]) * scale).toFixed(this._precision) +
+							unitAbbrev
 					);
 					this._zAxisLabel.setCulled(!this.axisVisible);
 				} else {
@@ -86480,6 +86540,23 @@ class DistanceMeasurement extends Component {
 		return this._approximate;
 	}
 
+	/**
+	 * 设置精度
+	 * @param {number} precision
+	 */
+	set precision(precision) {
+		if (this._precision === precision) {
+			return;
+		}
+		this._precision = precision;
+		this._cpDirty = true;
+		this._needUpdate(0);
+	}
+
+	get precision() {
+		return this._precision;
+	}
+
 	/**
 	 * Gets the origin {@link Marker}.
 	 *
@@ -87208,6 +87285,10 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
 		distanceMeasurementsPlugin.on("mouseLeave", (e) => {
 			hover = false;
 		});
+
+		distanceMeasurementsPlugin.on("measureDelete", (e) => {
+			hover = false;
+		});
 		const scene = this.scene;
 		const cameraControl = distanceMeasurementsPlugin.viewer.cameraControl;
 		const canvas = scene.canvas.canvas;
@@ -87335,6 +87416,7 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
 							target: {
 								worldPos: pointerWorldPos.slice()
 							},
+							precision: distanceMeasurementsPlugin.precision,
 							approximate: true
 						});
 						this._currentDistanceMeasurementInitState.axisVisible =
@@ -87745,9 +87827,11 @@ class DistanceMeasurementsPlugin extends Plugin {
 		this.defaultXAxisVisible = cfg.defaultXAxisVisible !== false;
 		this.defaultYAxisVisible = cfg.defaultYAxisVisible !== false;
 		this.defaultZAxisVisible = cfg.defaultZAxisVisible !== false;
+		this.defaultLabelsOnWires = cfg.defaultLabelsOnWires !== false;
 		this.defaultColor = cfg.defaultColor !== undefined ? cfg.defaultColor : "#0065fc";
 		this.zIndex = cfg.zIndex || 10000;
-		this.defaultLabelsOnWires = cfg.defaultLabelsOnWires !== false;
+
+		this.precision = cfg.precision !== undefined ? cfg.precision : 2;
 
 		this._onMouseOver = (event, measurement) => {
 			this.fire("mouseOver", {
@@ -87794,6 +87878,46 @@ class DistanceMeasurementsPlugin extends Plugin {
 		};
 	}
 
+	/**
+	 * 设置精度
+	 * @param {number} precision
+	 */
+	set precision(precision) {
+		if (this._precision == precision) return;
+		this._precision = precision;
+		if (this.measureNum > 0) {
+			for (let id in this.measurements) {
+				this.measurements[id].precision = precision;
+			}
+		}
+	}
+
+	get precision() {
+		return this._precision;
+	}
+
+	/**
+	 * 设置比例
+	 * @param {number} scale
+	 */
+	set scale(scale) {
+		if (this._scale == scale) return;
+		this._scale = scale;
+		if (this.measureNum > 0) {
+			for (let id in this.measurements) {
+				this.measurements[id].scale = scale;
+			}
+		}
+	}
+
+	get scale() {
+		return this._scale;
+	}
+
+	get measureNum() {
+		return Object.keys(this.measurements).length;
+	}
+
 	/**
 	 * Gets the plugin's HTML container element, if any.
 	 * @returns {*|HTMLElement|HTMLElement}
@@ -87911,21 +88035,23 @@ class DistanceMeasurementsPlugin extends Plugin {
 			color: params.color,
 
 			visible: params.visible,
+			originVisible: params.originVisible,
+			targetVisible: params.targetVisible,
 			wireVisible: params.wireVisible,
 			axisVisible: params.axisVisible !== false && this.defaultAxisVisible !== false,
 			xAxisVisible: params.xAxisVisible !== false && this.defaultXAxisVisible !== false,
 			yAxisVisible: params.yAxisVisible !== false && this.defaultYAxisVisible !== false,
 			zAxisVisible: params.zAxisVisible !== false && this.defaultZAxisVisible !== false,
 			labelsVisible: params.labelsVisible !== false && this.defaultLabelsVisible !== false,
-			originVisible: params.originVisible,
-			targetVisible: params.targetVisible,
 
 			labelsOnWires: params.labelsOnWires !== false && this.defaultLabelsOnWires !== false,
 			onMouseOver: this._onMouseOver,
 			onMouseLeave: this._onMouseLeave,
 			onMouseClick: this._onMouseClick,
 			onTouchStart: this._onTouchStart,
-			onContextMenu: this._onContextMenu
+			onContextMenu: this._onContextMenu,
+
+			precision: this._precision
 		});
 		this._measurements[measurement.id] = measurement;
 		measurement.on("destroyed", () => {
@@ -88305,7 +88431,8 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
 									target: {
 										worldPos: pointerWorldPos,
 										entity: snapPickResult.entity
-									}
+									},
+									precision: plugin.precision
 								});
 								this._currentDistanceMeasurement.labelsVisible = false;
 								this._currentDistanceMeasurement.xAxisVisible = false;
@@ -88487,7 +88614,8 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
 									target: {
 										worldPos: snapPickResult.worldPos,
 										entity: snapPickResult.entity
-									}
+									},
+									precision: plugin.precision
 								});
 								this._currentDistanceMeasurement.labelsVisible = false;
 								this._currentDistanceMeasurement.xAxisVisible = false;
@@ -88523,7 +88651,8 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
 										target: {
 											worldPos: pickResult.worldPos,
 											entity: pickResult.entity
-										}
+										},
+										precision: plugin.precision
 									});
 									this._currentDistanceMeasurement.labelsVisible = false;
 									this._currentDistanceMeasurement.xAxisVisible = false;
@@ -88662,7 +88791,8 @@ class DistanceMeasurementsTouchControl extends DistanceMeasurementsControl {
 									target: {
 										worldPos: pickResult.worldPos,
 										entity: pickResult.entity
-									}
+									},
+									precision: plugin.precision
 								});
 								this._currentDistanceMeasurement.labelsVisible = false;
 								this._currentDistanceMeasurement.xAxisVisible = false;
@@ -120185,71 +120315,71 @@ class Control {
 			//
 			//----------------------------------------------------------------------------------------------------------
 
-			zCurve: rootNode.addChild(
-				new Mesh(rootNode, {
-					// Blue hoop about Z-axis
-					geometry: shapes.curve,
-					material: materials.blue,
-					matrix: math.rotationMat4v(180 * math.DEGTORAD, [1, 0, 0], math.identityMat4()),
-					pickable: false,
-					collidable: true,
-					clippable: false,
-					visible: false,
-					isObject: false
-				}),
-				NO_STATE_INHERIT
-			),
+			// zCurve: rootNode.addChild(
+			// 	new Mesh(rootNode, {
+			// 		// Blue hoop about Z-axis
+			// 		geometry: shapes.curve,
+			// 		material: materials.blue,
+			// 		matrix: math.rotationMat4v(180 * math.DEGTORAD, [1, 0, 0], math.identityMat4()),
+			// 		pickable: false,
+			// 		collidable: true,
+			// 		clippable: false,
+			// 		visible: false,
+			// 		isObject: false
+			// 	}),
+			// 	NO_STATE_INHERIT
+			// ),
 
-			zCurveHandle: rootNode.addChild(
-				new Mesh(rootNode, {
-					geometry: shapes.curveHandle,
-					material: materials.pickable,
-					matrix: math.rotationMat4v(180 * math.DEGTORAD, [1, 0, 0], math.identityMat4()),
-					pickable: true,
-					collidable: true,
-					clippable: false,
-					visible: false,
-					isObject: false
-				}),
-				NO_STATE_INHERIT
-			),
+			// zCurveHandle: rootNode.addChild(
+			// 	new Mesh(rootNode, {
+			// 		geometry: shapes.curveHandle,
+			// 		material: materials.pickable,
+			// 		matrix: math.rotationMat4v(180 * math.DEGTORAD, [1, 0, 0], math.identityMat4()),
+			// 		pickable: true,
+			// 		collidable: true,
+			// 		clippable: false,
+			// 		visible: false,
+			// 		isObject: false
+			// 	}),
+			// 	NO_STATE_INHERIT
+			// ),
 
-			zCurveCurveArrow1: rootNode.addChild(
-				new Mesh(rootNode, {
-					geometry: shapes.arrowHead,
-					material: materials.blue,
-					matrix: (function () {
-						const translate = math.translateMat4c(0.8, -0.07, 0, math.identityMat4());
-						const scale = math.scaleMat4v([0.6, 0.6, 0.6], math.identityMat4());
-						return math.mulMat4(translate, scale, math.identityMat4());
-					})(),
-					pickable: true,
-					collidable: true,
-					clippable: false,
-					visible: false,
-					isObject: false
-				}),
-				NO_STATE_INHERIT
-			),
+			// zCurveCurveArrow1: rootNode.addChild(
+			// 	new Mesh(rootNode, {
+			// 		geometry: shapes.arrowHead,
+			// 		material: materials.blue,
+			// 		matrix: (function () {
+			// 			const translate = math.translateMat4c(0.8, -0.07, 0, math.identityMat4());
+			// 			const scale = math.scaleMat4v([0.6, 0.6, 0.6], math.identityMat4());
+			// 			return math.mulMat4(translate, scale, math.identityMat4());
+			// 		})(),
+			// 		pickable: true,
+			// 		collidable: true,
+			// 		clippable: false,
+			// 		visible: false,
+			// 		isObject: false
+			// 	}),
+			// 	NO_STATE_INHERIT
+			// ),
 
-			zCurveArrow2: rootNode.addChild(
-				new Mesh(rootNode, {
-					geometry: shapes.arrowHead,
-					material: materials.blue,
-					matrix: (function () {
-						const translate = math.translateMat4c(0.05, -0.8, 0, math.identityMat4());
-						const scale = math.scaleMat4v([0.6, 0.6, 0.6], math.identityMat4());
-						const rotate = math.rotationMat4v(90 * math.DEGTORAD, [0, 0, 1], math.identityMat4());
-						return math.mulMat4(math.mulMat4(translate, scale, math.identityMat4()), rotate, math.identityMat4());
-					})(),
-					pickable: true,
-					collidable: true,
-					clippable: false,
-					visible: false,
-					isObject: false
-				}),
-				NO_STATE_INHERIT
-			),
+			// zCurveArrow2: rootNode.addChild(
+			// 	new Mesh(rootNode, {
+			// 		geometry: shapes.arrowHead,
+			// 		material: materials.blue,
+			// 		matrix: (function () {
+			// 			const translate = math.translateMat4c(0.05, -0.8, 0, math.identityMat4());
+			// 			const scale = math.scaleMat4v([0.6, 0.6, 0.6], math.identityMat4());
+			// 			const rotate = math.rotationMat4v(90 * math.DEGTORAD, [0, 0, 1], math.identityMat4());
+			// 			return math.mulMat4(math.mulMat4(translate, scale, math.identityMat4()), rotate, math.identityMat4());
+			// 		})(),
+			// 		pickable: true,
+			// 		collidable: true,
+			// 		clippable: false,
+			// 		visible: false,
+			// 		isObject: false
+			// 	}),
+			// 	NO_STATE_INHERIT
+			// ),
 
 			//----------------------------------------------------------------------------------------------------------
 			//
@@ -120939,10 +121069,10 @@ class Control {
 						nextDragAction = DRAG_ACTIONS.yRotate;
 						break;
 
-					case this._displayMeshes.zCurveHandle.id:
-						affordanceMesh = this._affordanceMeshes.zHoop;
-						nextDragAction = DRAG_ACTIONS.zRotate;
-						break;
+					// case this._displayMeshes.zCurveHandle.id:
+					// 	affordanceMesh = this._affordanceMeshes.zHoop;
+					// 	nextDragAction = DRAG_ACTIONS.zRotate;
+					// 	break;
 
 					default:
 						nextDragAction = DRAG_ACTIONS.none;
@@ -121103,10 +121233,10 @@ class Control {
 						nextDragAction = DRAG_ACTIONS.yRotate;
 						break;
 
-					case this._displayMeshes.zCurveHandle.id:
-						affordanceMesh = this._affordanceMeshes.zHoop;
-						nextDragAction = DRAG_ACTIONS.zRotate;
-						break;
+					// case this._displayMeshes.zCurveHandle.id:
+					// 	affordanceMesh = this._affordanceMeshes.zHoop;
+					// 	nextDragAction = DRAG_ACTIONS.zRotate;
+					// 	break;
 
 					default:
 						nextDragAction = DRAG_ACTIONS.none;