deeptwins-engine-3d 0.1.5 → 0.1.6

package/dist/esm/cameraControl/ModelRoamRealTime.d.ts

@@ -22,6 +22,7 @@ export default class ModelRoamRealTime {
     private _stepAccumulator;
     private _frameCount;
     private _fps;
+    currentPos: any;
     private receivedPositions;
     private completedSegments;
     private currentSegment;

package/dist/esm/cameraControl/ModelRoamRealTime.js

@@ -62,6 +62,8 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
     _defineProperty(this, "_stepAccumulator", 0);
     _defineProperty(this, "_frameCount", 0);
     _defineProperty(this, "_fps", 'N/A');
+    // 当前位置
+    _defineProperty(this, "currentPos", null);
     // 接收到的原始位置数据
     _defineProperty(this, "receivedPositions", []);
     // 已完成飞行的路径段
@@ -131,12 +133,12 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
         _this._stepAccumulator += 1;
         return;
       }
-      var currentPos = _this.currentSegment.interpolatedPoints[_this.currentPointIndex];
+      _this.currentPos = _this.currentSegment.interpolatedPoints[_this.currentPointIndex];
 
       // 计算朝向
       if (_this.currentPointIndex > 0) {
         var prevPos = _this.currentSegment.interpolatedPoints[_this.currentPointIndex - 1];
-        _this.getHeading(prevPos, currentPos);
+        _this.getHeading(prevPos, _this.currentPos);
       }
 
       // 更新朝向
@@ -151,12 +153,12 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
       // 更新模型位置
       if (_this.modelLayer) {
         // 只有位置真正发生变化时才更新矩阵
-        _this.modelMatrix = Cesium.Transforms.headingPitchRollToFixedFrame(currentPos, _this.hpRoll, Cesium.Ellipsoid.WGS84, Cesium.Transforms.localFrameToFixedFrameGenerator('north', 'west'));
+        _this.modelMatrix = Cesium.Transforms.headingPitchRollToFixedFrame(_this.currentPos, _this.hpRoll, Cesium.Ellipsoid.WGS84, Cesium.Transforms.localFrameToFixedFrameGenerator('north', 'west'));
         _this.modelLayer.modelMatrix = _this.modelMatrix;
 
         // 调用位置更新回调
         if (_this._onPositionUpdate) {
-          var cartographic = Cesium.Cartographic.fromCartesian(currentPos);
+          var cartographic = Cesium.Cartographic.fromCartesian(_this.currentPos);
           _this._onPositionUpdate({
             lng: Cesium.Math.toDegrees(cartographic.longitude),
             lat: Cesium.Math.toDegrees(cartographic.latitude),
@@ -221,6 +223,7 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
       // 如果是第一次接收数据，初始化模型
       if (this.receivedPositions.length === 0) {
         this.receivedPositions.push(newPosition);
+        this.currentPos = Cesium.Cartesian3.fromDegrees(newPosition.lng, newPosition.lat, newPosition.alt);
         this.initModel(newPosition);
         if (this._onPositionUpdate) {
           this._onPositionUpdate({
@@ -670,14 +673,13 @@ var ModelRoamRealTime = /*#__PURE__*/function () {
   }, {
     key: "updateCameraView",
     value: function updateCameraView() {
-      if (!this.modelLayer || !this.currentSegment) {
+      if (!this.modelLayer && this.currentPos) {
         return;
       }
-      var position = this.currentPointIndex >= this.currentSegment.interpolatedPoints.length ? this.currentSegment.interpolatedPoints[this.currentSegment.interpolatedPoints.length - 1] : this.currentSegment.interpolatedPoints[this.currentPointIndex];
       if (this.follow === 'first') {
-        this.updateFirstPersonView(position);
+        this.updateFirstPersonView(this.currentPos);
       } else if (this.follow === 'third') {
-        this.updateThirdPersonView(position);
+        this.updateThirdPersonView(this.currentPos);
       }
     }
 

package/dist/esm/index.d.ts

@@ -16,7 +16,6 @@ export declare class DeepTwinsEngine3D {
     static RotateInPlace: any;
     static ModelRoamHistory: any;
     static ModelRoamRealTime: any;
-    static ModelRoamUpDate: any;
     static TimerInterval: any;
     static ShapeSection: any;
     static ClampToGround: any;

package/dist/esm/index.js

@@ -9,7 +9,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import * as Cesium from 'deeptwins-cesium';
 import ModelRoamHistory from "./cameraControl/ModelRoamHistory";
 import ModelRoamRealTime from "./cameraControl/ModelRoamRealTime";
-import ModelRoamUpDate from "./cameraControl/ModelRoamUpDate";
 import Roam from "./cameraControl/Roam";
 import Rotate from "./cameraControl/Rotate";
 import RotateInPlace from "./cameraControl/RotateInPlace";
@@ -48,7 +47,7 @@ loadCss(Cesium.buildModuleUrl('Widgets/widgets.css'));
 export var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", "0.1.5");
+_defineProperty(DeepTwinsEngine3D, "Version", "0.1.6");
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);
@@ -64,7 +63,6 @@ _defineProperty(DeepTwinsEngine3D, "Roam", Roam);
 _defineProperty(DeepTwinsEngine3D, "RotateInPlace", RotateInPlace);
 _defineProperty(DeepTwinsEngine3D, "ModelRoamHistory", ModelRoamHistory);
 _defineProperty(DeepTwinsEngine3D, "ModelRoamRealTime", ModelRoamRealTime);
-_defineProperty(DeepTwinsEngine3D, "ModelRoamUpDate", ModelRoamUpDate);
 _defineProperty(DeepTwinsEngine3D, "TimerInterval", TimerInterval);
 _defineProperty(DeepTwinsEngine3D, "ShapeSection", ShapeSection);
 _defineProperty(DeepTwinsEngine3D, "ClampToGround", ClampToGround);

package/dist/esm/map/Event.d.ts

@@ -1,8 +1,11 @@
 export default class Event {
     private _map;
+    private _eventSubscriptions;
     constructor(map: any);
     private _getPosition;
     private _getPickedObject;
+    private _notifySubscribers;
+    private _subscribe;
     listenToMap(type: any, event: any): any;
     listenToCamera(type: any, event: any): any;
     listenToScene(type: any, event: any): any;

package/dist/esm/map/Event.js

@@ -45,9 +45,12 @@ function dealWithMapType(type, event) {
   return obj[type];
 }
 var Event = /*#__PURE__*/function () {
+  // 存储所有事件订阅者
+
   function Event(map) {
     _classCallCheck(this, Event);
     _defineProperty(this, "_map", void 0);
+    _defineProperty(this, "_eventSubscriptions", new Map());
     this._map = map;
   }
 
@@ -86,37 +89,88 @@ var Event = /*#__PURE__*/function () {
       return pickedObject;
     }
 
+    // 发布
+  }, {
+    key: "_notifySubscribers",
+    value: function _notifySubscribers(type, e) {
+      if (this._eventSubscriptions.has(type)) {
+        var _subscriber$callbacks;
+        // 订阅器
+        var subscriber = this._eventSubscriptions.get(type);
+        (_subscriber$callbacks = subscriber.callbacks) === null || _subscriber$callbacks === void 0 || _subscriber$callbacks.forEach(function (callback) {
+          return callback(e);
+        });
+      }
+    }
+
+    // 订阅
+  }, {
+    key: "_subscribe",
+    value: function _subscribe(type, callback) {
+      var _this = this;
+      var self = this;
+      // 如果没有注册过该类型的事件处理器，则创建一个
+      if (!this._eventSubscriptions.has(type)) {
+        // 注册事件
+        var handler = new Cesium.ScreenSpaceEventHandler(this._map.scene.canvas);
+        handler.setInputAction(function (e) {
+          // 发布订阅
+          _this._notifySubscribers(type, e);
+        }, type);
+        handler.__proto__.off = function () {
+          handler.removeInputAction(type);
+        };
+        // 订阅器
+        var subscriber = {
+          handler: handler,
+          callbacks: new Set([callback])
+        };
+        subscriber.off = function () {
+          subscriber.callbacks.delete(callback);
+          // 如果没有订阅者了，移除处理器
+          if (subscriber.callbacks.size === 0) {
+            var _subscriber$handler;
+            (_subscriber$handler = subscriber.handler) === null || _subscriber$handler === void 0 || _subscriber$handler.off();
+            self._eventSubscriptions.delete(type);
+          }
+        };
+        this._eventSubscriptions.set(type, subscriber);
+        return subscriber;
+      } else {
+        // 订阅器
+        var _subscriber = this._eventSubscriptions.get(type);
+        // 订阅列表
+        _subscriber.callbacks.add(callback);
+        return _subscriber;
+      }
+    }
+
     // 监听地图事件
   }, {
     key: "listenToMap",
     value: function listenToMap(type, event) {
-      var _this = this;
-      var handler = new Cesium.ScreenSpaceEventHandler(this._map.scene.canvas);
-      handler.setInputAction(function (e) {
+      var _this2 = this;
+      return this._subscribe(type, function (e) {
         var _ref = dealWithMapType(type, e) || {},
           position = _ref.position;
         event({
-          position: _this._getPosition(position),
+          position: _this2._getPosition(position),
           original: e,
-          pickedObject: _this._getPickedObject(position)
+          pickedObject: _this2._getPickedObject(position)
         });
-      }, type);
-      handler.__proto__.off = function () {
-        handler.removeInputAction(type);
-      };
-      return handler;
+      });
     }
 
     // 监听镜头事件
   }, {
     key: "listenToCamera",
     value: function listenToCamera(type, event) {
-      var _this2 = this;
+      var _this3 = this;
       var self = this;
       var handler = function handler(e) {
         event({
           original: e,
-          position: _this2._map.getCameraView()
+          position: _this3._map.getCameraView()
         });
       };
       this._map.camera[type].addEventListener(handler);
@@ -145,24 +199,23 @@ var Event = /*#__PURE__*/function () {
   }, {
     key: "listenToLayer",
     value: function listenToLayer(type, event, layer) {
-      var _this3 = this;
-      var handler = new Cesium.ScreenSpaceEventHandler(this._map.scene.canvas);
+      var _this4 = this;
       var isHoverLayer = null;
       var toLeave = function toLeave(e, position) {
         if (isHoverLayer && type === Cesium.ScreenSpaceEventType.MOUSE_MOVE) {
           event({
             original: e,
-            position: _this3._getPosition(position),
+            position: _this4._getPosition(position),
             layer: isHoverLayer,
             mouseType: 'mouseLeave'
           });
           isHoverLayer = null;
         }
       };
-      handler.setInputAction(function (e) {
+      return this._subscribe(type, function (e) {
         var _ref2 = dealWithMapType(type, e) || {},
           position = _ref2.position;
-        var pickedObject = _this3._getPickedObject(position);
+        var pickedObject = _this4._getPickedObject(position);
         if (pickedObject) {
           var currLayer;
           if (layer.isEntity) {
@@ -178,7 +231,7 @@ var Event = /*#__PURE__*/function () {
           if (currLayer) {
             var result = {
               original: e,
-              position: _this3._getPosition(position),
+              position: _this4._getPosition(position),
               layer: currLayer
             };
             if (type === Cesium.ScreenSpaceEventType.MOUSE_MOVE) {
@@ -192,23 +245,18 @@ var Event = /*#__PURE__*/function () {
         } else {
           toLeave(e, position);
         }
-      }, type);
-      handler.__proto__.off = function () {
-        handler.removeInputAction(type);
-      };
-      return handler;
+      });
     }
 
     // 监听点聚合
   }, {
     key: "listenToPointCluster",
     value: function listenToPointCluster(type, event, cluster) {
-      var _this4 = this;
-      var handler = new Cesium.ScreenSpaceEventHandler(this._map.scene.canvas);
-      handler.setInputAction(function (e) {
+      var _this5 = this;
+      return this._subscribe(type, function (e) {
         var _ref3 = dealWithMapType(type, e) || {},
           position = _ref3.position;
-        var pickedObject = _this4._getPickedObject(position);
+        var pickedObject = _this5._getPickedObject(position);
         if (pickedObject) {
           var clusterPoints = cluster.billboards.filter(function (t) {
             return ((pickedObject === null || pickedObject === void 0 ? void 0 : pickedObject.id) || []).includes(t.id);
@@ -216,49 +264,45 @@ var Event = /*#__PURE__*/function () {
           if (clusterPoints) {
             event({
               original: e,
-              position: _this4._getPosition(position),
+              position: _this5._getPosition(position),
               clusterPoints: clusterPoints
             });
           }
         }
-      }, type);
-      handler.__proto__.off = function () {
-        handler.removeInputAction(type);
-      };
-      return handler;
+      });
     }
 
     // 监听模型漫游
   }, {
     key: "listenToModelRoam",
     value: function listenToModelRoam(type, event, modelRoam) {
-      var _this5 = this;
-      var handler = new Cesium.ScreenSpaceEventHandler(this._map.scene.canvas);
+      var _this6 = this;
       var isHoverLayer = null;
       var toLeave = function toLeave(e, position) {
         if (isHoverLayer && type === Cesium.ScreenSpaceEventType.MOUSE_MOVE) {
           event({
             original: e,
-            position: _this5._getPosition(position),
+            position: _this6._getPosition(position),
             modelRoam: isHoverLayer,
             mouseType: 'mouseLeave'
           });
           isHoverLayer = null;
         }
       };
-      handler.setInputAction(function (e) {
+      return this._subscribe(type, function (e) {
         var _ref4 = dealWithMapType(type, e) || {},
           position = _ref4.position;
-        var pickedObject = _this5._getPickedObject(position);
+        var pickedObject = _this6._getPickedObject(position);
         if (pickedObject) {
-          var _modelRoam$polylineLa, _pickedObject$id2, _modelRoam$modelLayer;
-          var targetPolyline = (modelRoam === null || modelRoam === void 0 || (_modelRoam$polylineLa = modelRoam.polylineLayer) === null || _modelRoam$polylineLa === void 0 ? void 0 : _modelRoam$polylineLa.id) === (pickedObject === null || pickedObject === void 0 || (_pickedObject$id2 = pickedObject.id) === null || _pickedObject$id2 === void 0 ? void 0 : _pickedObject$id2.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 _modelRoam$polylineLa, _modelRoam$polylineLa2, _pickedObject$id2, _modelRoam$historyPol, _modelRoam$historyPol2, _pickedObject$id3, _modelRoam$modelLayer, _modelRoam$modelLayer2;
+          var targetPolyline = modelRoam !== null && modelRoam !== void 0 && (_modelRoam$polylineLa = modelRoam.polylineLayer) !== null && _modelRoam$polylineLa !== void 0 && _modelRoam$polylineLa.id ? (modelRoam === null || modelRoam === void 0 || (_modelRoam$polylineLa2 = modelRoam.polylineLayer) === null || _modelRoam$polylineLa2 === void 0 ? void 0 : _modelRoam$polylineLa2.id) === (pickedObject === null || pickedObject === void 0 || (_pickedObject$id2 = pickedObject.id) === null || _pickedObject$id2 === void 0 ? void 0 : _pickedObject$id2.id) : null;
+          var targetHistoryPolyline = modelRoam !== null && modelRoam !== void 0 && (_modelRoam$historyPol = modelRoam.historyPolylineLayer) !== null && _modelRoam$historyPol !== void 0 && _modelRoam$historyPol.id ? (modelRoam === null || modelRoam === void 0 || (_modelRoam$historyPol2 = modelRoam.historyPolylineLayer) === null || _modelRoam$historyPol2 === void 0 ? void 0 : _modelRoam$historyPol2.id) === (pickedObject === null || pickedObject === void 0 || (_pickedObject$id3 = pickedObject.id) === null || _pickedObject$id3 === void 0 ? void 0 : _pickedObject$id3.id) : null;
+          var targetModel = modelRoam !== null && modelRoam !== void 0 && (_modelRoam$modelLayer = modelRoam.modelLayer) !== null && _modelRoam$modelLayer !== void 0 && _modelRoam$modelLayer.id ? (modelRoam === null || modelRoam === void 0 || (_modelRoam$modelLayer2 = modelRoam.modelLayer) === null || _modelRoam$modelLayer2 === void 0 ? void 0 : _modelRoam$modelLayer2.id) === (pickedObject === null || pickedObject === void 0 ? void 0 : pickedObject.id) : null;
+          if (targetHistoryPolyline || targetPolyline || targetModel) {
             var result = {
               original: e,
-              position: _this5._getPosition(position),
-              targetType: targetPolyline ? 'polyline' : targetModel ? 'model' : '',
+              position: _this6._getPosition(position),
+              targetType: targetPolyline || targetHistoryPolyline ? 'polyline' : targetModel ? 'model' : '',
               modelRoam: modelRoam
             };
             if (type === Cesium.ScreenSpaceEventType.MOUSE_MOVE) {
@@ -272,11 +316,7 @@ var Event = /*#__PURE__*/function () {
         } else {
           toLeave(e, position);
         }
-      }, type);
-      handler.__proto__.off = function () {
-        handler.removeInputAction(type);
-      };
-      return handler;
+      });
     }
   }]);
   return Event;