deeptwins-engine-3d 0.1.47 → 0.1.48

package/dist/esm/analyze/ViewshedAnalysis.js

@@ -15,7 +15,7 @@ import * as Cesium from 'deeptwins-cesium';
 import { merge } from 'lodash';
 import { DEFAULT_VIEWSHED_ANALYSIS_OPTIONS } from "../constant";
 import * as utils from "../tool/utils";
-import FrustumWithCamera from "../visualization/FrustumWithCamera";
+import Frustum from "../visualization/Frustum";
 
 // 可视域分析。
 var ViewshedAnalysis = /*#__PURE__*/function () {
@@ -204,10 +204,11 @@ var ViewshedAnalysis = /*#__PURE__*/function () {
     key: "_drawFrustumOutline",
     value: function _drawFrustumOutline() {
       if (!this._canOperate) return;
-      this.frustumCamera = new FrustumWithCamera(this.getMap(), {
+      this.frustumCamera = new Frustum(this.getMap(), {
         position: this.options.position,
         fill: false,
         outlineColor: this.options.outlineColor,
+        isWithCamera: true,
         camera: this.lightCamera
       });
     }

package/dist/esm/constant.d.ts

@@ -183,6 +183,16 @@ export declare const DEFAULT_FLIGHT_RISK_EVALUATION_OPTIONS: () => {
         color: string;
     }[];
 };
+export declare const DEFAULT_FRUSTUM_OPTIONS: () => {
+    show: boolean;
+    heading: number;
+    pitch: number;
+    roll: number;
+    color: string;
+    outline: boolean;
+    outlineColor: string;
+    isWithCamera: boolean;
+};
 export declare const DEFAULT_SUBMERGENCE_ANALYSIS_OPTIONS: () => {
     startHeight: number;
     targetHeight: number;
@@ -221,6 +231,7 @@ export declare const DEFAULT_MATERIAL_APPEARANCE: any;
 export declare const DEFAULT_POLYLINE_TRAIL_LINK_MATERIAL_STYLE: any;
 export declare const DEFAULT_DYNAMIC_WALL_MATERIAL_STYLE: any;
 export declare const DEFAULT_CIRCLE_WAVE_MATERIAL_STYLE: any;
+export declare const DEFAULT_IMAGE_MATERIAL_STYLE: any;
 export declare const DEFAULT_GLOW_MATERIAL_STYLE: any;
 export declare const GRAPHIC_LAYER_TYPE_TO_CLASS: any;
 export declare const DEFAULT_YJ_LAYER: any;

package/dist/esm/constant.js

@@ -15,6 +15,7 @@ import ModelPrimitiveInstance from "./graphicLayer/ModelPrimitiveInstance";
 import PointEntity from "./graphicLayer/PointEntity";
 import PointPrimitive from "./graphicLayer/PointPrimitive";
 import PolygonEntity from "./graphicLayer/PolygonEntity";
+import PolygonPrimitiveImageMaterialInstance from "./graphicLayer/PolygonPrimitiveImageMaterialInstance";
 import PolygonPrimitiveInstance from "./graphicLayer/PolygonPrimitiveInstance";
 import PolylineEntity from "./graphicLayer/PolylineEntity";
 import PolylineGroundPrimitiveInstance from "./graphicLayer/PolylineGroundPrimitiveInstance";
@@ -310,6 +311,20 @@ export var DEFAULT_FLIGHT_RISK_EVALUATION_OPTIONS = function DEFAULT_FLIGHT_RISK
   };
 };
 
+// 默认视锥体配置选项
+export var DEFAULT_FRUSTUM_OPTIONS = function DEFAULT_FRUSTUM_OPTIONS() {
+  return {
+    show: true,
+    heading: 0,
+    pitch: 0,
+    roll: 0,
+    color: 'rgba(255,0,0,0.3)',
+    outline: true,
+    outlineColor: '#ffffff',
+    isWithCamera: false
+  };
+};
+
 // 默认淹没分析配置选项 SubmergenceAnalysis
 export var DEFAULT_SUBMERGENCE_ANALYSIS_OPTIONS = function DEFAULT_SUBMERGENCE_ANALYSIS_OPTIONS() {
   return {
@@ -586,6 +601,14 @@ export var DEFAULT_CIRCLE_WAVE_MATERIAL_STYLE = function DEFAULT_CIRCLE_WAVE_MAT
   };
 };
 
+// 贴图材质默认的配置
+export var DEFAULT_IMAGE_MATERIAL_STYLE = function DEFAULT_IMAGE_MATERIAL_STYLE() {
+  return {
+    color: Cesium.Color.WHITE,
+    mixRatio: 0.5
+  };
+};
+
 // 发光材质默认的配置
 export var DEFAULT_GLOW_MATERIAL_STYLE = function DEFAULT_GLOW_MATERIAL_STYLE() {
   return {
@@ -614,6 +637,7 @@ export var GRAPHIC_LAYER_TYPE_TO_CLASS = {
   polylineP: PolylinePrimitiveInstance,
   polylineGroundP: PolylineGroundPrimitiveInstance,
   polygonP: PolygonPrimitiveInstance,
+  polygonImageP: PolygonPrimitiveImageMaterialInstance,
   polygonGroundP: PolygonPrimitiveInstance,
   boxP: BoxPrimitiveInstance,
   modelP: ModelPrimitiveInstance,

package/dist/esm/graphicLayer/BaseLayer.js

@@ -112,6 +112,9 @@ var BaseLayer = /*#__PURE__*/function () {
         polygonP: function polygonP() {
           _this2.primitiveCollection = new PolygonPrimitive(_this2._mapContext);
         },
+        polygonImageP: function polygonImageP() {
+          _this2.primitiveCollection = new PolygonPrimitive(_this2._mapContext);
+        },
         polygonGroundP: function polygonGroundP() {
           _this2.primitiveCollection = new PolygonGroundPrimitive(_this2._mapContext);
         },

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

@@ -15,7 +15,7 @@ export default class BaseSource {
     remove(): void;
     setData(data: any): this | undefined;
     _toDestroy(): void;
-    static analysisSourceType(data: any): "wkt" | "sourceId" | "sourceInstance" | "geoJson" | "other";
+    static analysisSourceType(data: any): "other" | "wkt" | "sourceId" | "sourceInstance" | "geoJson";
     static wktToGeoJon(wkt: string): any;
     static geoJsonToGeoCartesian3Array(geoJson: any): any[];
     static handleFeaturePoint(feature: any): any;

package/dist/esm/graphicLayer/PolygonPrimitive.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 = ["materialAppearance"];
+var _excluded = ["material"];
 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; }
@@ -34,13 +34,15 @@ var PolygonPrimitive = /*#__PURE__*/function (_BasePrimitive) {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var primitiveInstance = arguments.length > 1 ? arguments[1] : undefined;
       var _ref = options.style || {},
-        materialAppearance = _ref.materialAppearance,
+        material = _ref.material,
         otherStyle = _objectWithoutProperties(_ref, _excluded);
       var style = merge(DEFAULT_POLYGON_PRIMITIVE_OPTIONS(), cloneDeep(otherStyle || {}));
       var primitiveOptions = merge(DEFAULT_PRIMITIVE_OPTIONS(), cloneDeep(options.primitive || {}));
       var appearance = {};
-      if (materialAppearance) {
-        appearance = materialAppearance.appearance;
+
+      // 自定义材质
+      if (material !== null && material !== void 0 && material.customMaterial) {
+        appearance = material.appearance;
       } else {
         appearance = new Cesium.PerInstanceColorAppearance({
           translucent: !!(style !== null && style !== void 0 && style.translucent)

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

@@ -0,0 +1,5 @@
+import PolygonPrimitiveInstance from './PolygonPrimitiveInstance';
+export default class PolygonPrimitiveImageMaterialInstance extends PolygonPrimitiveInstance {
+    constructor(options: any);
+    _init(options: any): void;
+}

package/dist/esm/graphicLayer/PolygonPrimitiveImageMaterialInstance.js

@@ -0,0 +1,75 @@
+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 = ["color", "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; }
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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; }
+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); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+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 * as utils from "../tool/utils";
+import PolygonPrimitiveInstance from "./PolygonPrimitiveInstance";
+
+// polygon Primitive 图片材质贴图
+var PolygonPrimitiveImageMaterialInstance = /*#__PURE__*/function (_PolygonPrimitiveInst) {
+  _inherits(PolygonPrimitiveImageMaterialInstance, _PolygonPrimitiveInst);
+  var _super = _createSuper(PolygonPrimitiveImageMaterialInstance);
+  function PolygonPrimitiveImageMaterialInstance(options) {
+    _classCallCheck(this, PolygonPrimitiveImageMaterialInstance);
+    return _super.call(this, options);
+  }
+
+  // 初始化
+  _createClass(PolygonPrimitiveImageMaterialInstance, [{
+    key: "_init",
+    value: function _init(options) {
+      var _options$style = options.style,
+        color = _options$style.color,
+        stRotation = _options$style.stRotation,
+        style = _objectWithoutProperties(_options$style, _excluded),
+        positions = options.positions,
+        holes = options.holes,
+        primitiveInstance = options.primitiveInstance;
+      var geometry = null;
+      var polygonGeometry = new Cesium.PolygonGeometry(_objectSpread({
+        polygonHierarchy: new Cesium.PolygonHierarchy(positions, holes.map(function (t) {
+          return new Cesium.PolygonHierarchy(t);
+        })),
+        vertexFormat: Cesium.VertexFormat.POSITION_AND_ST,
+        stRotation: stRotation
+      }, style));
+      if (!style.extrudedHeight) {
+        geometry = Cesium.PolygonGeometry.createGeometry(polygonGeometry);
+        geometry.attributes.st = new Cesium.GeometryAttribute({
+          componentDatatype: Cesium.ComponentDatatype.FLOAT,
+          componentsPerAttribute: 2,
+          values: utils.computeSTAlongPlane(positions, stRotation)
+        });
+      } else {
+        utils.error('不支持extrudedHeight');
+        return;
+      }
+      var instance = new Cesium.GeometryInstance({
+        id: this.id,
+        geometry: geometry,
+        attributes: {
+          color: color
+        }
+      });
+      primitiveInstance.push(instance);
+    }
+  }]);
+  return PolygonPrimitiveImageMaterialInstance;
+}(PolygonPrimitiveInstance);
+export { PolygonPrimitiveImageMaterialInstance as default };

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

@@ -2,6 +2,6 @@ import BasePrimitiveInstance from './BasePrimitiveInstance';
 export default class PolygonPrimitiveInstance extends BasePrimitiveInstance {
     constructor(options: any);
     static handleOptions(style: any): any;
-    private _init;
+    _init(options: any): void;
     updateData(): void;
 }

package/dist/esm/graphicLayer/PolygonPrimitiveInstance.js

@@ -1,6 +1,6 @@
 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"],
-  _excluded2 = ["color", "stRotation", "materialAppearance", "vertexFormat"],
+  _excluded2 = ["color", "stRotation"],
   _excluded3 = ["color", "height", "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; }
@@ -52,34 +52,19 @@ var PolygonPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
       var _options$style = options.style,
         color = _options$style.color,
         stRotation = _options$style.stRotation,
-        materialAppearance = _options$style.materialAppearance,
-        vertexFormat = _options$style.vertexFormat,
         style = _objectWithoutProperties(_options$style, _excluded2),
         positions = options.positions,
         holes = options.holes,
         primitiveInstance = options.primitiveInstance;
-      var currVertexFormat = vertexFormat || materialAppearance ? Cesium.VertexFormat.POSITION_AND_ST : Cesium.PerInstanceColorAppearance.VERTEX_FORMAT;
-      var geometry = null;
-      var polygonGeometry = new Cesium.PolygonGeometry(_objectSpread({
-        polygonHierarchy: new Cesium.PolygonHierarchy(positions, holes.map(function (t) {
-          return new Cesium.PolygonHierarchy(t);
-        })),
-        vertexFormat: currVertexFormat,
-        stRotation: stRotation
-      }, style));
-      if (materialAppearance && !style.extrudedHeight) {
-        geometry = Cesium.PolygonGeometry.createGeometry(polygonGeometry);
-        geometry.attributes.st = new Cesium.GeometryAttribute({
-          componentDatatype: Cesium.ComponentDatatype.FLOAT,
-          componentsPerAttribute: 2,
-          values: utils.computeSTAlongPlane(positions, stRotation)
-        });
-      } else {
-        geometry = polygonGeometry;
-      }
       var instance = new Cesium.GeometryInstance({
         id: this.id,
-        geometry: geometry,
+        geometry: new Cesium.PolygonGeometry(_objectSpread({
+          polygonHierarchy: new Cesium.PolygonHierarchy(positions, holes.map(function (t) {
+            return new Cesium.PolygonHierarchy(t);
+          })),
+          vertexFormat: Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
+          stRotation: stRotation
+        }, style)),
         attributes: {
           color: color
         }

package/dist/esm/index.d.ts

@@ -24,6 +24,7 @@ export declare class DeepTwinsEngine3D {
     static CircleWaveMaterialProperty: any;
     static PolylineTrailLinkMaterialProperty: any;
     static ImageMaterialProperty: any;
+    static ImageMaterialAppearance: any;
     static ImageGlowingMaterialAppearance: any;
     static VolumeCloud: any;
     static Heatmap2d: any;
@@ -31,7 +32,6 @@ export declare class DeepTwinsEngine3D {
     static PointCluster: any;
     static PositionProperty: any;
     static Frustum: any;
-    static FrustumWithCamera: any;
     static GridDraw: any;
     static VideoTexture: any;
     static VideoProject: any;

package/dist/esm/index.js

@@ -35,6 +35,7 @@ import ImageGlowingMaterialProperty from "./material/entity/ImageGlowingMaterial
 import ImageMaterialProperty from "./material/entity/ImageMaterialProperty";
 import PolylineTrailLinkMaterialProperty from "./material/entity/PolylineTrailLinkMaterialProperty";
 import ImageGlowingMaterialAppearance from "./material/primitive/ImageGlowingMaterialAppearance";
+import ImageMaterialAppearance from "./material/primitive/ImageMaterialAppearance";
 import Measure from "./measure";
 import PositionProperty from "./property/PositionProperty";
 import ArcGisLayer from "./tileLayer/ArcGisLayer";
@@ -48,7 +49,6 @@ import { loadCss } from "./tool/utils";
 import VideoProject from "./videoFusion/VideoProject";
 import VideoTexture from "./videoFusion/VideoTexture";
 import Frustum from "./visualization/Frustum";
-import FrustumWithCamera from "./visualization/FrustumWithCamera";
 import Heatmap2d from "./visualization/Heatmap2d";
 import Heatmap3d from "./visualization/Heatmap3d";
 import PointCluster from "./visualization/PointCluster";
@@ -58,11 +58,11 @@ DEEP_TWINS_BASE_URL && (window.CESIUM_BASE_URL = DEEP_TWINS_BASE_URL);
 // 全局加载css
 loadCss(Cesium.buildModuleUrl('Widgets/widgets.css'));
 // 打印版本信息
-console.log('DeepTwinsEngine3D Version:', "0.1.47");
+console.log('DeepTwinsEngine3D Version:', "0.1.48");
 export var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", "0.1.47");
+_defineProperty(DeepTwinsEngine3D, "Version", "0.1.48");
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);
@@ -86,6 +86,7 @@ _defineProperty(DeepTwinsEngine3D, "DynamicWallMaterialProperty", DynamicWallMat
 _defineProperty(DeepTwinsEngine3D, "CircleWaveMaterialProperty", CircleWaveMaterialProperty);
 _defineProperty(DeepTwinsEngine3D, "PolylineTrailLinkMaterialProperty", PolylineTrailLinkMaterialProperty);
 _defineProperty(DeepTwinsEngine3D, "ImageMaterialProperty", ImageMaterialProperty);
+_defineProperty(DeepTwinsEngine3D, "ImageMaterialAppearance", ImageMaterialAppearance);
 _defineProperty(DeepTwinsEngine3D, "ImageGlowingMaterialAppearance", ImageGlowingMaterialAppearance);
 _defineProperty(DeepTwinsEngine3D, "VolumeCloud", VolumeCloud);
 _defineProperty(DeepTwinsEngine3D, "Heatmap2d", Heatmap2d);
@@ -93,7 +94,6 @@ _defineProperty(DeepTwinsEngine3D, "Heatmap3d", Heatmap3d);
 _defineProperty(DeepTwinsEngine3D, "PointCluster", PointCluster);
 _defineProperty(DeepTwinsEngine3D, "PositionProperty", PositionProperty);
 _defineProperty(DeepTwinsEngine3D, "Frustum", Frustum);
-_defineProperty(DeepTwinsEngine3D, "FrustumWithCamera", FrustumWithCamera);
 _defineProperty(DeepTwinsEngine3D, "GridDraw", GridDraw);
 _defineProperty(DeepTwinsEngine3D, "VideoTexture", VideoTexture);
 _defineProperty(DeepTwinsEngine3D, "VideoProject", VideoProject);

package/dist/esm/material/primitive/BaseMaterialAppearance.d.ts

@@ -1,4 +1,5 @@
 export default class BaseMaterialAppearance {
+    customMaterial: boolean;
     type: string;
     style: any;
     material: any;

package/dist/esm/material/primitive/BaseMaterialAppearance.js

@@ -9,6 +9,7 @@ import { v4 as uuidv4 } from 'uuid';
 var BaseMaterialAppearance = /*#__PURE__*/function () {
   function BaseMaterialAppearance(type, style) {
     _classCallCheck(this, BaseMaterialAppearance);
+    _defineProperty(this, "customMaterial", true);
     _defineProperty(this, "type", void 0);
     _defineProperty(this, "style", void 0);
     _defineProperty(this, "material", void 0);

package/dist/esm/material/primitive/ImageMaterialAppearance.d.ts

@@ -0,0 +1,10 @@
+import BaseMaterialAppearance from './BaseMaterialAppearance';
+declare class ImageMaterialAppearance extends BaseMaterialAppearance {
+    private readonly currMaterial;
+    private readonly currAppearance;
+    constructor(material: any, appearance: any);
+    static handleMaterial(style: any): any;
+    private _createMaterial;
+    private _createAppearance;
+}
+export default ImageMaterialAppearance;

package/dist/esm/material/primitive/ImageMaterialAppearance.js

@@ -0,0 +1,77 @@
+var _excluded = ["color"];
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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 _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; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+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 _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 { cloneDeep, merge } from 'lodash';
+import { DEFAULT_IMAGE_MATERIAL_STYLE, DEFAULT_MATERIAL_APPEARANCE } from "../../constant";
+import * as utils from "../../tool/utils";
+/* babel-plugin-inline-import '../shader/ImageShader.glsl' */
+var ImageShader = "uniform sampler2D image;\nuniform vec4 color;\nuniform float mixRatio;\n\nczm_material czm_getMaterial(czm_materialInput materialInput) {\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = materialInput.st;\n\n    // \u91C7\u6837\u56FE\u7247\n    vec4 texColor = texture(image, st);\n\n    // \u989C\u8272\u6DF7\u5408\uFF1Amix(\u539F\u59CB\u989C\u8272, \u76EE\u6807\u989C\u8272, mixRatio)\n    vec3 mixedColor = mix(texColor.rgb, texColor.rgb * color.rgb, mixRatio);\n\n    // \u53D1\u5149\u589E\u5F3A\n    material.diffuse = mixedColor * 2.0;\n\n    // \u900F\u660E\u5EA6\u968F\u989C\u8272\u53D8\u5316\n    material.alpha = texColor.a * mix(color.a, 1.0, 1.0 - mixRatio);\n\n    return material;\n}\n";
+import BaseMaterialAppearance from "./BaseMaterialAppearance";
+
+// 图片材质 适用于primitive
+var ImageMaterialAppearance = /*#__PURE__*/function (_BaseMaterialAppearan) {
+  _inherits(ImageMaterialAppearance, _BaseMaterialAppearan);
+  var _super = _createSuper(ImageMaterialAppearance);
+  function ImageMaterialAppearance(material, appearance) {
+    var _this;
+    _classCallCheck(this, ImageMaterialAppearance);
+    var mergeMaterial = merge(DEFAULT_IMAGE_MATERIAL_STYLE(), cloneDeep(material || {}));
+    _this = _super.call(this, 'ImageMaterialAsset', mergeMaterial);
+    _defineProperty(_assertThisInitialized(_this), "currMaterial", void 0);
+    _defineProperty(_assertThisInitialized(_this), "currAppearance", void 0);
+    _this.currMaterial = ImageMaterialAppearance.handleMaterial(mergeMaterial);
+    _this.currAppearance = merge(DEFAULT_MATERIAL_APPEARANCE(), appearance || {});
+    _this._createMaterial();
+    return _this;
+  }
+
+  // 处理参数
+  _createClass(ImageMaterialAppearance, [{
+    key: "_createMaterial",
+    value: function _createMaterial() {
+      this.material = new Cesium.Material({
+        fabric: {
+          type: this.type,
+          uniforms: _objectSpread({}, this.currMaterial),
+          source: ImageShader
+        }
+      });
+      this._createAppearance();
+    }
+  }, {
+    key: "_createAppearance",
+    value: function _createAppearance() {
+      this.appearance = new Cesium.MaterialAppearance(_objectSpread({
+        material: this.material
+      }, this.currAppearance));
+    }
+  }], [{
+    key: "handleMaterial",
+    value: function handleMaterial(style) {
+      var color = style.color,
+        options = _objectWithoutProperties(style, _excluded);
+      var backStyle = _objectSpread({}, options);
+      backStyle.color = utils.colorString(color);
+      return backStyle;
+    }
+  }]);
+  return ImageMaterialAppearance;
+}(BaseMaterialAppearance);
+export default ImageMaterialAppearance;

package/dist/esm/material/shader/ImageShader.glsl

@@ -0,0 +1,22 @@
+uniform sampler2D image;
+uniform vec4 color;
+uniform float mixRatio;
+
+czm_material czm_getMaterial(czm_materialInput materialInput) {
+    czm_material material = czm_getDefaultMaterial(materialInput);
+    vec2 st = materialInput.st;
+
+    // 采样图片
+    vec4 texColor = texture(image, st);
+
+    // 颜色混合：mix(原始颜色, 目标颜色, mixRatio)
+    vec3 mixedColor = mix(texColor.rgb, texColor.rgb * color.rgb, mixRatio);
+
+    // 发光增强
+    material.diffuse = mixedColor * 2.0;
+
+    // 透明度随颜色变化
+    material.alpha = texColor.a * mix(color.a, 1.0, 1.0 - mixRatio);
+
+    return material;
+}

package/dist/esm/tool/utils.d.ts

@@ -42,13 +42,22 @@ export declare const getHeightCompensatedScale: (map: Cesium.Viewer, entityHeigh
 export declare function calculateLength(positions: any[]): number;
 export declare function warn(message: string): void;
 export declare function error(message: string): void;
+/**
+ * 去除 Polygon ring 的闭合点（首尾重复）
+ */
+export declare function normalizeRing(ring: Cesium.Cartesian3[]): Cesium.Cartesian3[];
+/**
+ * 构建 Cesium 安全的 PolygonHierarchy
+ * 支持闭合 / 非闭合 / holes
+ */
+export declare function buildPolygonHierarchy(positions: Cesium.Cartesian3[], holes?: Cesium.Cartesian3[][]): Cesium.PolygonHierarchy;
 /**
  * 沿多边形平面局部坐标系计算 ST
  * @param positions Cartesian3[] 多边形顶点
  * @param rotation number 旋转
  * @returns Float32Array ST 坐标
  */
-export declare function computeSTAlongPlane(positions: any, rotation?: number): Float32Array;
+export declare function computeSTAlongPlane(positions: Cesium.Cartesian3[], rotation?: number): Float32Array;
 export declare function getMidpoint(position1: Cartesian3, position2: Cartesian3): {
     lng: number;
     lat: number;