deeptwins-engine-3d 0.1.47 → 0.1.48

package/dist/esm/tool/utils.js

@@ -320,6 +320,41 @@ export function error(message) {
   console.error("[DeepTwinsEngine3d error]: ".concat(message));
 }
 
+/**
+ * 去除 Polygon ring 的闭合点（首尾重复）
+ */
+export function normalizeRing(ring) {
+  var _ring$slice;
+  if (!ring || ring.length < 3) return (_ring$slice = ring === null || ring === void 0 ? void 0 : ring.slice()) !== null && _ring$slice !== void 0 ? _ring$slice : [];
+  var first = ring[0];
+  var last = ring[ring.length - 1];
+  if (Cesium.Cartesian3.equals(first, last)) {
+    return ring.slice(0, -1);
+  }
+  return ring.slice();
+}
+
+/**
+ * 构建 Cesium 安全的 PolygonHierarchy
+ * 支持闭合 / 非闭合 / holes
+ */
+export function buildPolygonHierarchy(positions) {
+  var holes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var outer = normalizeRing(positions);
+  if (outer.length < 3) {
+    throw new Error('Polygon 外环至少需要 3 个不同的点');
+  }
+  var holeHierarchies = holes.map(function (h, i) {
+    var ring = normalizeRing(h);
+    if (ring.length < 3) {
+      console.warn("Polygon hole ".concat(i, " \u9876\u70B9\u4E0D\u8DB3\uFF0C\u5DF2\u5FFD\u7565"));
+      return null;
+    }
+    return new Cesium.PolygonHierarchy(ring);
+  }).filter(Boolean);
+  return new Cesium.PolygonHierarchy(outer, holeHierarchies);
+}
+
 /**
  * 沿多边形平面局部坐标系计算 ST
  * @param positions Cartesian3[] 多边形顶点
@@ -328,36 +363,56 @@ export function error(message) {
  */
 export function computeSTAlongPlane(positions) {
   var rotation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var n = positions.length;
-  var stValues = new Float32Array(n * 2);
-
-  // 1️⃣ 计算中心
-  var center = Cesium.BoundingSphere.fromPoints(positions).center;
-
-  // 2️⃣ 计算法线
-  var v1 = Cesium.Cartesian3.subtract(positions[1], positions[0], new Cesium.Cartesian3());
-  var v2 = Cesium.Cartesian3.subtract(positions[2], positions[0], new Cesium.Cartesian3());
-  var normal = Cesium.Cartesian3.cross(v1, v2, new Cesium.Cartesian3());
-  Cesium.Cartesian3.normalize(normal, normal);
-
-  // 3️⃣ 选择 tangent/bitangent
-  var ref = Math.abs(normal.z) > 0.9 ? Cesium.Cartesian3.UNIT_X : Cesium.Cartesian3.UNIT_Z;
-  var tangent = Cesium.Cartesian3.cross(ref, normal, new Cesium.Cartesian3());
-  Cesium.Cartesian3.normalize(tangent, tangent);
-  var bitangent = Cesium.Cartesian3.cross(normal, tangent, new Cesium.Cartesian3());
-  Cesium.Cartesian3.normalize(bitangent, bitangent);
-
-  // 4️⃣ 投影到局部平面，收集 min/max
+  // 1️⃣ 去闭合
+  var ring = buildPolygonHierarchy(positions).positions;
+  var count = ring.length;
+  var center = Cesium.BoundingSphere.fromPoints(ring).center;
+
+  // 2️⃣ 官方切平面（稳定）
+  var tangentPlane = new Cesium.EllipsoidTangentPlane(center, Cesium.Ellipsoid.WGS84);
+
+  // 3️⃣ 投影到 2D
+  var pts2D = ring.map(function (p) {
+    return tangentPlane.projectPointOntoPlane(p);
+  });
+
+  // 4️⃣ 计算 2D 中心
+  var cx = 0,
+    cy = 0;
+  pts2D.forEach(function (p) {
+    cx += p.x;
+    cy += p.y;
+  });
+  cx /= count;
+  cy /= count;
+
+  // 5️⃣ PCA 求主方向（S 轴）
+  var xx = 0,
+    xy = 0,
+    yy = 0;
+  pts2D.forEach(function (p) {
+    var dx = p.x - cx;
+    var dy = p.y - cy;
+    xx += dx * dx;
+    xy += dx * dy;
+    yy += dy * dy;
+  });
+  var theta = 0.5 * Math.atan2(2 * xy, xx - yy);
+  var cosT = Math.cos(theta + rotation);
+  var sinT = Math.sin(theta + rotation);
+
+  // 6️⃣ 投影到主轴坐标系
   var minS = Infinity,
     maxS = -Infinity,
     minT = Infinity,
     maxT = -Infinity;
-  var localST = [];
-  positions.forEach(function (p) {
-    var local = Cesium.Cartesian3.subtract(p, center, new Cesium.Cartesian3());
-    var s = Cesium.Cartesian3.dot(local, tangent);
-    var t = Cesium.Cartesian3.dot(local, bitangent);
-    localST.push({
+  var local = [];
+  pts2D.forEach(function (p) {
+    var dx = p.x - cx;
+    var dy = p.y - cy;
+    var s = dx * cosT + dy * sinT;
+    var t = -dx * sinT + dy * cosT;
+    local.push({
       s: s,
       t: t
     });
@@ -366,25 +421,16 @@ export function computeSTAlongPlane(positions) {
     minT = Math.min(minT, t);
     maxT = Math.max(maxT, t);
   });
-  var rangeS = maxS - minS || 1.0;
-  var rangeT = maxT - minT || 1.0;
-  var cosA = Math.cos(rotation);
-  var sinA = Math.sin(rotation);
-
-  // 5️⃣ 归一化并旋转
-  localST.forEach(function (pt, i) {
-    var s = (pt.s - minS) / rangeS;
-    var t = (pt.t - minT) / rangeT;
-
-    // 旋转 around center (0.5,0.5)
-    var s0 = s - 0.5;
-    var t0 = t - 0.5;
-    s = s0 * cosA - t0 * sinA + 0.5;
-    t = s0 * sinA + t0 * cosA + 0.5;
-    stValues[i * 2] = s;
-    stValues[i * 2 + 1] = t;
+  var rangeS = maxS - minS || 1;
+  var rangeT = maxT - minT || 1;
+
+  // 7️⃣ 归一化
+  var st = new Float32Array(count * 2);
+  local.forEach(function (p, i) {
+    st[i * 2] = (p.s - minS) / rangeS;
+    st[i * 2 + 1] = (p.t - minT) / rangeT;
   });
-  return stValues;
+  return st;
 }
 
 // 计算两点的中心点

package/dist/esm/videoFusion/VideoProject.js

@@ -71,7 +71,7 @@ var VideoProject = /*#__PURE__*/function (_BaseVideo) {
         _this2.type = type;
         _this2.frustum = frustum;
         // 取后4个点
-        var points = _this2.frustum.getFrustumVertexPoints().slice(-4);
+        var points = _this2.frustum.getFarPlane();
         if (_this2.type === 'projection') {
           // 交点数组
           var interPoints = [];

package/dist/esm/visualization/Frustum.d.ts

@@ -1,5 +1,30 @@
-import BaseFrustum from './BaseFrustum';
-export default class Frustum extends BaseFrustum {
+import { MapContext } from "../map/Map";
+export default class Frustum {
+    _mapContext: MapContext | undefined;
+    options: any;
+    frustumPrimitive: any;
+    frustumLinePrimitive: any;
+    isDestroyed: boolean;
     constructor(map: any, options: any);
+    getMap(): any;
+    private _canOperate;
     private _addFrustum;
+    /**
+     * 获取视锥体投影面的顶点坐标
+     * @param type 投影面类型: 'near'(近裁剪面) 或 'far'(远裁剪面)
+     * @returns 投影面的4个顶点坐标数组 [[lng, lat, alt], ...]
+     */
+    getProjectionPlane(type?: 'near' | 'far'): any;
+    /**
+     * 获取近裁剪面的顶点坐标
+     * @returns 近裁剪面的4个顶点坐标数组
+     */
+    getNearPlane(): any;
+    /**
+     * 获取远裁剪面的顶点坐标
+     * @returns 远裁剪面的4个顶点坐标数组
+     */
+    getFarPlane(): any;
+    show(isShow: boolean): void;
+    destroy(): void;
 }

package/dist/esm/visualization/Frustum.js

@@ -8,37 +8,52 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import * as Cesium from 'deeptwins-cesium';
+import { merge } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
+import { DEFAULT_FRUSTUM_OPTIONS } from "../constant";
 import * as utils from "../tool/utils";
-import BaseFrustum from "./BaseFrustum";
 
 // 视锥体
-var Frustum = /*#__PURE__*/function (_BaseFrustum) {
-  _inherits(Frustum, _BaseFrustum);
-  var _super = _createSuper(Frustum);
+var Frustum = /*#__PURE__*/function () {
   function Frustum(map, options) {
-    var _this;
     _classCallCheck(this, Frustum);
-    _this = _super.call(this, map, options);
-    _this._addFrustum();
-    return _this;
+    _defineProperty(this, "_mapContext", void 0);
+    // 参数
+    _defineProperty(this, "options", void 0);
+    // 视锥面
+    _defineProperty(this, "frustumPrimitive", void 0);
+    // 视锥线
+    _defineProperty(this, "frustumLinePrimitive", void 0);
+    _defineProperty(this, "isDestroyed", false);
+    this._mapContext = map._mapContext;
+    this.options = merge(DEFAULT_FRUSTUM_OPTIONS(), options);
+    this._addFrustum();
   }
   _createClass(Frustum, [{
+    key: "getMap",
+    value: function getMap() {
+      return this._mapContext && this._mapContext.getMap();
+    }
+
+    // 是否能进行操作
+  }, {
+    key: "_canOperate",
+    value: function _canOperate() {
+      if (this.isDestroyed) {
+        utils.error('Frustum实例已销毁');
+        return false;
+      }
+      return true;
+    }
+  }, {
     key: "_addFrustum",
     value: function _addFrustum() {
       var _this$options = this.options,
-        _this$options$show = _this$options.show,
-        show = _this$options$show === void 0 ? true : _this$options$show,
+        show = _this$options.show,
         _this$options$positio = _this$options.position,
         position = _this$options$positio === void 0 ? [] : _this$options$positio,
         fov = _this$options.fov,
@@ -51,45 +66,62 @@ var Frustum = /*#__PURE__*/function (_BaseFrustum) {
         pitch = _this$options$pitch === void 0 ? 0 : _this$options$pitch,
         _this$options$roll = _this$options.roll,
         roll = _this$options$roll === void 0 ? 0 : _this$options$roll,
-        _this$options$fill = _this$options.fill,
-        fill = _this$options$fill === void 0 ? true : _this$options$fill,
-        _this$options$color = _this$options.color,
-        color = _this$options$color === void 0 ? 'rgba(255,0,0,0.3)' : _this$options$color,
-        _this$options$outline = _this$options.outline,
-        outline = _this$options$outline === void 0 ? true : _this$options$outline,
-        _this$options$outline2 = _this$options.outlineColor,
-        outlineColor = _this$options$outline2 === void 0 ? '#ffffff' : _this$options$outline2;
+        fill = _this$options.fill,
+        color = _this$options.color,
+        outline = _this$options.outline,
+        outlineColor = _this$options.outlineColor,
+        isWithCamera = _this$options.isWithCamera,
+        _this$options$camera = _this$options.camera,
+        paramCamera = _this$options$camera === void 0 ? this.getMap().camera : _this$options$camera;
+      var camera = isWithCamera ? paramCamera : new Cesium.Camera(this.getMap().scene);
       var _position = _slicedToArray(position, 3),
         lng = _position[0],
         lat = _position[1],
         alt = _position[2];
       var positionCartesian3 = utils.lngLatAltToCartesian3(lng, lat, alt);
-      var hpr = new Cesium.HeadingPitchRoll(utils.toRadians(heading),
-      // Heading (航向，绕 Z 轴)
-      utils.toRadians(pitch),
-      // Pitch (俯仰，绕 X 轴)
-      utils.toRadians(roll)) // Roll (横滚，绕 Y 轴)
-      ;
-      var orientation = Cesium.Transforms.headingPitchRollQuaternion(positionCartesian3, hpr);
+      if (!isWithCamera) {
+        camera.position = utils.lngLatAltToCartesian3(lng, lat, alt);
+        var hpr = new Cesium.HeadingPitchRoll(utils.toRadians(heading),
+        // Heading (航向，绕 Z 轴)
+        utils.toRadians(pitch),
+        // Pitch (俯仰，绕 X 轴)
+        utils.toRadians(roll)) // Roll (横滚，绕 Y 轴)
+        ;
+        camera.setView({
+          destination: camera.position,
+          // 或者直接用 position
+          orientation: hpr
+        });
+      }
       var frustum = new Cesium.PerspectiveFrustum({
         // 查看的视场角
-        fov: fov ? utils.toRadians(fov) : this.getMap().camera.frustum.fov,
+        fov: fov ? utils.toRadians(fov) : camera.frustum.fov,
         // 视锥体的宽度/高度
-        aspectRatio: aspectRatio ? aspectRatio : this.getMap().camera.frustum.aspectRatio,
+        aspectRatio: aspectRatio ? aspectRatio : camera.frustum.aspectRatio,
         // 近面距视点的距离
-        near: near ? near : this.getMap().camera.frustum.near,
+        near: near ? near : camera.frustum.near,
         // 远面距视点的距离
-        far: far ? far : this.getMap().camera.frustum.far
+        far: far ? far : camera.frustum.far
       });
+
+      // 计算摄像机的方向四元数
+      var direction = Cesium.Cartesian3.clone(camera.directionWC);
+      var up = Cesium.Cartesian3.clone(camera.upWC);
+      var right = Cesium.Cartesian3.clone(camera.rightWC);
+      var rotationMatrix = new Cesium.Matrix3();
+      Cesium.Matrix3.setColumn(rotationMatrix, 0, right, rotationMatrix); // X 轴
+      Cesium.Matrix3.setColumn(rotationMatrix, 1, up, rotationMatrix); // Y 轴
+      Cesium.Matrix3.setColumn(rotationMatrix, 2, direction, rotationMatrix); // Z 轴
+      var modelMatrix = Cesium.Matrix4.fromRotationTranslation(rotationMatrix, positionCartesian3);
       this.frustumPrimitive = new Cesium.Primitive({
         geometryInstances: new Cesium.GeometryInstance({
           id: uuidv4(),
           geometry: new Cesium.FrustumGeometry({
             frustum: frustum,
-            origin: positionCartesian3,
-            orientation: orientation,
-            vertexFormat: Cesium.VertexFormat.POSITION_ONLY
+            origin: Cesium.Cartesian3.ZERO,
+            orientation: Cesium.Quaternion.IDENTITY
           }),
+          modelMatrix: modelMatrix,
           attributes: {
             color: fill ? utils.colorInstanceString(color) : utils.colorInstanceString('rgba(0, 0, 0, 0)')
           }
@@ -109,9 +141,10 @@ var Frustum = /*#__PURE__*/function (_BaseFrustum) {
             id: uuidv4(),
             geometry: new Cesium.FrustumOutlineGeometry({
               frustum: frustum,
-              origin: positionCartesian3,
-              orientation: orientation
+              origin: Cesium.Cartesian3.ZERO,
+              orientation: Cesium.Quaternion.IDENTITY
             }),
+            modelMatrix: modelMatrix,
             attributes: {
               color: utils.colorInstanceString(outlineColor)
             }
@@ -126,7 +159,90 @@ var Frustum = /*#__PURE__*/function (_BaseFrustum) {
         this.getMap().scene.primitives.add(this.frustumLinePrimitive);
       }
     }
+
+    /**
+     * 获取视锥体投影面的顶点坐标
+     * @param type 投影面类型: 'near'(近裁剪面) 或 'far'(远裁剪面)
+     * @returns 投影面的4个顶点坐标数组 [[lng, lat, alt], ...]
+     */
+  }, {
+    key: "getProjectionPlane",
+    value: function getProjectionPlane() {
+      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'far';
+      if (!this._canOperate()) {
+        return;
+      }
+      var geometry = Cesium.FrustumOutlineGeometry.createGeometry(this.frustumPrimitive.geometryInstances.geometry);
+      var positions = geometry.attributes.position.values;
+
+      // 获取模型变换矩阵
+      var modelMatrix = this.frustumPrimitive.geometryInstances.modelMatrix;
+
+      // FrustumGeometry 的顶点顺序：前4个是近裁剪面，后4个是远裁剪面
+      // 每个面有4个顶点，每个顶点3个坐标值
+      var startIndex = type === 'near' ? 0 : 12; // 近面从0开始，远面从12(4*3)开始
+      var endIndex = startIndex + 12; // 4个顶点 * 3个坐标
+
+      var result = [];
+      for (var i = startIndex; i < endIndex; i += 3) {
+        var localPosition = new Cesium.Cartesian3(positions[i], positions[i + 1], positions[i + 2]);
+
+        // 转换为世界坐标
+        var worldPosition = Cesium.Matrix4.multiplyByPoint(modelMatrix, localPosition, new Cesium.Cartesian3());
+        var _utils$cartesian3ToLn = utils.cartesian3ToLngLatAlt(worldPosition),
+          lng = _utils$cartesian3ToLn.lng,
+          lat = _utils$cartesian3ToLn.lat,
+          alt = _utils$cartesian3ToLn.alt;
+        result.push([lng, lat, alt]);
+      }
+      return result;
+    }
+
+    /**
+     * 获取近裁剪面的顶点坐标
+     * @returns 近裁剪面的4个顶点坐标数组
+     */
+  }, {
+    key: "getNearPlane",
+    value: function getNearPlane() {
+      return this.getProjectionPlane('near');
+    }
+
+    /**
+     * 获取远裁剪面的顶点坐标
+     * @returns 远裁剪面的4个顶点坐标数组
+     */
+  }, {
+    key: "getFarPlane",
+    value: function getFarPlane() {
+      return this.getProjectionPlane('far');
+    }
+
+    // 显示隐藏
+  }, {
+    key: "show",
+    value: function show(isShow) {
+      if (!this._canOperate()) {
+        return;
+      }
+      this.frustumPrimitive && (this.frustumPrimitive.show = isShow);
+      this.frustumLinePrimitive && (this.frustumLinePrimitive.show = isShow);
+    }
+
+    // 销毁
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      if (!this._canOperate()) {
+        return;
+      }
+      this.isDestroyed = true;
+      this.frustumPrimitive && this.getMap().scene.primitives.remove(this.frustumPrimitive);
+      this.frustumPrimitive = null;
+      this.frustumLinePrimitive && this.getMap().scene.primitives.remove(this.frustumLinePrimitive);
+      this.frustumLinePrimitive = null;
+    }
   }]);
   return Frustum;
-}(BaseFrustum);
+}();
 export { Frustum as default };