deeptwins-engine-3d 0.1.8 → 0.1.11

package/dist/esm/graphicLayer/ModelPrimitiveInstance.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 = ["silhouetteColor", "color", "imageBasedLightingFactor", "lightColor"];
 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 ModelPrimitive = /*#__PURE__*/function (_BasePrimitiveInstanc) {
     var _this;
     _classCallCheck(this, ModelPrimitive);
     _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_MODEL_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = ModelPrimitive.handleOptions(mergeStyle);
@@ -53,12 +50,12 @@ var ModelPrimitive = /*#__PURE__*/function (_BasePrimitiveInstanc) {
     function _init(options) {
       var style = options.style,
         positions = options.positions,
-        primitiveCollection = options.primitiveCollection;
-      this.instance = Cesium.Model.fromGltfAsync(_objectSpread(_objectSpread({}, style), {}, {
+        primitiveInstance = options.primitiveInstance;
+      var instance = Cesium.Model.fromGltfAsync(_objectSpread(_objectSpread({}, style), {}, {
         id: this.id,
         modelMatrix: Cesium.Transforms.eastNorthUpToFixedFrame(positions)
       }));
-      primitiveCollection.add(this.instance);
+      primitiveInstance.push(instance);
     }
 
     // 更新geoJson数据

package/dist/esm/graphicLayer/PointEntity.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", "entity"],
   _excluded2 = ["color", "outlineColor"];
 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; }
@@ -33,9 +33,7 @@ var PointEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, PointEntity);
     _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);
     if (entity) {
@@ -58,11 +56,10 @@ var PointEntity = /*#__PURE__*/function (_BaseEntity) {
     function _init(options) {
       var style = options.style;
       var positions = PositionProperty.changeToPropertyData.call(this);
-      this.graphic = new Cesium.PointGraphics(style);
       this.entity = new Cesium.Entity({
         position: positions,
         id: this.id,
-        point: this.graphic
+        point: new Cesium.PointGraphics(style)
       });
     }
 

package/dist/esm/graphicLayer/PointPrimitive.d.ts

@@ -3,5 +3,7 @@ export default class PointPrimitive extends BasePointPrimitive {
     constructor(options: any);
     static handleOptions(style: any): any;
     private _init;
+    getPrimitive(): any;
     updateData(data: any): void;
+    updateStyle(originStyle: any, style: any): void;
 }

package/dist/esm/graphicLayer/PointPrimitive.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"],
+var _excluded = ["style"],
   _excluded2 = ["color", "outlineColor"];
 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; }
@@ -29,9 +29,7 @@ var PointPrimitive = /*#__PURE__*/function (_BasePointPrimitive) {
     var _this;
     _classCallCheck(this, PointPrimitive);
     _this = _super.call(this, options);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var style = options.style,
-      source = options.source,
       currOptions = _objectWithoutProperties(options, _excluded);
     var mergeStyle = merge(DEFAULT_POINT_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = PointPrimitive.handleOptions(mergeStyle);
@@ -48,19 +46,45 @@ var PointPrimitive = /*#__PURE__*/function (_BasePointPrimitive) {
       var style = options.style,
         positions = options.positions,
         primitiveCollection = options.primitiveCollection;
-      this.primitive = primitiveCollection.add(_objectSpread({
+      primitiveCollection.add(_objectSpread({
         id: this.id,
         position: positions
       }, style));
     }
 
+    // 获取primitive
+  }, {
+    key: "getPrimitive",
+    value: function getPrimitive() {
+      var _primitiveCollection$,
+        _this2 = this;
+      var primitiveCollection = this.getPrimitiveCollection();
+      return primitiveCollection === null || primitiveCollection === void 0 || (_primitiveCollection$ = primitiveCollection._pointPrimitives) === null || _primitiveCollection$ === void 0 ? void 0 : _primitiveCollection$.find(function (t) {
+        return t.id === _this2.id;
+      });
+    }
+
     // 更新geoJson数据
   }, {
     key: "updateData",
     value: function updateData(data) {
       var positions = data.positions;
       this.source = data;
-      this.primitive.position = positions;
+      var primitive = this.getPrimitive();
+      if (!primitive) return;
+      primitive.position = positions;
+    }
+
+    // 更新样式
+  }, {
+    key: "updateStyle",
+    value: function updateStyle(originStyle, style) {
+      this.style = merge(this.style, originStyle);
+      var primitive = this.getPrimitive();
+      if (!primitive) return;
+      for (var key in style) {
+        primitive[key] = style[key];
+      }
     }
   }], [{
     key: "handleOptions",

package/dist/esm/graphicLayer/PolygonEntity.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", "entity"],
   _excluded2 = ["material", "outlineColor", "stRotation"];
 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; }
@@ -33,9 +33,7 @@ var PolygonEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, PolygonEntity);
     _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);
     // 添加的是entity对象
@@ -59,12 +57,11 @@ var PolygonEntity = /*#__PURE__*/function (_BaseEntity) {
     function _init(options) {
       var style = options.style;
       var newHierarchy = PositionProperty.changeToPropertyHierarchy.call(this);
-      this.graphic = new Cesium.PolygonGraphics(_objectSpread(_objectSpread({}, style), {}, {
-        hierarchy: newHierarchy
-      }));
       this.entity = new Cesium.Entity({
         id: this.id,
-        polygon: this.graphic
+        polygon: new Cesium.PolygonGraphics(_objectSpread(_objectSpread({}, style), {}, {
+          hierarchy: newHierarchy
+        }))
       });
     }
 

package/dist/esm/graphicLayer/PolygonPrimitive.d.ts

@@ -1,5 +1,5 @@
 import BasePrimitive from './BasePrimitive';
 export default class PolygonPrimitive extends BasePrimitive {
-    constructor(map: any);
-    createPrimitive(options?: any): void;
+    constructor(mapContext: any);
+    createPrimitive(options: any, primitiveInstance: any[]): void;
 }

package/dist/esm/graphicLayer/PolygonPrimitive.js

@@ -1,4 +1,7 @@
 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); }
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -13,27 +16,29 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import * as Cesium from 'deeptwins-cesium';
 import { cloneDeep, merge } from 'lodash';
-import { DEFAULT_POLYGON_PRIMITIVE_OPTIONS } from "../constant";
+import { DEFAULT_POLYGON_PRIMITIVE_OPTIONS, DEFAULT_PRIMITIVE_OPTIONS } from "../constant";
 import BasePrimitive from "./BasePrimitive";
 var PolygonPrimitive = /*#__PURE__*/function (_BasePrimitive) {
   _inherits(PolygonPrimitive, _BasePrimitive);
   var _super = _createSuper(PolygonPrimitive);
-  function PolygonPrimitive(map) {
+  function PolygonPrimitive(mapContext) {
     _classCallCheck(this, PolygonPrimitive);
-    return _super.call(this, map);
+    return _super.call(this, mapContext);
   }
   _createClass(PolygonPrimitive, [{
     key: "createPrimitive",
     value: function createPrimitive() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var primitiveInstance = arguments.length > 1 ? arguments[1] : undefined;
       var style = merge(DEFAULT_POLYGON_PRIMITIVE_OPTIONS(), cloneDeep(options.style || {}));
+      var primitiveOptions = merge(DEFAULT_PRIMITIVE_OPTIONS(), cloneDeep(options.primitive || {}));
       var appearance = new Cesium.PerInstanceColorAppearance({
         translucent: !!(style !== null && style !== void 0 && style.translucent)
       });
-      this.primitive = new Cesium.Primitive({
-        geometryInstances: this.primitiveInstance,
+      this.primitive = new Cesium.Primitive(_objectSpread({
+        geometryInstances: primitiveInstance,
         appearance: appearance
-      });
+      }, primitiveOptions));
       this.show = !!(style !== null && style !== void 0 && style.show);
     }
   }]);

package/dist/esm/graphicLayer/PolygonPrimitiveInstance.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"],
   _excluded3 = ["color", "height"];
 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; }
@@ -33,10 +33,7 @@ var PolygonPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
     var _this;
     _classCallCheck(this, PolygonPrimitiveInstance);
     _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_POLYGON_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = PolygonPrimitiveInstance.handleOptions(mergeStyle);
@@ -57,8 +54,8 @@ var PolygonPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
         style = _objectWithoutProperties(_options$style, _excluded2),
         positions = options.positions,
         holes = options.holes,
-        primitiveCollection = options.primitiveCollection;
-      this.instance = new Cesium.GeometryInstance({
+        primitiveInstance = options.primitiveInstance;
+      var instance = new Cesium.GeometryInstance({
         id: this.id,
         geometry: new Cesium.PolygonGeometry(_objectSpread(_objectSpread({
           polygonHierarchy: new Cesium.PolygonHierarchy(positions, holes.map(function (t) {
@@ -71,7 +68,7 @@ var PolygonPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
           color: color
         }
       });
-      primitiveCollection.add(this.instance);
+      primitiveInstance.push(instance);
     }
 
     // 更新geoJson数据

package/dist/esm/graphicLayer/PolylineEntity.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", "entity"],
   _excluded2 = ["material", "depthFailMaterial"];
 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; }
@@ -33,9 +33,7 @@ var PolylineEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, PolylineEntity);
     _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);
     // 添加的是entity对象
@@ -59,12 +57,11 @@ var PolylineEntity = /*#__PURE__*/function (_BaseEntity) {
     function _init(options) {
       var style = options.style;
       var positions = PositionProperty.changeToPropertyData.call(this);
-      this.graphic = new Cesium.PolylineGraphics(_objectSpread(_objectSpread({}, style), {}, {
-        positions: positions
-      }));
       this.entity = new Cesium.Entity({
         id: this.id,
-        polyline: this.graphic
+        polyline: new Cesium.PolylineGraphics(_objectSpread(_objectSpread({}, style), {}, {
+          positions: positions
+        }))
       });
     }
 

package/dist/esm/graphicLayer/PolylinePrimitive.d.ts

@@ -1,5 +1,5 @@
 import BasePrimitive from './BasePrimitive';
 export default class PolylinePrimitive extends BasePrimitive {
     constructor(map: any);
-    createPrimitive(options?: any): void;
+    createPrimitive(options: any, primitiveInstance: any[]): void;
 }

package/dist/esm/graphicLayer/PolylinePrimitive.js

@@ -1,4 +1,7 @@
 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); }
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -13,7 +16,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import * as Cesium from 'deeptwins-cesium';
 import { cloneDeep, merge } from 'lodash';
-import { DEFAULT_POLYLINE_PRIMITIVE_OPTIONS } from "../constant";
+import { DEFAULT_POLYLINE_PRIMITIVE_OPTIONS, DEFAULT_PRIMITIVE_OPTIONS } from "../constant";
 import * as utils from "../tool/utils";
 import BasePrimitive from "./BasePrimitive";
 var PolylinePrimitive = /*#__PURE__*/function (_BasePrimitive) {
@@ -27,7 +30,9 @@ var PolylinePrimitive = /*#__PURE__*/function (_BasePrimitive) {
     key: "createPrimitive",
     value: function createPrimitive() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var primitiveInstance = arguments.length > 1 ? arguments[1] : undefined;
       var style = merge(DEFAULT_POLYLINE_PRIMITIVE_OPTIONS(), cloneDeep(options.style || {}));
+      var primitiveOptions = merge(DEFAULT_PRIMITIVE_OPTIONS(), cloneDeep(options.primitive || {}));
       var appearance = new Cesium.PolylineColorAppearance({
         translucent: !!(style !== null && style !== void 0 && style.translucent)
       });
@@ -36,10 +41,10 @@ var PolylinePrimitive = /*#__PURE__*/function (_BasePrimitive) {
           material: utils.colorMaterialString(style.material)
         });
       }
-      this.primitive = new Cesium.Primitive({
-        geometryInstances: this.primitiveInstance,
+      this.primitive = new Cesium.Primitive(_objectSpread({
+        geometryInstances: primitiveInstance,
         appearance: appearance
-      });
+      }, primitiveOptions));
       this.show = !!(style !== null && style !== void 0 && style.show);
     }
   }]);

package/dist/esm/graphicLayer/PolylinePrimitiveInstance.js

@@ -51,8 +51,8 @@ var PolylinePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
       var _options$style = options.style,
         color = _options$style.color,
         width = _options$style.width,
-        primitiveCollection = options.primitiveCollection;
-      this.instance = new Cesium.GeometryInstance({
+        primitiveInstance = options.primitiveInstance;
+      var instance = new Cesium.GeometryInstance({
         id: this.id,
         geometry: new Cesium.PolylineGeometry({
           positions: this.source.positions,
@@ -63,7 +63,7 @@ var PolylinePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
           color: color
         }
       });
-      primitiveCollection.add(this.instance);
+      primitiveInstance.push(instance);
     }
 
     // 更新geoJson数据

package/dist/esm/graphicLayer/PolylineVolumeEntity.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", "entity"],
   _excluded2 = ["material", "outlineColor", "customShape"];
 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,9 +32,7 @@ var PolylineVolumeEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, PolylineVolumeEntity);
     _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);
     // 添加的是entity对象
@@ -58,7 +56,7 @@ var PolylineVolumeEntity = /*#__PURE__*/function (_BaseEntity) {
     function _init(options) {
       var _this2 = this;
       var style = options.style;
-      this.graphic = new Cesium.PolylineVolumeGraphics(_objectSpread(_objectSpread({}, style), {}, {
+      var graphic = new Cesium.PolylineVolumeGraphics(_objectSpread(_objectSpread({}, style), {}, {
         // todo 使用 positionProperty 有bug
         positions: this.positionProperty ? new Cesium.CallbackProperty(function () {
           return Cesium.Cartesian3.fromDegreesArrayHeights(_this2.source.geometry.coordinates.flat(1));
@@ -66,7 +64,7 @@ var PolylineVolumeEntity = /*#__PURE__*/function (_BaseEntity) {
       }));
       this.entity = new Cesium.Entity({
         id: this.id,
-        polylineVolume: this.graphic
+        polylineVolume: graphic
       });
     }
 

package/dist/esm/graphicLayer/PolylineVolumePrimitive.d.ts

@@ -1,5 +1,5 @@
 import BasePrimitive from './BasePrimitive';
 export default class PolylineVolumePrimitive extends BasePrimitive {
     constructor(map: any);
-    createPrimitive(options?: any): void;
+    createPrimitive(options: any, primitiveInstance: any[]): void;
 }

package/dist/esm/graphicLayer/PolylineVolumePrimitive.js

@@ -1,4 +1,7 @@
 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); }
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -13,7 +16,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import * as Cesium from 'deeptwins-cesium';
 import { cloneDeep, merge } from 'lodash';
-import { DEFAULT_POLYLINE_VOLUME_PRIMITIVE_OPTIONS } from "../constant";
+import { DEFAULT_POLYLINE_VOLUME_PRIMITIVE_OPTIONS, DEFAULT_PRIMITIVE_OPTIONS } from "../constant";
 import BasePrimitive from "./BasePrimitive";
 var PolylineVolumePrimitive = /*#__PURE__*/function (_BasePrimitive) {
   _inherits(PolylineVolumePrimitive, _BasePrimitive);
@@ -26,14 +29,16 @@ var PolylineVolumePrimitive = /*#__PURE__*/function (_BasePrimitive) {
     key: "createPrimitive",
     value: function createPrimitive() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var primitiveInstance = arguments.length > 1 ? arguments[1] : undefined;
       var style = merge(DEFAULT_POLYLINE_VOLUME_PRIMITIVE_OPTIONS(), cloneDeep(options.style || {}));
+      var primitiveOptions = merge(DEFAULT_PRIMITIVE_OPTIONS(), cloneDeep(options.primitive || {}));
       var appearance = new Cesium.PerInstanceColorAppearance({
         translucent: !!(style !== null && style !== void 0 && style.translucent)
       });
-      this.primitive = new Cesium.Primitive({
-        geometryInstances: this.primitiveInstance,
+      this.primitive = new Cesium.Primitive(_objectSpread({
+        geometryInstances: primitiveInstance,
         appearance: appearance
-      });
+      }, primitiveOptions));
       this.show = !!(style !== null && style !== void 0 && style.show);
     }
   }]);

package/dist/esm/graphicLayer/PolylineVolumePrimitiveInstance.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", "customShape"];
 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 PolylineVolumePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInsta
     var _this;
     _classCallCheck(this, PolylineVolumePrimitiveInstance);
     _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_VOLUME_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = PolylineVolumePrimitiveInstance.handleOptions(mergeStyle);
@@ -56,8 +53,8 @@ var PolylineVolumePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInsta
         shapePositions = _options$style.shapePositions,
         cornerType = _options$style.cornerType,
         positions = options.positions,
-        primitiveCollection = options.primitiveCollection;
-      this.instance = new Cesium.GeometryInstance({
+        primitiveInstance = options.primitiveInstance;
+      var instance = new Cesium.GeometryInstance({
         id: this.id,
         geometry: new Cesium.PolylineVolumeGeometry({
           vertexFormat: Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
@@ -69,7 +66,7 @@ var PolylineVolumePrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInsta
           color: color
         }
       });
-      primitiveCollection.add(this.instance);
+      primitiveInstance.push(instance);
     }
 
     // 更新geoJson数据

package/dist/esm/graphicLayer/WallEntity.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", "entity"],
   _excluded2 = ["material", "outlineColor"];
 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; }
@@ -33,9 +33,7 @@ var WallEntity = /*#__PURE__*/function (_BaseEntity) {
     var _this;
     _classCallCheck(this, WallEntity);
     _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);
     // 添加的是entity对象
@@ -59,12 +57,11 @@ var WallEntity = /*#__PURE__*/function (_BaseEntity) {
     function _init(options) {
       var style = options.style;
       var positions = PositionProperty.changeToPropertyData.call(this);
-      this.graphic = new Cesium.WallGraphics(_objectSpread(_objectSpread({}, style), {}, {
-        positions: positions
-      }));
       this.entity = new Cesium.Entity({
         id: this.id,
-        wall: this.graphic
+        wall: new Cesium.WallGraphics(_objectSpread(_objectSpread({}, style), {}, {
+          positions: positions
+        }))
       });
     }
 

package/dist/esm/graphicLayer/WallPrimitive.d.ts

@@ -1,5 +1,5 @@
 import BasePrimitive from './BasePrimitive';
 export default class WallPrimitive extends BasePrimitive {
     constructor(map: any);
-    createPrimitive(options?: any): void;
+    createPrimitive(options: any, primitiveInstance: any[]): void;
 }

package/dist/esm/graphicLayer/WallPrimitive.js

@@ -1,4 +1,7 @@
 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); }
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -13,7 +16,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import * as Cesium from 'deeptwins-cesium';
 import { cloneDeep, merge } from 'lodash';
-import { DEFAULT_WALL_PRIMITIVE_OPTIONS } from "../constant";
+import { DEFAULT_PRIMITIVE_OPTIONS, DEFAULT_WALL_PRIMITIVE_OPTIONS } from "../constant";
 import BasePrimitive from "./BasePrimitive";
 var WallPrimitive = /*#__PURE__*/function (_BasePrimitive) {
   _inherits(WallPrimitive, _BasePrimitive);
@@ -26,14 +29,16 @@ var WallPrimitive = /*#__PURE__*/function (_BasePrimitive) {
     key: "createPrimitive",
     value: function createPrimitive() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var primitiveInstance = arguments.length > 1 ? arguments[1] : undefined;
       var style = merge(DEFAULT_WALL_PRIMITIVE_OPTIONS(), cloneDeep(options.style || {}));
+      var primitiveOptions = merge(DEFAULT_PRIMITIVE_OPTIONS(), cloneDeep(options.primitive || {}));
       var appearance = new Cesium.PerInstanceColorAppearance({
         translucent: !!(style !== null && style !== void 0 && style.translucent)
       });
-      this.primitive = new Cesium.Primitive({
-        geometryInstances: this.primitiveInstance,
+      this.primitive = new Cesium.Primitive(_objectSpread({
+        geometryInstances: primitiveInstance,
         appearance: appearance
-      });
+      }, primitiveOptions));
       this.show = !!(style !== null && style !== void 0 && style.show);
     }
   }]);

package/dist/esm/graphicLayer/WallPrimitiveInstance.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 WallPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
     var _this;
     _classCallCheck(this, WallPrimitiveInstance);
     _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_WALL_PRIMITIVE_OPTIONS(), cloneDeep(style || {}));
     var currStyle = WallPrimitiveInstance.handleOptions(mergeStyle);
@@ -56,8 +53,8 @@ var WallPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
         minimumHeights = _options$style.minimumHeights,
         maximumHeights = _options$style.maximumHeights,
         positions = options.positions,
-        primitiveCollection = options.primitiveCollection;
-      this.instance = new Cesium.GeometryInstance({
+        primitiveInstance = options.primitiveInstance;
+      var instance = new Cesium.GeometryInstance({
         id: this.id,
         geometry: new Cesium.WallGeometry({
           vertexFormat: Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
@@ -69,7 +66,7 @@ var WallPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
           color: color
         }
       });
-      primitiveCollection.add(this.instance);
+      primitiveInstance.push(instance);
     }
 
     // 更新geoJson数据

package/dist/esm/index.js

@@ -48,7 +48,7 @@ loadCss(Cesium.buildModuleUrl('Widgets/widgets.css'));
 export var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", "0.1.8");
+_defineProperty(DeepTwinsEngine3D, "Version", "0.1.11");
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);