deeptwins-engine-3d 0.0.48 → 0.0.49

package/dist/cameraControl/ModelRoamRealTime.d.ts

@@ -17,13 +17,18 @@ export default class ModelRoamRealTime {
     private readonly _onPositionUpdate;
     modelLayer: any;
     polylineLayer: any;
+    private _lastFrameTime;
+    private _stepAccumulator;
+    private _frameCount;
+    private _fps;
+    private _time;
     private receivedPositions;
     private completedSegments;
     private currentSegment;
     private futureSegments;
     private currentPointIndex;
     private segmentCounter;
-    private _eventPreUpdate;
+    private _eventPostUpdate;
     private modelMatrix;
     private hpRoll;
     status: 'stop' | 'running' | 'destroy';
@@ -80,7 +85,7 @@ export default class ModelRoamRealTime {
     private initTrailLine;
     /**
      * 获取轨迹线位置点
-     * 返回：所有原始接收位置点 + 当前路径段已飞行的插值点
+     * 返回：已完成路径段的起始点和结束点 + 当前路径段已飞行的插值点
      */
     private getTrailLinePositions;
     /**

package/dist/cameraControl/ModelRoamRealTime.js

@@ -48,7 +48,15 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
     _defineProperty(this, "modelLayer", void 0);
     // 轨迹layer
     _defineProperty(this, "polylineLayer", void 0);
+    // 上一帧时间
+    _defineProperty(this, "_lastFrameTime", performance.now());
+    // 累加器
+    _defineProperty(this, "_stepAccumulator", 0);
+    _defineProperty(this, "_frameCount", 0);
+    _defineProperty(this, "_fps", 'N/A');
     // 重新设计的数据结构
+    // 上个点位的时间
+    _defineProperty(this, "_time", performance.now());
     // 接收到的原始位置数据
     _defineProperty(this, "receivedPositions", []);
     // 已完成飞行的路径段
@@ -62,7 +70,7 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
     // 路径段计数器
     _defineProperty(this, "segmentCounter", 0);
     // 帧率更新的事件
-    _defineProperty(this, "_eventPreUpdate", void 0);
+    _defineProperty(this, "_eventPostUpdate", void 0);
     // 模型参数
     // 模型变换矩阵
     _defineProperty(this, "modelMatrix", new Cesium.Matrix4());
@@ -92,6 +100,13 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
      * 更新模型位置、朝向和路径线
      */
     _defineProperty(this, "updateModel", function () {
+      var currentTime = performance.now();
+      _this._frameCount++;
+      if (currentTime - _this._lastFrameTime > 1000) {
+        _this._fps = _this._frameCount;
+        _this._frameCount = 0;
+        _this._lastFrameTime = currentTime;
+      }
       if (!_this.currentSegment || _this.status !== 'running') {
         return;
       }
@@ -125,7 +140,7 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
         if (_this._onPositionUpdate) {
           var cartographic = Cesium.Cartographic.fromCartesian(currentPos);
           _this._onPositionUpdate({
-            lon: Cesium.Math.toDegrees(cartographic.longitude),
+            lng: Cesium.Math.toDegrees(cartographic.longitude),
             lat: Cesium.Math.toDegrees(cartographic.latitude),
             height: cartographic.height
           });
@@ -135,6 +150,19 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
         }
       }
       _this.currentPointIndex++;
+      if (_this._fps === 'N/A') {
+        _this.currentPointIndex++;
+      } else {
+        // 每帧应飞的“点数”（允许小数）
+        var exactStep = _this._map.targetFrameRate / _this._fps;
+        // 累加步长
+        _this._stepAccumulator += exactStep;
+        // 取整：当前帧应飞的“完整点数”
+        var step = Math.max(1, Math.floor(_this._stepAccumulator));
+        // 剩余留给下帧
+        _this._stepAccumulator -= step;
+        _this.currentPointIndex = _this.currentPointIndex + step;
+      }
     });
     if (!map) {
       throw new Error('undefined map');
@@ -160,7 +188,6 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
   _createClass(ModelRoamRealTime, [{
     key: "updatePosition",
     value: function updatePosition(newPosition) {
-      console.log(newPosition);
       if (!newPosition) return;
       if (this.status === 'destroy') return;
 
@@ -213,7 +240,9 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
       var endC3 = Cesium.Cartesian3.fromDegrees(endPos.lng, endPos.lat, endPos.alt);
 
       // 计算飞行时间
-      var flightTime = endPos.timestamp && startPos.timestamp ? (endPos.timestamp - startPos.timestamp) / 1000 : 5; // 默认5秒
+      var newTime = performance.now();
+      var flightTime = (newTime - this._time) / 1000;
+      this._time = newTime;
 
       // 计算插值点
       var interpolatedPoints = this._getInterPosition(startC3, endC3, flightTime);
@@ -244,7 +273,7 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
       if (this.status === 'running') return;
       this.status = 'running';
       // 监听帧率更新
-      this._eventPreUpdate = this._map.on(constant.SCENE_EVENT_TYPE.PRE_UPDATE, this.updateModel);
+      this._eventPostUpdate = this._map.on(constant.SCENE_EVENT_TYPE.POST_UPDATE, this.updateModel);
     }
 
     /**
@@ -279,11 +308,8 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
         return arr;
       }
 
-      // 设置无人机飞行参数
-      var updateRate = 60; // 每秒更新次数
-
-      // 计算总的插值点数
-      var numberOfPoints = Math.max(10, Math.floor(flightTime * updateRate));
+      // 计算总的插值点数 用最大帧率*时间计算点位
+      var numberOfPoints = Math.max(10, Math.floor(flightTime * this._map.targetFrameRate));
 
       // 计算时间步长
       var timeStep = 1.0 / (numberOfPoints - 1);
@@ -398,13 +424,13 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
       var _this3 = this;
       // 创建轨迹线Entity，使用callback动态更新位置
       this.polylineLayer = this._map.entities.add({
-        id: '_modelRoamRealTimePolyline',
+        id: uuidv4(),
         polyline: {
           positions: new Cesium.CallbackProperty(function () {
             return _this3.getTrailLinePositions();
           }, false),
-          width: this.polylineOptions.width || 3,
-          material: colorString(this.polylineOptions.color || '#00ff00'),
+          width: this.polylineOptions.width || 2,
+          material: colorString(this.polylineOptions.color || Cesium.Color.YELLOW),
           clampToGround: false
         }
       });
@@ -412,29 +438,41 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
 
     /**
      * 获取轨迹线位置点
-     * 返回：所有原始接收位置点 + 当前路径段已飞行的插值点
+     * 返回：已完成路径段的起始点和结束点 + 当前路径段已飞行的插值点
      */
   }, {
     key: "getTrailLinePositions",
     value: function getTrailLinePositions() {
       var positions = [];
 
-      // 确保receivedPositions是数组且有足够数据
-      if (!Array.isArray(this.receivedPositions) || this.receivedPositions.length < 2) {
+      // 确保有基础数据
+      if (!Array.isArray(this.receivedPositions) || this.receivedPositions.length < 1) {
         return positions;
       }
 
-      // 添加所有原始接收到的位置点（转换为Cartesian3）
-      this.receivedPositions.forEach(function (pos) {
-        if (pos && typeof pos.lng === 'number' && typeof pos.lat === 'number' && typeof pos.alt === 'number') {
-          positions.push(Cesium.Cartesian3.fromDegrees(pos.lng, pos.lat, pos.alt));
-        }
-      });
+      // 添加已完成路径段的起始点和结束点
+      if (Array.isArray(this.completedSegments)) {
+        this.completedSegments.forEach(function (segment) {
+          if (segment.startPos && segment.endPos) {
+            // 添加起始点（如果这是第一个路径段或者与上一个路径段不重复）
+            if (positions.length === 0) {
+              positions.push(Cesium.Cartesian3.fromDegrees(segment.startPos.lng, segment.startPos.lat, segment.startPos.alt));
+            }
+            // 添加结束点
+            positions.push(Cesium.Cartesian3.fromDegrees(segment.endPos.lng, segment.endPos.lat, segment.endPos.alt));
+          }
+        });
+      }
 
       // 如果当前有正在飞行的路径段，添加已飞行过的插值点
-      if (this.currentSegment && Array.isArray(this.currentSegment.interpolatedPoints) && this.currentPointIndex > 0) {
-        // 添加当前路径段中已经飞行过的插值点（跳过第一个点，避免重复）
-        for (var i = 1; i <= this.currentPointIndex && i < this.currentSegment.interpolatedPoints.length; i++) {
+      if (this.currentSegment && Array.isArray(this.currentSegment.interpolatedPoints) && this.currentPointIndex >= 0) {
+        // 如果还没有添加过任何点，先添加当前路径段的起始点
+        if (positions.length === 0 && this.currentSegment.startPos) {
+          positions.push(Cesium.Cartesian3.fromDegrees(this.currentSegment.startPos.lng, this.currentSegment.startPos.lat, this.currentSegment.startPos.alt));
+        }
+
+        // 添加当前路径段中已经飞行过的插值点
+        for (var i = 0; i <= this.currentPointIndex && i < this.currentSegment.interpolatedPoints.length; i++) {
           positions.push(this.currentSegment.interpolatedPoints[i]);
         }
       }
@@ -690,8 +728,8 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
     value: function destroy() {
       if (this.status === 'destroy') return;
       this.status = 'destroy';
+      this._eventPostUpdate && this._eventPostUpdate.off();
       if (this.modelLayer) {
-        this._eventPreUpdate.off();
         this._map.scene.primitives.remove(this.modelLayer);
         this.modelLayer = null;
       }

package/dist/index.js

@@ -45,7 +45,7 @@ window.Cesium = Cesium;
 var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", '0.0.48');
+_defineProperty(DeepTwinsEngine3D, "Version", '0.0.49');
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);

package/dist/map/Event.js

@@ -252,7 +252,7 @@ var Event = /*#__PURE__*/function () {
         var pickedObject = _this5._getPickedObject(position);
         if (pickedObject) {
           var _modelRoam$modelLayer;
-          var targetPolyline = pickedObject.id === '_modelRoamRealTimePolyline';
+          var targetPolyline = modelRoam.polylineLayer.id === pickedObject.id.id;
           var targetModel = (modelRoam === null || modelRoam === void 0 || (_modelRoam$modelLayer = modelRoam.modelLayer) === null || _modelRoam$modelLayer === void 0 ? void 0 : _modelRoam$modelLayer.id) === (pickedObject === null || pickedObject === void 0 ? void 0 : pickedObject.id);
           if (targetPolyline || targetModel) {
             var result = {

package/dist/material/CircleWaveMaterialProperty.js

@@ -24,7 +24,7 @@ import { DEFAULT_CIRCLE_WAVE_MATERIAL_STYLE } from "../constant";
 import * as utils from "../tool/utils";
 import BaseMaterialProperty from "./BaseMaterialProperty";
 /* babel-plugin-inline-import './shader/CircleWaveShader.glsl' */
-var CircleWaveShader = "czm_material czm_getMaterial(czm_materialInput materialInput) {\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    material.diffuse = 1.5 * color.rgb;\n\n    vec2 st = materialInput.st;\n    vec3 str = materialInput.str;\n    float dis = distance(st, vec2(0.5));\n    float per = fract(time);\n    float perDis = 0.5 / count;\n\n    // discard if str.z != 0\n    float discardByStr = step(0.001, abs(str.z));\n    // discard if dis > 0.5\n    float discardByDis = step(0.5, dis);\n\n    if (discardByStr > 0.0 || discardByDis > 0.0) {\n        discard;\n    }\n\n    float bl = 0.0;\n\n    for (int i = 0; i <= 9; i++) {\n        float idx = float(i);\n        float valid = step(idx, count);  // 1.0 if i <= count, else 0.0\n\n        float disNum = perDis * idx - dis + per / count;\n        float inFirst = step(0.0, disNum) * (1.0 - step(perDis, disNum));\n        float inSecond = step(perDis, disNum) * (1.0 - step(2.0 * perDis, disNum));\n\n        float bl1 = 1.0 - disNum / perDis;\n        float bl2 = 1.0 - abs(1.0 - disNum / perDis);\n\n        float thisBl = mix(0.0, bl1, inFirst) + mix(0.0, bl2, inSecond);\n        thisBl *= valid; // only apply if i <= count\n\n        bl = max(bl, thisBl); // \u4FDD\u7559\u6700\u5F3A\u7684\u4E00\u5C42\u6CE2\u7EB9\n    }\n\n    material.alpha = pow(bl, gradient);\n    return material;\n}\n"; // 水波纹材质
+var CircleWaveShader = "czm_material czm_getMaterial(czm_materialInput materialInput) {\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    material.diffuse = 1.5 * color.rgb;\n    vec2 st = materialInput.st;\n    vec3 str = materialInput.str;\n    float dis = distance(st, vec2(0.5, 0.5));\n    float per = fract(time);\n    if (abs(str.z) > 0.001) {\n        discard;\n    }\n    if (dis > 0.5) {\n        discard;\n    } else {\n        float perDis = 0.5 / count;\n        float disNum;\n        float bl = .0;\n        for (int i = 0; i <= 9; i++) {\n            if (float(i) <= count) {\n                disNum = perDis * float(i) - dis + per / count;\n                if (disNum > 0.0) {\n                    if (disNum < perDis) {\n                        bl = 1.0 - disNum / perDis;\n                    } else if (disNum - perDis < perDis) {\n                        bl = 1.0 - abs(1.0 - disNum / perDis);\n                    }\n                    material.alpha = pow(bl, gradient);\n                }\n            }\n        }\n    }\n    return material;\n}\n"; // 水波纹材质
 var CircleWaveMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty) {
   _inherits(CircleWaveMaterialProperty, _BaseMaterialProperty);
   var _super = _createSuper(CircleWaveMaterialProperty);

package/dist/material/DynamicWallMaterialProperty.js

@@ -24,7 +24,7 @@ import { DEFAULT_DYNAMIC_WALL_MATERIAL_STYLE } from "../constant";
 import * as utils from "../tool/utils";
 import BaseMaterialProperty from "./BaseMaterialProperty";
 /* babel-plugin-inline-import './shader/DynamicWallShader.glsl' */
-var DynamicWallShader = "czm_material czm_getMaterial(czm_materialInput materialInput)\n{\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = materialInput.st;\n    float vertical = 1.0;\n    float directionAdd = 1.0;\n    // \u4F7F\u7528 abs(a - b) < 0.0001\uFF08\u901A\u8FC7 step\uFF09\u5224\u65AD\u6D6E\u70B9\u76F8\u7B49\uFF0C\u907F\u514D\u7CBE\u5EA6\u8BEF\u5DEE\n    // \u5224\u65AD\u6392\u5217\u65B9\u5411\u662F\u5426\u662F\u7EB5\u5411\uFF08freely == vertical\uFF09\n    float isVertical = 1.0 - step(0.0001, abs(freely - vertical));\n    // \u5224\u65AD\u8FD0\u52A8\u65B9\u5411\u662F\u5426\u662F\u52A0\uFF08direction == directionAdd\uFF09\n    float isAdd = 1.0 - step(0.0001, abs(direction - directionAdd));\n\n    // \u7EB5\u5411\u6392\u5217\uFF1Auv = (st.s, count * st.t \xB1 time)\n    // \u6A2A\u5411\u6392\u5217\uFF1Auv = (count * st.s \xB1 time, st.t)\n    vec2 uvVerticalAdd = vec2(fract(st.s), fract(count * st.t + time));\n    vec2 uvVerticalSub = vec2(fract(st.s), fract(count * st.t - time));\n    vec2 uvHorizontalAdd = vec2(fract(count * st.s + time), fract(st.t));\n    vec2 uvHorizontalSub = vec2(fract(count * st.s - time), fract(st.t));\n\n    // \u6309\u8FD0\u52A8\u65B9\u5411\u9009\u62E9 mix(a, b, t) \u4F5C\u7528\u7C7B\u4F3C\u4E8E t == 0 ? a : b\n    vec2 uvVertical = mix(uvVerticalSub, uvVerticalAdd, isAdd);\n    vec2 uvHorizontal = mix(uvHorizontalSub, uvHorizontalAdd, isAdd);\n\n    // \u6700\u7EC8\u6839\u636E\u6392\u5217\u65B9\u5411\u9009\u62E9\n    vec2 uv = mix(uvHorizontal, uvVertical, isVertical);\n\n    vec4 colorImage = texture(image, uv);\n    vec3 mixedColor = mix(colorImage.rgb, color.rgb, mixRatio);\n    vec4 fragColor;\n    fragColor.rgb = mixedColor;\n    fragColor = czm_gammaCorrect(fragColor);\n\n    material.diffuse = mixedColor;\n    material.alpha = colorImage.a * color.a; // \u53EF\u6839\u636E\u9700\u8981\u51B3\u5B9A\u662F\u5426\u76F8\u4E58\n    material.emission = fragColor.rgb;\n\n    return material;\n}\n"; // 动态墙材质
+var DynamicWallShader = "czm_material czm_getMaterial(czm_materialInput materialInput)\n{\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = materialInput.st;\n    float vertical = 1.0;\n    float directionAdd = 1.0;\n    vec2 uv = vec2(0, 0);\n    // \u5224\u65AD\u6392\u5217\u65B9\u5411\n    if (freely == vertical) {\n        // \u5224\u65AD\u8FD0\u52A8\u65B9\u5411\n        if (direction == directionAdd) {\n            uv = vec2(fract(st.s), fract(count * st.t + time));\n        } else {\n            uv = vec2(fract(st.s), fract(count * st.t - time));\n        }\n    } else {\n        // \u5224\u65AD\u8FD0\u52A8\u65B9\u5411\n        if (direction == directionAdd) {\n            uv = vec2(fract(count * st.s + time), fract(st.t));\n        } else {\n            uv = vec2(fract(count * st.s - time), fract(st.t));\n        }\n    }\n    vec4 colorImage = texture(image, uv);\n    vec3 mixedColor = mix(colorImage.rgb, color.rgb, mixRatio);\n    vec4 fragColor;\n    fragColor.rgb = mixedColor;\n    fragColor = czm_gammaCorrect(fragColor);\n\n    material.diffuse = mixedColor;\n    material.alpha = colorImage.a * color.a; // \u53EF\u6839\u636E\u9700\u8981\u51B3\u5B9A\u662F\u5426\u76F8\u4E58\n    material.emission = fragColor.rgb;\n\n    return material;\n}\n"; // 动态墙材质
 var DynamicWallMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty) {
   _inherits(DynamicWallMaterialProperty, _BaseMaterialProperty);
   var _super = _createSuper(DynamicWallMaterialProperty);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deeptwins-engine-3d",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "description": "map for 3d",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",