deeptwins-engine-3d 0.1.40 → 0.1.42

package/dist/esm/tileLayer/BarrierLayer.js

@@ -14,6 +14,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 * as utils from "../tool/utils";
 
 /**
  * 障碍物图层 - 基于MVT数据渲染障碍物网格
@@ -32,7 +33,7 @@ import * as Cesium from 'deeptwins-cesium';
 var BarrierLayer = /*#__PURE__*/function () {
   /**
    * 创建障碍物图层
-   * @param viewer Cesium Viewer实例
+   * @param map Cesium Viewer实例
    * @param options 配置选项
    * @param options.gridVTLayer GridVTLayer类（从DeepTwins.onLoad中获取）
    * @param options.url MVT数据URL模板，默认为障碍物数据地址
@@ -44,15 +45,16 @@ var BarrierLayer = /*#__PURE__*/function () {
    * @param options.minHeight 最小高度（米），低于此高度的障碍物不渲染，默认0
    * @param options.maxHeight 最大高度（米），高于此高度的障碍物不渲染，默认Infinity
    */
-  function BarrierLayer(viewer) {
+  function BarrierLayer(map) {
     var _this = this;
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     _classCallCheck(this, BarrierLayer);
+    _defineProperty(this, "_mapContext", void 0);
+    _defineProperty(this, "isDestroyed", false);
     _defineProperty(this, "_gridVTLayer", null);
-    _defineProperty(this, "_viewer", null);
     _defineProperty(this, "_options", {});
     _defineProperty(this, "_heightColors", []);
-    this._viewer = viewer;
+    this._mapContext = map._mapContext;
     if (!options.gridVTLayer) {
       console.error('BarrierLayer: 请提供gridVTLayer参数，可通过DeepTwins.onLoad获取');
       return;
@@ -85,7 +87,7 @@ var BarrierLayer = /*#__PURE__*/function () {
     // 创建 GridVTLayer
     var customPrimitiveCallbacks = {
       createPrimitives: function createPrimitives(tileNum, renderData, viewer) {
-        var targetViewer = viewer || _this._viewer;
+        var targetViewer = viewer || _this.getMap();
         return _this._createPrimitives(tileNum, renderData, targetViewer);
       },
       destroyPrimitives: function destroyPrimitives(tileNum, primitives) {
@@ -102,7 +104,7 @@ var BarrierLayer = /*#__PURE__*/function () {
       }
     };
     this._gridVTLayer = new GridVTLayer({
-      viewer: this._viewer,
+      viewer: this.getMap(),
       url: this._options.url,
       cacheSize: this._options.cacheSize,
       dataZooms: this._options.dataZooms,
@@ -119,11 +121,27 @@ var BarrierLayer = /*#__PURE__*/function () {
     }
   }
 
-  /**
-   * 创建primitives
-   * 按照示例代码的逻辑实现，每个feature创建一个障碍物实例
-   */
+  // 是否能进行操作
   _createClass(BarrierLayer, [{
+    key: "_canOperate",
+    value: function _canOperate() {
+      if (this.isDestroyed) {
+        utils.error('SubmergenceAnalysis实例已销毁');
+        return false;
+      }
+      return true;
+    }
+  }, {
+    key: "getMap",
+    value: function getMap() {
+      return this._mapContext && this._mapContext.getMap();
+    }
+
+    /**
+     * 创建primitives
+     * 按照示例代码的逻辑实现，每个feature创建一个障碍物实例
+     */
+  }, {
     key: "_createPrimitives",
     value: function _createPrimitives(tileNum, renderData, viewer) {
       var features = (renderData === null || renderData === void 0 ? void 0 : renderData.default) || [];
@@ -169,7 +187,7 @@ var BarrierLayer = /*#__PURE__*/function () {
             closed: true
           })
         });
-        var targetViewer = viewer || this._viewer;
+        var targetViewer = viewer || this.getMap();
         targetViewer.scene.primitives.add(primitive);
         primitives.push(primitive);
       }
@@ -186,8 +204,7 @@ var BarrierLayer = /*#__PURE__*/function () {
       if (!(primitives !== null && primitives !== void 0 && primitives.length)) return;
       primitives.forEach(function (primitive) {
         primitive.show = false;
-        _this2._viewer.scene.primitives.remove(primitive);
-        primitive.destroy();
+        _this2.getMap().scene.primitives.remove(primitive);
       });
       primitives.length = 0;
     }

package/dist/esm/tool/Compass.js

@@ -65,17 +65,25 @@ var Compass = /*#__PURE__*/function () {
       el.appendChild(bg);
       var leftDirection = document.createElement('img');
       leftDirection.className = 'deeptwins-compass-left-direction';
-      leftDirection.src = getDeepTwinsFile('Image/compass/compass-direction-left.png');
+      var leftDirectionImg = getDeepTwinsFile('Image/compass/compass-direction-left.png');
+      var leftDirectionActiveImg = getDeepTwinsFile('Image/compass/compass-direction-left-active.png');
+      leftDirection.src = leftDirectionImg;
       el.appendChild(leftDirection);
 
       // 左箭头持续旋转
+      leftDirection.onmouseenter = function () {
+        leftDirection.src = leftDirectionActiveImg;
+      };
       leftDirection.onmousedown = function () {
+        leftDirection.src = leftDirectionActiveImg;
         _this2._startContinuousRotation(1);
       };
       leftDirection.onmouseup = function () {
+        leftDirection.src = leftDirectionImg;
         _this2._stopContinuousRotation();
       };
       leftDirection.onmouseleave = function () {
+        leftDirection.src = leftDirectionImg;
         _this2._stopContinuousRotation();
       };
       this.compassEl.leftDirection = leftDirection;
@@ -86,44 +94,68 @@ var Compass = /*#__PURE__*/function () {
       this.compassEl.pointer = pointer;
       var rightDirection = document.createElement('img');
       rightDirection.className = 'deeptwins-compass-right-direction';
-      rightDirection.src = getDeepTwinsFile('Image/compass/compass-direction-right.png');
+      var rightDirectionImg = getDeepTwinsFile('Image/compass/compass-direction-right.png');
+      var rightDirectionActiveImg = getDeepTwinsFile('Image/compass/compass-direction-right-active.png');
+      rightDirection.src = rightDirectionImg;
       el.appendChild(rightDirection);
       // 右箭头持续旋转
+      rightDirection.onmouseenter = function () {
+        rightDirection.src = rightDirectionActiveImg;
+      };
       rightDirection.onmousedown = function () {
+        rightDirection.src = rightDirectionActiveImg;
         _this2._startContinuousRotation(-1);
       };
       rightDirection.onmouseup = function () {
+        rightDirection.src = rightDirectionImg;
         _this2._stopContinuousRotation();
       };
       rightDirection.onmouseleave = function () {
+        rightDirection.src = rightDirectionImg;
         _this2._stopContinuousRotation();
       };
       this.compassEl.rightDirection = rightDirection;
       var pitchUp = document.createElement('img');
       pitchUp.className = 'deeptwins-compass-pitch-up';
-      pitchUp.src = getDeepTwinsFile('Image/compass/compass-pitch-up.png');
+      var pitchUpImg = getDeepTwinsFile('Image/compass/compass-pitch-up.png');
+      var pitchUpActiveImg = getDeepTwinsFile('Image/compass/compass-pitch-up-active.png');
+      pitchUp.src = pitchUpImg;
       el.appendChild(pitchUp);
+      pitchUp.onmouseenter = function () {
+        pitchUp.src = pitchUpActiveImg;
+      };
       pitchUp.onmousedown = function () {
+        pitchUp.src = pitchUpActiveImg;
         _this2._startContinuousPitch(1);
       };
       pitchUp.onmouseup = function () {
+        pitchUp.src = pitchUpImg;
         _this2._stopContinuousPitch();
       };
       pitchUp.onmouseleave = function () {
+        pitchUp.src = pitchUpImg;
         _this2._stopContinuousPitch();
       };
       this.compassEl.pitchUp = pitchUp;
       var pitchDown = document.createElement('img');
       pitchDown.className = 'deeptwins-compass-pitch-down';
-      pitchDown.src = getDeepTwinsFile('Image/compass/compass-pitch-down.png');
+      var pitchDownImg = getDeepTwinsFile('Image/compass/compass-pitch-down.png');
+      var pitchDownActiveImg = getDeepTwinsFile('Image/compass/compass-pitch-down-active.png');
+      pitchDown.src = pitchDownImg;
       el.appendChild(pitchDown);
+      pitchDown.onmouseenter = function () {
+        pitchDown.src = pitchDownActiveImg;
+      };
       pitchDown.onmousedown = function () {
+        pitchDown.src = pitchDownActiveImg;
         _this2._startContinuousPitch(-1);
       };
       pitchDown.onmouseup = function () {
+        pitchDown.src = pitchDownImg;
         _this2._stopContinuousPitch();
       };
       pitchDown.onmouseleave = function () {
+        pitchDown.src = pitchDownImg;
         _this2._stopContinuousPitch();
       };
       this.compassEl.pitchDown = pitchDown;

package/dist/esm/tool/PrimitiveCluster.js

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import * as Cesium from 'deeptwins-cesium';
-import { Billboard, BillboardCollection, BoundingRectangle, Cartesian2, Cartesian3, defaultValue, defined, Event, Label, LabelCollection, Matrix4, PointPrimitive, PointPrimitiveCollection, SceneMode } from 'deeptwins-cesium';
+import { Billboard, BillboardCollection, BoundingRectangle, Cartesian2, Cartesian3, defined, Event, Label, LabelCollection, Matrix4, PointPrimitive, PointPrimitiveCollection, SceneMode } from 'deeptwins-cesium';
 import KDBush from 'kdbush';
 
 /**
@@ -21,13 +21,14 @@ import KDBush from 'kdbush';
  * @demo {@link https://sandcastle.cesium.com/index.html?src=Clustering.html|Cesium Sandcastle Clustering Demo}
  */
 function PrimitiveCluster(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
-  this._enabled = defaultValue(options.enabled, false);
-  this._pixelRange = defaultValue(options.pixelRange, 80);
-  this._minimumClusterSize = defaultValue(options.minimumClusterSize, 2);
-  this._clusterBillboards = defaultValue(options.clusterBillboards, true);
-  this._clusterLabels = defaultValue(options.clusterLabels, true);
-  this._clusterPoints = defaultValue(options.clusterPoints, true);
+  var _options, _options$enabled, _options$pixelRange, _options$minimumClust, _options$clusterBillb, _options$clusterLabel, _options$clusterPoint, _options$show;
+  options = (_options = options) !== null && _options !== void 0 ? _options : {};
+  this._enabled = (_options$enabled = options.enabled) !== null && _options$enabled !== void 0 ? _options$enabled : false;
+  this._pixelRange = (_options$pixelRange = options.pixelRange) !== null && _options$pixelRange !== void 0 ? _options$pixelRange : 80;
+  this._minimumClusterSize = (_options$minimumClust = options.minimumClusterSize) !== null && _options$minimumClust !== void 0 ? _options$minimumClust : 2;
+  this._clusterBillboards = (_options$clusterBillb = options.clusterBillboards) !== null && _options$clusterBillb !== void 0 ? _options$clusterBillb : true;
+  this._clusterLabels = (_options$clusterLabel = options.clusterLabels) !== null && _options$clusterLabel !== void 0 ? _options$clusterLabel : true;
+  this._clusterPoints = (_options$clusterPoint = options.clusterPoints) !== null && _options$clusterPoint !== void 0 ? _options$clusterPoint : true;
   this._labelCollection = undefined;
   this._billboardCollection = undefined;
   this._pointCollection = undefined;
@@ -52,7 +53,7 @@ function PrimitiveCluster(options) {
    * @type {boolean}
    * @default true
    */
-  this.show = defaultValue(options.show, true);
+  this.show = (_options$show = options.show) !== null && _options$show !== void 0 ? _options$show : true;
 }
 function expandBoundingBox(bbox, pixelRange) {
   bbox.x -= pixelRange;