deeptwins-engine-3d 0.0.43 → 0.0.44

package/dist/cameraControl/ModelRoamHistory.d.ts

@@ -4,23 +4,31 @@ export default class ModelRoamHistory {
     modelLayer: any;
     modelEntity: any;
     positionProperty: any;
+    private follow;
     status: string;
     private _map;
     private readonly _eventRunning;
     private readonly _eventComplete;
     private readonly _eventCancel;
+    private _eventPreUpdate;
     private _positions;
-    private _listenScene;
+    private _currentPosition;
+    private _heading;
     private _listenRunning;
+    private firstCameraSettings;
+    private thirdPersonSettings;
     constructor(map: any, positions: any, options?: any);
     private _init;
+    private _getHeading;
     start(): void;
     pause(): void;
     proceed(): void;
     stop(): void;
-    setFollowFirst(distance?: number): void;
-    setFollowThird(): void;
+    setFollowFirst(options: any): void;
+    setFollowThird(options: any): void;
     cancelFollow(): void;
+    private updateFirstPersonView;
+    private updateThirdPersonView;
     on(type: any, event: any): any;
     updatePolyline(style: any): void;
     updateModel(style: any): void;

package/dist/cameraControl/ModelRoamHistory.js

@@ -8,7 +8,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import * as Cesium from 'deeptwins-cesium';
-import { SCENE_EVENT_TYPE } from "../constant";
+import * as constant from "../constant";
 import ModelEntity from "../graphicLayer/ModelEntity";
 import { lineClampToGroundSplit } from "../tool/common";
 import { cartesian3ToLngLatAlt, lngLatAltToCartesian3 } from "../tool/utils";
@@ -20,14 +20,29 @@ var ModelRoamHistory = /*#__PURE__*/function () {
     _defineProperty(this, "modelLayer", void 0);
     _defineProperty(this, "modelEntity", void 0);
     _defineProperty(this, "positionProperty", void 0);
+    // 视角
+    _defineProperty(this, "follow", null);
     _defineProperty(this, "status", 'stop');
     _defineProperty(this, "_map", void 0);
     _defineProperty(this, "_eventRunning", void 0);
     _defineProperty(this, "_eventComplete", void 0);
     _defineProperty(this, "_eventCancel", void 0);
+    // 帧率更新的事件
+    _defineProperty(this, "_eventPreUpdate", void 0);
     _defineProperty(this, "_positions", []);
-    _defineProperty(this, "_listenScene", void 0);
+    _defineProperty(this, "_currentPosition", void 0);
+    _defineProperty(this, "_heading", void 0);
     _defineProperty(this, "_listenRunning", void 0);
+    // 第一人称视角设置
+    _defineProperty(this, "firstCameraSettings", {
+      distance: 0,
+      pitch: -45
+    });
+    // 第三人称视角设置
+    _defineProperty(this, "thirdPersonSettings", {
+      distance: 500,
+      pitch: -45
+    });
     var _ref = options || {},
       complete = _ref.complete,
       cancel = _ref.cancel,
@@ -99,9 +114,19 @@ var ModelRoamHistory = /*#__PURE__*/function () {
         } else {
           // 监听运行状态
           if (_this._eventRunning && _this._map.clock.shouldAnimate) {
-            var currentTime = _this._map.clock.currentTime; // 获取当前时间
-            var currentPosition = _this.positionProperty.getValue(currentTime); // 获取插值后的当前位置
+            // 获取当前时间
+            var currentTime = _this._map.clock.currentTime;
+            // 获取前一帧时间
+            var beforeTime = Cesium.JulianDate.addSeconds(currentTime, -0.1, new Cesium.JulianDate());
+            // 获取插值后的当前位置
+            var currentPosition = _this.positionProperty.getValue(currentTime);
+            // 获取前一帧的位置
+            var beforePosition = _this.positionProperty.getValue(beforeTime);
             if (currentPosition) {
+              _this._currentPosition = currentPosition;
+              if (_this.modelLayer && _this._positions && beforePosition) {
+                _this._getHeading(currentPosition, beforePosition);
+              }
               _this._eventRunning(_objectSpread(_objectSpread({}, cartesian3ToLngLatAlt(currentPosition)), {}, {
                 time: Cesium.JulianDate.toDate(currentTime)
               }));
@@ -109,9 +134,11 @@ var ModelRoamHistory = /*#__PURE__*/function () {
           }
         }
       };
-      this._map.clock.onTick.addEventListener(this._listenRunning);
+      // 监听帧率
+      this._eventPreUpdate = this._map.on(constant.SCENE_EVENT_TYPE.PRE_UPDATE, this._listenRunning);
       this.positionProperty = new Cesium.SampledPositionProperty();
       if (clampToGround) {
+        // 贴地计算
         model.heightReference = Cesium.HeightReference.CLAMP_TO_GROUND;
         var _loop = function _loop() {
           var position1 = _this._positions[i];
@@ -159,12 +186,42 @@ var ModelRoamHistory = /*#__PURE__*/function () {
         position: this.positionProperty,
         model: ModelEntity.handleOptions(model)
       });
-      this.modelLayer = this._map.addGraphicEntityToLayer(this.modelEntity.position, {
+      this.modelLayer = this._map.addCustomSourceToGraphicLayer(this.modelEntity.position, {
         type: 'model',
         entity: this.modelEntity
       });
     }
 
+    // 获取方向角
+  }, {
+    key: "_getHeading",
+    value: function _getHeading(currentPosition, beforePosition) {
+      // 当前位置与之前位置的 Cartographic 经纬度
+      var cartoNow = Cesium.Cartographic.fromCartesian(currentPosition);
+      var cartoBefore = Cesium.Cartographic.fromCartesian(beforePosition);
+
+      // 把它们转为 Cartesian3
+      var origin = Cesium.Cartesian3.fromRadians(cartoBefore.longitude, cartoBefore.latitude, cartoBefore.height);
+      var target = Cesium.Cartesian3.fromRadians(cartoNow.longitude, cartoNow.latitude, cartoNow.height);
+
+      // 构造 ENU 变换矩阵（以 before 位置为原点）
+      var enuTransform = Cesium.Transforms.eastNorthUpToFixedFrame(origin);
+      var inverse = Cesium.Matrix4.inverse(enuTransform, new Cesium.Matrix4());
+
+      // 计算从 before → now 的方向向量
+      var directionWorld = Cesium.Cartesian3.subtract(target, origin, new Cesium.Cartesian3());
+      var directionENU = Cesium.Matrix4.multiplyByPointAsVector(inverse, directionWorld, new Cesium.Cartesian3());
+
+      // 在 ENU 坐标中计算 heading
+      var heading = Cesium.Math.zeroToTwoPi(Math.atan2(directionENU.x, directionENU.y)); // 东为 x，北为 y
+      this._heading = heading;
+      if (this.follow === 'first') {
+        this.updateFirstPersonView(currentPosition, heading);
+      } else if (this.follow === 'third') {
+        this.updateThirdPersonView(currentPosition, heading);
+      }
+    }
+
     // 开始播放场景
   }, {
     key: "start",
@@ -207,30 +264,21 @@ var ModelRoamHistory = /*#__PURE__*/function () {
     // 第一人称视角跟随
   }, {
     key: "setFollowFirst",
-    value: function setFollowFirst() {
-      var _this2 = this;
-      var distance = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1000;
+    value: function setFollowFirst(options) {
       if (this.status === 'destroy') return;
-      this.cancelFollow();
-      this._listenScene = this._map.on(SCENE_EVENT_TYPE.PRE_UPDATE, function () {
-        var position = _this2.modelEntity.position.getValue(_this2._map.clock.currentTime);
-        if (position) {
-          // 获取模型的姿态
-          var orientation = _this2.modelEntity.orientation.getValue(_this2._map.clock.currentTime);
-          var transform = Cesium.Transforms.eastNorthUpToFixedFrame(position);
-          transform = Cesium.Matrix4.fromRotationTranslation(Cesium.Matrix3.fromQuaternion(orientation), position);
-          _this2._map.camera.lookAtTransform(transform, new Cesium.Cartesian3(-20, 0, distance));
-        }
-      });
+      this.firstCameraSettings = _objectSpread(_objectSpread({}, this.firstCameraSettings), options);
+      this.follow = 'first';
+      this.updateFirstPersonView(this._currentPosition, this._heading);
     }
 
     // 第三人称视角跟随
   }, {
     key: "setFollowThird",
-    value: function setFollowThird() {
+    value: function setFollowThird(options) {
       if (this.status === 'destroy') return;
-      this.cancelFollow();
-      this._map.trackedEntity = this.modelEntity;
+      this.thirdPersonSettings = _objectSpread(_objectSpread({}, this.thirdPersonSettings), options);
+      this.follow = 'third';
+      this.updateThirdPersonView(this._currentPosition, this._heading);
     }
 
     // 取消跟随
@@ -238,9 +286,35 @@ var ModelRoamHistory = /*#__PURE__*/function () {
     key: "cancelFollow",
     value: function cancelFollow() {
       if (this.status === 'destroy') return;
-      this._listenScene && this._listenScene.off();
-      this._map.trackedEntity = null;
-      this._map.camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
+      this.follow = null;
+    }
+
+    // 更新第一人称视角
+  }, {
+    key: "updateFirstPersonView",
+    value: function updateFirstPersonView(position, heading) {
+      if (!position || !heading) {
+        return;
+      }
+      // 设置相机位置和朝向
+      this._map.camera.setView({
+        destination: position,
+        orientation: {
+          heading: heading,
+          pitch: Cesium.Math.toRadians(this.firstCameraSettings.pitch),
+          roll: 0.0
+        }
+      });
+    }
+
+    // 更新第三人称视角
+  }, {
+    key: "updateThirdPersonView",
+    value: function updateThirdPersonView(position, heading) {
+      if (!position || !heading) {
+        return;
+      }
+      this._map.camera.lookAt(position, new Cesium.HeadingPitchRange(heading, Cesium.Math.toRadians(this.thirdPersonSettings.pitch), this.thirdPersonSettings.distance));
     }
 
     // 监听
@@ -271,7 +345,7 @@ var ModelRoamHistory = /*#__PURE__*/function () {
       this.status = 'destroy';
       this._map.clock.shouldAnimate = false;
       this._map.clock.currentTime = Cesium.JulianDate.fromDate(new Date());
-      this._map.clock.onTick.removeEventListener(this._listenRunning);
+      this._eventPreUpdate.off();
       this._listenRunning = null;
       this._map.removeLayer('_modelHistoryRoam');
       this._map.removeSource('_modelHistoryRoam');

package/dist/cameraControl/ModelRoamRealTime.d.ts

@@ -8,30 +8,28 @@ interface Position {
     alt: number;
 }
 export default class ModelRoamRealTime {
-    _map: any;
+    readonly _map: any;
+    modelOptions: any;
+    polylineOptions: any;
+    private follow;
+    flyTo: boolean;
+    private readonly _onPositionUpdate;
     modelLayer: any;
     polylineLayer: any;
-    private modelOptions;
-    private polylineOptions;
-    private follow;
-    private flyTo;
-    private onPositionUpdate;
-    private linePath;
-    private showPath;
     private positions;
+    private positionsLineC3;
+    private positionInterC3;
+    private _eventPreUpdate;
     private modelMatrix;
     private hpRoll;
-    private fixedFrameTransform;
-    private isRun;
+    private _time;
+    status: 'stop' | 'running' | 'destroy';
     private currentPathIndex;
     private maxPathIndex;
-    private isMovingToTarget;
     private targetHeading;
     private currentHeading;
     private rotationSpeed;
-    private keyState;
-    private keyStep;
-    private cameraSettings;
+    private firstCameraSettings;
     private thirdPersonSettings;
     constructor(map: Viewer, options: any);
     /**
@@ -39,38 +37,25 @@ export default class ModelRoamRealTime {
      * @param newPosition 新位置点
      * @throws 如果新位置与上一个位置完全相同
      */
-    updatePosition(newPosition: Position): Promise<void>;
+    updatePosition(newPosition: Position): void;
     /**
      * 计算两点之间的路径点
      * 使用插值算法生成平滑的路径
      * @param startP 起始点
      * @param endP 终点
+     * @param flightTime 飞行时间
      * @returns 插值后的路径点数组
      */
-    private getPosition;
+    private _getInterPosition;
     /**
      * 初始化模型
      * 加载模型
      * @param initialPosition 初始位置
      */
     private initModel;
-    /**
-     * 初始化线路
-     */
-    private initPolyline;
-    /**
-     * 开始漫游
-     */
-    startRun(): void;
-    /**
-     * 结束漫游
-     */
-    stopRun(): void;
     /**
      * 渲染回调函数
      * 更新模型位置、朝向和路径线
-     * @param scene Cesium场景
-     * @param time 当前时间
      */
     private updateModel;
     /**
@@ -99,30 +84,21 @@ export default class ModelRoamRealTime {
      */
     private updateThirdPersonView;
     /**
-     * 切换视角模式
-     * 在第一人称和第三人称之间切换
-     */
-    changeFollow(type: any): void;
-    /**
-     * 飞行定位到模型
+     * 设置第一人称视角
      */
-    private flyToModel;
+    setFollowFirst(options: any): void;
     /**
-     * 初始化键盘控制
+     * 设置第一人称视角
      */
-    private initKeyboardControls;
+    setFollowThird(options: any): void;
     /**
-     * 处理按键按下事件
+     * 取消视角跟随
      */
-    private handleKeyDown;
+    cancelFollow(): void;
     /**
-     * 处理按键释放事件
-     */
-    private handleKeyUp;
-    /**
-     * 根据键盘状态更新视角
+     * 飞行定位到模型
      */
-    private updateViewFromKeyboard;
+    private _flyToModel;
     /**
      * 监听
      */