deeptwins-engine-3d 0.0.43 → 0.0.44

package/dist/constant.d.ts

@@ -36,6 +36,9 @@ export declare const DEFAULT_VIEW_CONFIG: () => {
         fog: boolean;
         skyAtmosphere: boolean;
         requestRenderMode: boolean;
+        postProcessStages: {
+            fxaa: boolean;
+        };
     };
     globe: {
         show: boolean;
@@ -116,7 +119,6 @@ export declare const DEFAULT_DYNAMIC_WALL_MATERIAL_STYLE: any;
 export declare const DEFAULT_CIRCLE_WAVE_MATERIAL_STYLE: any;
 export declare const GRAPHIC_LAYER_TYPE_TO_CLASS: any;
 export declare const DEFAULT_YJ_LAYER: any;
-export declare const DEFAULT_YJ_PICK: any;
 export declare const DEFAULT_SNOW: () => {
     size: number;
     speed: number;

package/dist/constant.js

@@ -66,7 +66,10 @@ export var DEFAULT_VIEW_CONFIG = function DEFAULT_VIEW_CONFIG() {
       showSkyBox: true,
       fog: true,
       skyAtmosphere: true,
-      requestRenderMode: false
+      requestRenderMode: false,
+      postProcessStages: {
+        fxaa: false
+      }
     },
     globe: {
       show: true,
@@ -409,7 +412,6 @@ export var DEFAULT_YJ_LAYER = function DEFAULT_YJ_LAYER() {
   return {
     url: 'https://deepinnet-public-qz.oss-cn-hangzhou.aliyuncs.com/quzhou/tileset02.json',
     depthTest: true,
-    // needSegment: true,
     filter: {
       saturate: 1,
       brightness: 1
@@ -417,24 +419,6 @@ export var DEFAULT_YJ_LAYER = function DEFAULT_YJ_LAYER() {
   };
 };
 
-// 默认的yunjing图层配置
-export var DEFAULT_YJ_PICK = function DEFAULT_YJ_PICK() {
-  return {
-    inPointStyle: {
-      borderWidth: 4
-    },
-    polygonStyle: {
-      color: 'rgba(255, 0, 0, 0.4)'
-    },
-    model: {
-      wasmPaths: 'https://amappc.oss-cn-zhangjiakou.aliyuncs.com/gis/static/yunjing/static/onnx/',
-      encoderUrl: 'https://amappc.oss-cn-zhangjiakou.aliyuncs.com/gis/static/yunjing/static/onnx/sam_vit_b_01ec64.encoder-fp16.onnx',
-      decoderUrl: 'https://amappc.oss-cn-zhangjiakou.aliyuncs.com/gis/static/yunjing/static/onnx/sam_vit_b_01ec64.decoder.onnx',
-      name: 'test'
-    }
-  };
-};
-
 // 默认雪天配置
 export var DEFAULT_SNOW = function DEFAULT_SNOW() {
   return {

package/dist/deepTwins/index.d.ts

@@ -11,7 +11,4 @@ export default class DeepTwins {
     _getModuleLayer(options: any): {
         addToMap: (map: any) => any;
     };
-    _getSinglePick(options: any): {
-        addToMap: (map: any, layer: any) => any;
-    };
 }

package/dist/deepTwins/index.js

@@ -9,7 +9,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 { merge } from 'lodash';
-import { DEFAULT_YJ_LAYER, DEFAULT_YJ_PICK } from "../constant";
+import { DEFAULT_YJ_LAYER } from "../constant";
 import * as utils from "../tool/utils";
 var DeepTwins = /*#__PURE__*/function () {
   function DeepTwins() {
@@ -39,8 +39,7 @@ var DeepTwins = /*#__PURE__*/function () {
                   terrain: this._getTerrain.bind(this),
                   moduleLayer: this._getModuleLayer.bind(this),
                   trafficHistoryLayer: this._YunJing.TrafficHistoryLayer,
-                  trafficLayer: this._YunJing.TrafficLayer,
-                  singlePick: this._getSinglePick.bind(this)
+                  trafficLayer: this._YunJing.TrafficLayer
                 });
               }
             case 5:
@@ -97,21 +96,6 @@ var DeepTwins = /*#__PURE__*/function () {
         }
       };
     }
-
-    // 单体拾取
-  }, {
-    key: "_getSinglePick",
-    value: function _getSinglePick(options) {
-      var _this2 = this;
-      var mergeOptions = merge(DEFAULT_YJ_PICK(), options);
-      return {
-        addToMap: function addToMap(map, layer) {
-          mergeOptions.viewer = map;
-          mergeOptions.layer = layer;
-          return new _this2._YunJing.SinglePick(mergeOptions);
-        }
-      };
-    }
   }]);
   return DeepTwins;
 }();

package/dist/drawer/base.js

@@ -105,7 +105,7 @@ var BasicGraphics = /*#__PURE__*/function () {
           data = this.result.position;
           break;
       }
-      this.result = this.painter._viewer.addGraphicEntityToLayer(data, {
+      this.result = this.painter._viewer.addCustomSourceToGraphicLayer(data, {
         type: this.painter._type,
         id: this.result.id,
         entity: this.result

package/dist/drawer/index.js

@@ -244,7 +244,7 @@ var Drawer = /*#__PURE__*/function () {
         // 如果是点，则此时执行点的结束绘制操作
         if (_this._type === 'point') {
           var _this$$Instance;
-          _this._typeClass.result = _this._viewer.addGraphicEntityToLayer(_this._typeClass.result.position, {
+          _this._typeClass.result = _this._viewer.addCustomSourceToGraphicLayer(_this._typeClass.result.position, {
             type: _this._type,
             id: _this._typeClass.result.id,
             entity: _this._typeClass.result

package/dist/graphicLayer/BaseLayer.d.ts

@@ -9,7 +9,7 @@ export default class BaseLayer {
     isEntity: boolean;
     isPrimitive: boolean;
     private _isCompleteInfo;
-    private _renderClass;
+    private readonly _renderClass;
     private _graphicLayerCollection;
     constructor({ id, source, options, entity, graphicLayerCollection }: any);
     private _createPrimitiveCollection;

package/dist/graphicLayer/BaseLayer.js

@@ -13,6 +13,7 @@ import { v4 as uuidv4 } from 'uuid';
 import * as constant from "../constant";
 import BaseSource from "../graphicLayer/BaseSource";
 import * as utils from "../tool/utils";
+import { cameraFlyToPositions } from "../tool/utils";
 import BoxPrimitive from "./BoxPrimitive";
 import EllipsePrimitive from "./EllipsePrimitive";
 import EllipsoidPrimitive from "./EllipsoidPrimitive";
@@ -21,7 +22,6 @@ import PolygonPrimitive from "./PolygonPrimitive";
 import PolylinePrimitive from "./PolylinePrimitive";
 import PolylineVolumePrimitive from "./PolylineVolumePrimitive";
 import WallPrimitive from "./WallPrimitive";
-import { cameraFlyToPositions } from "../tool/utils";
 var BaseLayer = /*#__PURE__*/function () {
   function BaseLayer(_ref) {
     var _this = this;

package/dist/graphicLayer/BaseSource.d.ts

@@ -7,7 +7,7 @@ export default class BaseSource {
     private _graphicLayerCollection;
     static HANDLE_FEATURE_TYPE_FUN: any;
     static HANDLE_FEATURE_CLAMP_TYPE_FUN: any;
-    constructor({ id, source, entitySource, graphicLayerCollection }: any);
+    constructor({ id, source, customSource, graphicLayerCollection }: any);
     private _canOperate;
     private _handleGeoJson;
     translateSource(source: any): void;

package/dist/graphicLayer/BaseSource.js

@@ -30,7 +30,7 @@ var BaseSource = /*#__PURE__*/function () {
   function BaseSource(_ref) {
     var id = _ref.id,
       source = _ref.source,
-      entitySource = _ref.entitySource,
+      customSource = _ref.customSource,
       graphicLayerCollection = _ref.graphicLayerCollection;
     _classCallCheck(this, BaseSource);
     _defineProperty(this, "id", void 0);
@@ -43,11 +43,9 @@ var BaseSource = /*#__PURE__*/function () {
     this.id = id;
     this._graphicLayerCollection = graphicLayerCollection;
     // 直接添加实体数据
-    if (entitySource) {
+    if (customSource) {
       this._isCompleteInfo = false;
-      this.source.push({
-        positions: entitySource
-      });
+      this.source.push(customSource);
     } else {
       this.translateSource(source);
     }
@@ -236,7 +234,7 @@ var BaseSource = /*#__PURE__*/function () {
       return features;
     }
 
-    // 对geoJson数据进行处理 返回带Cartesian3坐标数据的数组
+    // 对geoJson数据进行贴地处理 返回带Cartesian3坐标数据的数组
   }, {
     key: "geoJsonToClampCartesian3Array",
     value: function () {

package/dist/graphicLayer/GraphicLayerCollection.d.ts

@@ -8,9 +8,10 @@ export default class GraphicLayerCollection {
     constructor(map: any);
     private _canOperate;
     addSource(id: string, geoJson: any): BaseSource;
-    addEntitySource(id: string, positions: any): BaseSource;
+    addCustomSource(id: string, positions: any): BaseSource;
     addLayer(data: any, options: any): BaseLayer;
-    addEntityToLayer(positions: any, options: any): BaseLayer;
+    addCustomSourceToLayer(positions: any, options: any): BaseLayer;
+    private _addLayerToMap;
     private _removeGraphicMapLayer;
     private _removeGraphicMapSource;
     private _clearGraphicMapLayer;

package/dist/graphicLayer/GraphicLayerCollection.js

@@ -11,7 +11,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { flattenDeep } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import * as utils from "../tool/utils";
-import { isArray, cameraFlyToPositions } from "../tool/utils";
+import { cameraFlyToPositions, isArray } from "../tool/utils";
 import BaseLayer from "./BaseLayer";
 import BaseSource from "./BaseSource";
 var GraphicLayerCollection = /*#__PURE__*/function () {
@@ -54,10 +54,10 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
       return source;
     }
 
-    // 直接添加entity数据
+    // 直接添加自定义数据
   }, {
-    key: "addEntitySource",
-    value: function addEntitySource(id, positions) {
+    key: "addCustomSource",
+    value: function addCustomSource(id, positions) {
       this._canOperate();
       var uuid = id;
       if (this.graphicSources.get(uuid)) {
@@ -66,7 +66,7 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
       }
       var source = new BaseSource({
         id: uuid,
-        entitySource: positions,
+        customSource: positions,
         graphicLayerCollection: this
       });
       this.graphicSources.set(source.id, source);
@@ -77,7 +77,6 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "addLayer",
     value: function addLayer(data, options) {
-      var _this = this;
       this._canOperate();
       var _ref = options || {},
         id = _ref.id;
@@ -103,39 +102,17 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
         graphicLayerCollection: this
       });
       // 添加到地图上
-      if (layer.isEntity) {
-        layer.layers.forEach(function (t) {
-          if (t.entity) {
-            _this._map.entities.add(t.entity);
-          }
-        });
-      } else {
-        if (['pointP', 'billboardP', 'labelP'].includes(options.type)) {
-          this._map.scene.primitives.add(layer.primitiveCollection);
-        } else {
-          this._map.scene.primitives.add(layer.primitiveCollection.primitive);
-        }
-      }
-      this.graphicLayers.set(layer.id, layer);
+      this._addLayerToMap(layer, options);
       return layer;
     }
 
-    // 直接添加entity到图层
+    // 添加图层自定义数据
   }, {
-    key: "addEntityToLayer",
-    value: function addEntityToLayer(positions, options) {
-      var _this2 = this;
+    key: "addCustomSourceToLayer",
+    value: function addCustomSourceToLayer(positions, options) {
       this._canOperate();
       var uuid = uuidv4();
-      var source = null;
-      var sourceType = BaseSource.analysisSourceType(positions);
-      if (sourceType === 'sourceInstance') {
-        source = positions;
-      } else if (sourceType === 'sourceId') {
-        source = this.graphicSources.get(positions);
-      } else {
-        source = this.addEntitySource(uuid, positions);
-      }
+      var source = this.addCustomSource(uuid, positions);
       // 生成graphicLayer
       var layer = new BaseLayer({
         id: uuid,
@@ -144,13 +121,29 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
         graphicLayerCollection: this
       });
       // 添加到地图上
-      layer.layers.forEach(function (t) {
-        if (t.entity) {
-          _this2._map.entities.add(t.entity);
+      this._addLayerToMap(layer, options);
+      return layer;
+    }
+
+    // 将layer添加到地图上
+  }, {
+    key: "_addLayerToMap",
+    value: function _addLayerToMap(layer, options) {
+      var _this = this;
+      if (layer.isEntity) {
+        layer.layers.forEach(function (t) {
+          if (t.entity) {
+            _this._map.entities.add(t.entity);
+          }
+        });
+      } else {
+        if (['pointP', 'billboardP', 'labelP'].includes(options.type)) {
+          this._map.scene.primitives.add(layer.primitiveCollection);
+        } else {
+          this._map.scene.primitives.add(layer.primitiveCollection.primitive);
         }
-      });
+      }
       this.graphicLayers.set(layer.id, layer);
-      return layer;
     }
 
     // 删除graphicLayers上的数据
@@ -359,11 +352,11 @@ var GraphicLayerCollection = /*#__PURE__*/function () {
   }, {
     key: "flyToLayers",
     value: function flyToLayers(layers, options) {
-      var _this3 = this;
+      var _this2 = this;
       this._canOperate();
       if (isArray(layers)) {
         var graphicLayers = layers.map(function (layer) {
-          return _this3.getLayer(layer);
+          return _this2.getLayer(layer);
         });
         var positions = flattenDeep(graphicLayers.map(function (t) {
           return t.layers.map(function (p) {

package/dist/graphicLayer/PolylinePrimitiveInstance.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["style", "source", "entity"],
+var _excluded = ["style"],
   _excluded2 = ["color"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -32,10 +32,7 @@ var PolylinePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
     var _this;
     _classCallCheck(this, PolylinePrimitiveInstance);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
-      entity = options.entity,
       currOptions = _objectWithoutProperties(options, _excluded);
     var mergeStyle = merge(DEFAULT_POLYLINE_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = PolylinePrimitiveInstance.handleOptions(mergeStyle);
@@ -54,12 +51,11 @@ var PolylinePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
       var _options$style = options.style,
         color = _options$style.color,
         width = _options$style.width,
-        positions = options.positions,
         primitiveCollection = options.primitiveCollection;
       this.instance = new Cesium.GeometryInstance({
         id: this.id,
         geometry: new Cesium.PolylineGeometry({
-          positions: positions,
+          positions: this.source.positions,
           width: width,
           vertexFormat: Cesium.PolylineMaterialAppearance.VERTEX_FORMAT
         }),

package/dist/index.d.ts

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

package/dist/index.js

@@ -10,7 +10,6 @@ import * as Cesium from 'deeptwins-cesium';
 import "./assets/Build/Map3d/Widgets/widgets.css";
 import ModelRoamHistory from "./cameraControl/ModelRoamHistory";
 import ModelRoamRealTime from "./cameraControl/ModelRoamRealTime";
-import ModelRoamRunTime from "./cameraControl/ModelRoamRunTime";
 import Roam from "./cameraControl/Roam";
 import Rotate from "./cameraControl/Rotate";
 import RotateInPlace from "./cameraControl/RotateInPlace";
@@ -45,7 +44,7 @@ window.Cesium = Cesium;
 var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", '0.0.43');
+_defineProperty(DeepTwinsEngine3D, "Version", '0.0.44');
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);
@@ -60,7 +59,6 @@ _defineProperty(DeepTwinsEngine3D, "Rotate", Rotate);
 _defineProperty(DeepTwinsEngine3D, "Roam", Roam);
 _defineProperty(DeepTwinsEngine3D, "RotateInPlace", RotateInPlace);
 _defineProperty(DeepTwinsEngine3D, "ModelRoamHistory", ModelRoamHistory);
-_defineProperty(DeepTwinsEngine3D, "ModelRoamRunTime", ModelRoamRunTime);
 _defineProperty(DeepTwinsEngine3D, "ModelRoamRealTime", ModelRoamRealTime);
 _defineProperty(DeepTwinsEngine3D, "TimerInterval", TimerInterval);
 _defineProperty(DeepTwinsEngine3D, "ShapeSection", ShapeSection);

package/dist/map/Map.d.ts

@@ -40,7 +40,7 @@ export default class Map extends Cesium.Viewer {
     addGraphicSource(id: string, data: any): any;
     addGraphicEntityToSource(id: string, data: any): any;
     addGraphicLayer(data: any, options: any): any;
-    addGraphicEntityToLayer(data: any, options: any): any;
+    addCustomSourceToGraphicLayer(data: any, options: any): any;
     getGraphicSource(id: any): any;
     getGraphicLayer(id: any): any;
     showGraphicLayer(layer: any, isShow: boolean): void;

package/dist/map/Map.js

@@ -201,6 +201,7 @@ var Map = /*#__PURE__*/function (_Cesium$Viewer) {
         fog = _options$scene2.fog,
         skyAtmosphere = _options$scene2.skyAtmosphere,
         requestRenderMode = _options$scene2.requestRenderMode,
+        postProcessStages = _options$scene2.postProcessStages,
         _options$clock = options.clock,
         _options$clock2 = _options$clock === void 0 ? {} : _options$clock,
         currentTime = _options$clock2.currentTime,
@@ -231,6 +232,11 @@ var Map = /*#__PURE__*/function (_Cesium$Viewer) {
       !isNil(fog) && (this.scene.fog.enabled = fog);
       !isNil(skyAtmosphere) && (this.scene.skyAtmosphere.show = skyAtmosphere);
       !isNil(requestRenderMode) && (this.scene.requestRenderMode = requestRenderMode);
+      if (!isNil(postProcessStages)) {
+        for (var key in postProcessStages) {
+          this.scene.postProcessStages[key].enabled = postProcessStages[key];
+        }
+      }
 
       // clock
       !isNil(currentTime) && (this.clock.currentTime = utils.dateToJulianDate(currentTime));
@@ -238,8 +244,8 @@ var Map = /*#__PURE__*/function (_Cesium$Viewer) {
       !isNil(shouldAnimate) && (this.clock.shouldAnimate = shouldAnimate);
 
       // cameraController
-      for (var key in cameraController) {
-        this.scene.screenSpaceCameraController[key] = cameraController[key];
+      for (var _key in cameraController) {
+        this.scene.screenSpaceCameraController[_key] = cameraController[_key];
       }
 
       // globe
@@ -458,14 +464,14 @@ var Map = /*#__PURE__*/function (_Cesium$Viewer) {
       return this.graphicLayerCollection.addLayer(data, options);
     }
 
-    // 直接添加entity对象到图层
+    // 直接自定义数据到图层
   }, {
-    key: "addGraphicEntityToLayer",
-    value: function addGraphicEntityToLayer(data, options) {
+    key: "addCustomSourceToGraphicLayer",
+    value: function addCustomSourceToGraphicLayer(data, options) {
       if (!this.graphicLayerCollection) {
         this.graphicLayerCollection = new GraphicLayerCollection(this);
       }
-      return this.graphicLayerCollection.addEntityToLayer(data, options);
+      return this.graphicLayerCollection.addCustomSourceToLayer(data, options);
     }
 
     // 获取矢量数据

package/package.json

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

package/dist/cameraControl/ModelRoamRunTime.d.ts

@@ -1,32 +0,0 @@
-export default class ModelRoamRunTime {
-    polylineLayer: any;
-    polylineEntity: any;
-    polylineOptions: any;
-    modelLayer: any;
-    modelEntity: any;
-    modelOptions: any;
-    startPosition: any;
-    positionProperty: any;
-    isFlyTo: any;
-    clampToGround: boolean;
-    timeDiff: number;
-    status: string;
-    private _map;
-    private readonly _eventRunning;
-    private _startTime;
-    private _positions;
-    private _positionsCartesian3;
-    private _path;
-    private _listenScene;
-    private _listenRunning;
-    constructor(map: any, options?: any);
-    private _init;
-    updatePosition(position: any): void;
-    setFollowFirst(distance?: number): void;
-    setFollowThird(): void;
-    cancelFollow(): void;
-    on(type: any, event: any): any;
-    updatePolyline(style: any): void;
-    updateModel(style: any): void;
-    destroy(): void;
-}