fl-web-component 1.3.11 → 1.3.13

package/packages/components/com-graphics/index.vue

@@ -1288,6 +1288,8 @@
             threeMeasure.start();
             break;
         }
+        // 添加键盘事件监听器
+        document.addEventListener('keydown', this.handleMeasureKeyDown, false);
       },
       // 关闭测量
       closeMeasure() {
@@ -1297,6 +1299,21 @@
           threeMeasure = null;
           // this.timeRender()
         }
+        // 移除键盘事件监听器
+        document.removeEventListener('keydown', this.handleMeasureKeyDown, false);
+      },
+      handleMeasureKeyDown(event) {
+        // 检查是否按下了ESC键
+        const keyParam = {
+          desc: event.key,
+          keyCode: event.keyCode,
+          event,
+        };
+        if (event.keyCode === 27) {
+          // ESC键的键码是27
+          this.closeMeasure();
+        }
+        this.$emit('keyDown', keyParam);
       },
       // 开启平移
       /*

package/patches/camera-controls+2.9.0.patch

@@ -1,63 +1,63 @@
-diff --git a/node_modules/camera-controls/dist/camera-controls.module.js b/node_modules/camera-controls/dist/camera-controls.module.js
-index 08a8fd6..76089cb 100644
---- a/node_modules/camera-controls/dist/camera-controls.module.js
-+++ b/node_modules/camera-controls/dist/camera-controls.module.js
-@@ -1395,7 +1395,7 @@ class CameraControls extends EventDispatcher {
-      * @category Methods
-      */
-     dolly(distance, enableTransition = false) {
--        return this.dollyTo(this._sphericalEnd.radius - distance, enableTransition);
-+        return this.dollyTo(this._sphericalEnd.radius - distance, this.minDistance, enableTransition);
-     }
-     /**
-      * Dolly in/out camera position to given distance.
-@@ -1403,11 +1403,11 @@ class CameraControls extends EventDispatcher {
-      * @param enableTransition Whether to move smoothly or immediately.
-      * @category Methods
-      */
--    dollyTo(distance, enableTransition = false) {
-+    dollyTo(distance, minDistance, enableTransition = false) {
-         this._isUserControllingDolly = false;
-         this._lastDollyDirection = DOLLY_DIRECTION.NONE;
-         this._changedDolly = 0;
--        return this._dollyToNoClamp(clamp(distance, this.minDistance, this.maxDistance), enableTransition);
-+        return this._dollyToNoClamp(clamp(distance, minDistance, this.maxDistance), enableTransition);
-     }
-     _dollyToNoClamp(distance, enableTransition = false) {
-         const lastRadius = this._sphericalEnd.radius;
-@@ -1635,7 +1635,7 @@ class CameraControls extends EventDispatcher {
-         if (isPerspectiveCamera(this._camera)) {
-             const distance = this.getDistanceToFitBox(bbSize.x, bbSize.y, bbSize.z, cover);
-             promises.push(this.moveTo(center.x, center.y, center.z, enableTransition));
--            promises.push(this.dollyTo(distance, enableTransition));
-+            promises.push(this.dollyTo(distance, this.minDistance, enableTransition));
-             promises.push(this.setFocalOffset(0, 0, 0, enableTransition));
-         }
-         else if (isOrthographicCamera(this._camera)) {
-@@ -1664,7 +1664,7 @@ class CameraControls extends EventDispatcher {
-         promises.push(this.moveTo(boundingSphere.center.x, boundingSphere.center.y, boundingSphere.center.z, enableTransition));
-         if (isPerspectiveCamera(this._camera)) {
-             const distanceToFit = this.getDistanceToFitSphere(boundingSphere.radius);
--            promises.push(this.dollyTo(distanceToFit, enableTransition));
-+            promises.push(this.dollyTo(distanceToFit, this.minDistance, enableTransition));
-         }
-         else if (isOrthographicCamera(this._camera)) {
-             const width = this._camera.right - this._camera.left;
-@@ -1831,7 +1831,7 @@ class CameraControls extends EventDispatcher {
-         _zColumn.multiplyScalar(cameraToPoint.z);
-         _v3A.copy(_xColumn).add(_yColumn).add(_zColumn);
-         _v3A.z = _v3A.z + distance;
--        this.dollyTo(distance, false);
-+        this.dollyTo(distance, Number.EPSILON, false);
-         this.setFocalOffset(-_v3A.x, _v3A.y, -_v3A.z, false);
-         this.moveTo(targetX, targetY, targetZ, false);
-     }
-@@ -2283,7 +2283,7 @@ class CameraControls extends EventDispatcher {
-         this.moveTo(obj.target[0], obj.target[1], obj.target[2], enableTransition);
-         _sphericalA.setFromVector3(_v3A.fromArray(obj.position).sub(this._targetEnd).applyQuaternion(this._yAxisUpSpace));
-         this.rotateTo(_sphericalA.theta, _sphericalA.phi, enableTransition);
--        this.dollyTo(_sphericalA.radius, enableTransition);
-+        this.dollyTo(_sphericalA.radius, this.minDistance, enableTransition);
-         this.zoomTo(obj.zoom, enableTransition);
-         this.setFocalOffset(obj.focalOffset[0], obj.focalOffset[1], obj.focalOffset[2], enableTransition);
-         this._needsUpdate = true;
+diff --git a/node_modules/camera-controls/dist/camera-controls.module.js b/node_modules/camera-controls/dist/camera-controls.module.js
+index 08a8fd6..76089cb 100644
+--- a/node_modules/camera-controls/dist/camera-controls.module.js
++++ b/node_modules/camera-controls/dist/camera-controls.module.js
+@@ -1395,7 +1395,7 @@ class CameraControls extends EventDispatcher {
+      * @category Methods
+      */
+     dolly(distance, enableTransition = false) {
+-        return this.dollyTo(this._sphericalEnd.radius - distance, enableTransition);
++        return this.dollyTo(this._sphericalEnd.radius - distance, this.minDistance, enableTransition);
+     }
+     /**
+      * Dolly in/out camera position to given distance.
+@@ -1403,11 +1403,11 @@ class CameraControls extends EventDispatcher {
+      * @param enableTransition Whether to move smoothly or immediately.
+      * @category Methods
+      */
+-    dollyTo(distance, enableTransition = false) {
++    dollyTo(distance, minDistance, enableTransition = false) {
+         this._isUserControllingDolly = false;
+         this._lastDollyDirection = DOLLY_DIRECTION.NONE;
+         this._changedDolly = 0;
+-        return this._dollyToNoClamp(clamp(distance, this.minDistance, this.maxDistance), enableTransition);
++        return this._dollyToNoClamp(clamp(distance, minDistance, this.maxDistance), enableTransition);
+     }
+     _dollyToNoClamp(distance, enableTransition = false) {
+         const lastRadius = this._sphericalEnd.radius;
+@@ -1635,7 +1635,7 @@ class CameraControls extends EventDispatcher {
+         if (isPerspectiveCamera(this._camera)) {
+             const distance = this.getDistanceToFitBox(bbSize.x, bbSize.y, bbSize.z, cover);
+             promises.push(this.moveTo(center.x, center.y, center.z, enableTransition));
+-            promises.push(this.dollyTo(distance, enableTransition));
++            promises.push(this.dollyTo(distance, this.minDistance, enableTransition));
+             promises.push(this.setFocalOffset(0, 0, 0, enableTransition));
+         }
+         else if (isOrthographicCamera(this._camera)) {
+@@ -1664,7 +1664,7 @@ class CameraControls extends EventDispatcher {
+         promises.push(this.moveTo(boundingSphere.center.x, boundingSphere.center.y, boundingSphere.center.z, enableTransition));
+         if (isPerspectiveCamera(this._camera)) {
+             const distanceToFit = this.getDistanceToFitSphere(boundingSphere.radius);
+-            promises.push(this.dollyTo(distanceToFit, enableTransition));
++            promises.push(this.dollyTo(distanceToFit, this.minDistance, enableTransition));
+         }
+         else if (isOrthographicCamera(this._camera)) {
+             const width = this._camera.right - this._camera.left;
+@@ -1831,7 +1831,7 @@ class CameraControls extends EventDispatcher {
+         _zColumn.multiplyScalar(cameraToPoint.z);
+         _v3A.copy(_xColumn).add(_yColumn).add(_zColumn);
+         _v3A.z = _v3A.z + distance;
+-        this.dollyTo(distance, false);
++        this.dollyTo(distance, Number.EPSILON, false);
+         this.setFocalOffset(-_v3A.x, _v3A.y, -_v3A.z, false);
+         this.moveTo(targetX, targetY, targetZ, false);
+     }
+@@ -2283,7 +2283,7 @@ class CameraControls extends EventDispatcher {
+         this.moveTo(obj.target[0], obj.target[1], obj.target[2], enableTransition);
+         _sphericalA.setFromVector3(_v3A.fromArray(obj.position).sub(this._targetEnd).applyQuaternion(this._yAxisUpSpace));
+         this.rotateTo(_sphericalA.theta, _sphericalA.phi, enableTransition);
+-        this.dollyTo(_sphericalA.radius, enableTransition);
++        this.dollyTo(_sphericalA.radius, this.minDistance, enableTransition);
+         this.zoomTo(obj.zoom, enableTransition);
+         this.setFocalOffset(obj.focalOffset[0], obj.focalOffset[1], obj.focalOffset[2], enableTransition);
+         this._needsUpdate = true;

package/src/utils/index.js

@@ -374,24 +374,6 @@ function miniDevtool() {
   if (document.readyState === 'loading') {
     document.addEventListener('DOMContentLoaded', createPanel);
   } else createPanel();
-
-  // 是否支持 WebGL
-  function hasWebGL() {
-    console.log('flversion', window.FLVersion)
-    console.log('userAgent:', navigator.userAgent);
-    console.log('has WebGLRenderingContext:', !!window.WebGLRenderingContext);
-    const c = document.createElement('canvas');
-
-    try {
-      const g1 = c.getContext('webgl');
-      const g2 = c.getContext('experimental-webgl');
-      const g3 = c.getContext('webgl2');
-      console.log('webgl contexts:', { g1: !!g1, g2: !!g2, g3: !!g3 });
-    } catch (e) {
-      console.error('getContext error', e);
-    }
-  }
-  console.log('===========hasWebGL=======', hasWebGL());
 }
 
 export { screenshot, miniDevtool };

package/src/utils/threejs/measure-angle.js

@@ -21,6 +21,9 @@ var MeasureAngle = function (renderer, scene, camera, width, height) {
   this.width = width;
   this.height = height;
   this.firstTime = 0;
+  // 创建一个辅助平面来捕获鼠标事件
+  this.plane = new THREE.Plane(new THREE.Vector3(0, 0, 1), 0);
+
   // this.POINT_MATERIAL = new THREE.PointsMaterial({ color: 0xff5000, size: 1, opacity: 0.6, transparent: true, depthWrite: false, depthTest: false })
   // this.LINE_MATERIAL = new THREE.LineBasicMaterial({ color: 0xff0000, linewidth: 3, opacity: 0.8, transparent: true, side: THREE.DoubleSide, depthWrite: false, depthTest: false })
 };
@@ -55,6 +58,12 @@ MeasureAngle.prototype = {
     if (intersects.length > 0) {
       return intersects[0].point;
     }
+    // 如果没有交点，则创建一个在相机视图平面上的点
+    const ray = new THREE.Ray();
+    _this.raycaster.ray.intersectPlane(_this.plane, ray.origin);
+    if (ray.origin) {
+      return ray.origin;
+    }
     return null;
   },
   createPoints(pos, config = { color: 0x009bea, size: 0.3 }) {

package/src/utils/threejs/measure-area.js

@@ -21,6 +21,9 @@ var MeasureArea = function (renderer, scene, camera, width, height) {
   this.width = width;
   this.height = height;
   this.firstTime = 0;
+
+  // 创建一个辅助平面来捕获鼠标事件
+  this.plane = new THREE.Plane(new THREE.Vector3(0, 0, 1), 0);
 };
 
 MeasureArea.prototype = {
@@ -53,6 +56,13 @@ MeasureArea.prototype = {
     if (intersects.length > 0) {
       return intersects[0].point;
     }
+
+    // 如果没有交点，则创建一个在相机视图平面上的点
+    const ray = new THREE.Ray();
+    _this.raycaster.ray.intersectPlane(_this.plane, ray.origin);
+    if (ray.origin) {
+      return ray.origin;
+    }
     return null;
   },
   createLine(p1, p2, config = { color: 0xff0000 }) {

package/src/utils/threejs/measure-distance.js

@@ -19,6 +19,9 @@ var MeasureDistance = function (renderer, scene, camera, width, height) {
   this.width = width;
   this.height = height;
   this.firstTime = 0;
+
+  // 创建一个辅助平面来捕获鼠标事件
+  this.plane = new THREE.Plane(new THREE.Vector3(0, 0, 1), 0);
 };
 
 MeasureDistance.prototype = {
@@ -51,6 +54,14 @@ MeasureDistance.prototype = {
     if (intersects.length > 0) {
       return intersects[0].point;
     }
+
+    // 如果没有交点，则创建一个在相机视图平面上的点
+    const ray = new THREE.Ray();
+    _this.raycaster.ray.intersectPlane(_this.plane, ray.origin);
+    if (ray.origin) {
+      return ray.origin;
+    }
+
     return null;
   },
   createLine(p1, p2, config = { color: 0xff0000 }) {