deeptwins-engine-3d 0.1.26 → 0.1.28

package/dist/esm/constant.d.ts

@@ -114,6 +114,7 @@ export declare const DEFAULT_BASE_LAYER_TYPE: any;
 export declare const DEFAULT_BASE_LAYER: any;
 export declare const LAYER_TYPE_TO_CLASS: any;
 export declare const DEFAULT_SKY_BOX: any;
+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;

package/dist/esm/constant.js

@@ -347,6 +347,17 @@ export var DEFAULT_SKY_BOX = {
   }
 };
 
+// 默认的MaterialAppearance配置
+export var DEFAULT_MATERIAL_APPEARANCE = function DEFAULT_MATERIAL_APPEARANCE() {
+  return {
+    flat: false,
+    faceForward: true,
+    translucent: true,
+    closed: false,
+    materialSupport: Cesium.MaterialAppearance.MaterialSupport.TEXTURED
+  };
+};
+
 // 流动线材质默认的配置
 export var DEFAULT_POLYLINE_TRAIL_LINK_MATERIAL_STYLE = function DEFAULT_POLYLINE_TRAIL_LINK_MATERIAL_STYLE() {
   return {
@@ -514,7 +525,7 @@ export var DEFAULT_PRIMITIVE_OPTIONS = function DEFAULT_PRIMITIVE_OPTIONS() {
     releaseGeometryInstances: true,
     allowPicking: true,
     cull: true,
-    asynchronous: true,
+    asynchronous: false,
     debugShowBoundingVolume: false,
     shadows: Cesium.ShadowMode.DISABLED
   };

package/dist/esm/graphicLayer/PolygonPrimitive.js

@@ -1,7 +1,10 @@
 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"];
 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; }
@@ -30,11 +33,19 @@ var PolygonPrimitive = /*#__PURE__*/function (_BasePrimitive) {
     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 _ref = options.style || {},
+        materialAppearance = _ref.materialAppearance,
+        otherStyle = _objectWithoutProperties(_ref, _excluded);
+      var style = merge(DEFAULT_POLYGON_PRIMITIVE_OPTIONS(), cloneDeep(otherStyle || {}));
       var primitiveOptions = merge(DEFAULT_PRIMITIVE_OPTIONS(), cloneDeep(options.primitive || {}));
-      var appearance = new Cesium.PerInstanceColorAppearance({
-        translucent: !!(style !== null && style !== void 0 && style.translucent)
-      });
+      var appearance = {};
+      if (materialAppearance) {
+        appearance = materialAppearance.appearance;
+      } else {
+        appearance = new Cesium.PerInstanceColorAppearance({
+          translucent: !!(style !== null && style !== void 0 && style.translucent)
+        });
+      }
       this.primitive = new Cesium.Primitive(_objectSpread({
         geometryInstances: primitiveInstance,
         appearance: appearance

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"],
+  _excluded2 = ["color", "materialAppearance", "vertexFormat"],
   _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; }
 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; }
@@ -51,19 +51,21 @@ var PolygonPrimitiveInstance = /*#__PURE__*/function (_BasePrimitiveInstanc) {
     function _init(options) {
       var _options$style = options.style,
         color = _options$style.color,
+        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 instance = new Cesium.GeometryInstance({
         id: this.id,
-        geometry: new Cesium.PolygonGeometry(_objectSpread(_objectSpread({
+        geometry: new Cesium.PolygonGeometry(_objectSpread({
           polygonHierarchy: new Cesium.PolygonHierarchy(positions, holes.map(function (t) {
             return new Cesium.PolygonHierarchy(t);
-          }))
-        }, style), {}, {
-          vertexFormat: Cesium.PerInstanceColorAppearance.VERTEX_FORMAT
-        })),
+          })),
+          vertexFormat: currVertexFormat
+        }, style)),
         attributes: {
           color: color
         }

package/dist/esm/index.d.ts

@@ -23,6 +23,7 @@ export declare class DeepTwinsEngine3D {
     static CircleWaveMaterialProperty: any;
     static PolylineTrailLinkMaterialProperty: any;
     static ImageMaterialProperty: any;
+    static ImageGlowingMaterialAppearance: any;
     static VolumeCloud: any;
     static Heatmap2d: any;
     static Heatmap3d: any;

package/dist/esm/index.js

@@ -18,13 +18,14 @@ import Drawer from "./drawer/index";
 import "./global.css";
 import GroundSkyBox from "./map/GroundSkyBox";
 import Map from "./map/Map";
-import CircleWaveMaterialProperty from "./material/CircleWaveMaterialProperty";
-import DynamicWallMaterialProperty from "./material/DynamicWallMaterialProperty";
-import ImageGlowingMaterialProperty from "./material/ImageGlowingMaterialProperty";
-import ImageMaterialProperty from "./material/ImageMaterialProperty";
-import PolylineTrailLinkMaterialProperty from "./material/PolylineTrailLinkMaterialProperty";
 import VolumeCloud from "./material/VolumeCloud";
 import WeatherEffects from "./material/WeatherEffects";
+import CircleWaveMaterialProperty from "./material/entity/CircleWaveMaterialProperty";
+import DynamicWallMaterialProperty from "./material/entity/DynamicWallMaterialProperty";
+import ImageGlowingMaterialProperty from "./material/entity/ImageGlowingMaterialProperty";
+import ImageMaterialProperty from "./material/entity/ImageMaterialProperty";
+import PolylineTrailLinkMaterialProperty from "./material/entity/PolylineTrailLinkMaterialProperty";
+import ImageGlowingMaterialAppearance from "./material/primitive/ImageGlowingMaterialAppearance";
 import * as Measure from "./measure";
 import PositionProperty from "./property/PositionProperty";
 import ArcGisLayer from "./tileLayer/ArcGisLayer";
@@ -50,7 +51,7 @@ loadCss(Cesium.buildModuleUrl('Widgets/widgets.css'));
 export var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", "0.1.26");
+_defineProperty(DeepTwinsEngine3D, "Version", "0.1.28");
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);
@@ -73,6 +74,7 @@ _defineProperty(DeepTwinsEngine3D, "DynamicWallMaterialProperty", DynamicWallMat
 _defineProperty(DeepTwinsEngine3D, "CircleWaveMaterialProperty", CircleWaveMaterialProperty);
 _defineProperty(DeepTwinsEngine3D, "PolylineTrailLinkMaterialProperty", PolylineTrailLinkMaterialProperty);
 _defineProperty(DeepTwinsEngine3D, "ImageMaterialProperty", ImageMaterialProperty);
+_defineProperty(DeepTwinsEngine3D, "ImageGlowingMaterialAppearance", ImageGlowingMaterialAppearance);
 _defineProperty(DeepTwinsEngine3D, "VolumeCloud", VolumeCloud);
 _defineProperty(DeepTwinsEngine3D, "Heatmap2d", Heatmap2d);
 _defineProperty(DeepTwinsEngine3D, "Heatmap3d", Heatmap3d);

package/dist/esm/material/{CircleWaveMaterialProperty.js → entity/CircleWaveMaterialProperty.js}

@@ -20,11 +20,13 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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, isEqual, merge } from 'lodash';
-import { DEFAULT_CIRCLE_WAVE_MATERIAL_STYLE } from "../constant";
-import * as utils from "../tool/utils";
+import { DEFAULT_CIRCLE_WAVE_MATERIAL_STYLE } from "../../constant";
+import * as utils from "../../tool/utils";
+/* babel-plugin-inline-import '../shader/CircleWaveShader.glsl' */
+var CircleWaveShader = "czm_material czm_getMaterial(czm_materialInput materialInput) {\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    material.diffuse = 1.5 * color.rgb;\n\n    vec2 st = materialInput.st;\n    vec3 str = materialInput.str;\n    float dis = distance(st, vec2(0.5));\n    float per = fract(time);\n    float perDis = 0.5 / count;\n\n    // discard if str.z != 0\n    float discardByStr = step(0.001, abs(str.z));\n    // discard if dis > 0.5\n    float discardByDis = step(0.5, dis);\n\n    if (discardByStr > 0.0 || discardByDis > 0.0) {\n        discard;\n    }\n\n    float bl = 0.0;\n\n    for (int i = 0; i <= 9; i++) {\n        float idx = float(i);\n        float valid = step(idx, count);  // 1.0 if i <= count, else 0.0\n\n        float disNum = perDis * idx - dis + per / count;\n        float inFirst = step(0.0, disNum) * (1.0 - step(perDis, disNum));\n        float inSecond = step(perDis, disNum) * (1.0 - step(2.0 * perDis, disNum));\n\n        float bl1 = 1.0 - disNum / perDis;\n        float bl2 = 1.0 - abs(1.0 - disNum / perDis);\n\n        float thisBl = mix(0.0, bl1, inFirst) + mix(0.0, bl2, inSecond);\n        thisBl *= valid; // only apply if i <= count\n\n        bl = max(bl, thisBl); // \u4FDD\u7559\u6700\u5F3A\u7684\u4E00\u5C42\u6CE2\u7EB9\n    }\n\n    material.alpha = pow(bl, gradient);\n    return material;\n}\n";
 import BaseMaterialProperty from "./BaseMaterialProperty";
-/* babel-plugin-inline-import './shader/CircleWaveShader.glsl' */
-var CircleWaveShader = "czm_material czm_getMaterial(czm_materialInput materialInput) {\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    material.diffuse = 1.5 * color.rgb;\n\n    vec2 st = materialInput.st;\n    vec3 str = materialInput.str;\n    float dis = distance(st, vec2(0.5));\n    float per = fract(time);\n    float perDis = 0.5 / count;\n\n    // discard if str.z != 0\n    float discardByStr = step(0.001, abs(str.z));\n    // discard if dis > 0.5\n    float discardByDis = step(0.5, dis);\n\n    if (discardByStr > 0.0 || discardByDis > 0.0) {\n        discard;\n    }\n\n    float bl = 0.0;\n\n    for (int i = 0; i <= 9; i++) {\n        float idx = float(i);\n        float valid = step(idx, count);  // 1.0 if i <= count, else 0.0\n\n        float disNum = perDis * idx - dis + per / count;\n        float inFirst = step(0.0, disNum) * (1.0 - step(perDis, disNum));\n        float inSecond = step(perDis, disNum) * (1.0 - step(2.0 * perDis, disNum));\n\n        float bl1 = 1.0 - disNum / perDis;\n        float bl2 = 1.0 - abs(1.0 - disNum / perDis);\n\n        float thisBl = mix(0.0, bl1, inFirst) + mix(0.0, bl2, inSecond);\n        thisBl *= valid; // only apply if i <= count\n\n        bl = max(bl, thisBl); // \u4FDD\u7559\u6700\u5F3A\u7684\u4E00\u5C42\u6CE2\u7EB9\n    }\n\n    material.alpha = pow(bl, gradient);\n    return material;\n}\n"; // 水波纹材质
+
+// 水波纹材质
 var CircleWaveMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty) {
   _inherits(CircleWaveMaterialProperty, _BaseMaterialProperty);
   var _super = _createSuper(CircleWaveMaterialProperty);

package/dist/esm/material/{DynamicWallMaterialProperty.js → entity/DynamicWallMaterialProperty.js}

@@ -20,11 +20,13 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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, isEqual, merge } from 'lodash';
-import { DEFAULT_DYNAMIC_WALL_MATERIAL_STYLE } from "../constant";
-import * as utils from "../tool/utils";
+import { DEFAULT_DYNAMIC_WALL_MATERIAL_STYLE } from "../../constant";
+import * as utils from "../../tool/utils";
+/* babel-plugin-inline-import '../shader/DynamicWallShader.glsl' */
+var DynamicWallShader = "czm_material czm_getMaterial(czm_materialInput materialInput)\n{\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = materialInput.st;\n    float vertical = 1.0;\n    float directionAdd = 1.0;\n    // \u4F7F\u7528 abs(a - b) < 0.0001\uFF08\u901A\u8FC7 step\uFF09\u5224\u65AD\u6D6E\u70B9\u76F8\u7B49\uFF0C\u907F\u514D\u7CBE\u5EA6\u8BEF\u5DEE\n    // \u5224\u65AD\u6392\u5217\u65B9\u5411\u662F\u5426\u662F\u7EB5\u5411\uFF08freely == vertical\uFF09\n    float isVertical = 1.0 - step(0.0001, abs(freely - vertical));\n    // \u5224\u65AD\u8FD0\u52A8\u65B9\u5411\u662F\u5426\u662F\u52A0\uFF08direction == directionAdd\uFF09\n    float isAdd = 1.0 - step(0.0001, abs(direction - directionAdd));\n\n    // \u7EB5\u5411\u6392\u5217\uFF1Auv = (st.s, count * st.t \xB1 time)\n    // \u6A2A\u5411\u6392\u5217\uFF1Auv = (count * st.s \xB1 time, st.t)\n    vec2 uvVerticalAdd = vec2(fract(st.s), fract(count * st.t + time));\n    vec2 uvVerticalSub = vec2(fract(st.s), fract(count * st.t - time));\n    vec2 uvHorizontalAdd = vec2(fract(count * st.s + time), fract(st.t));\n    vec2 uvHorizontalSub = vec2(fract(count * st.s - time), fract(st.t));\n\n    // \u6309\u8FD0\u52A8\u65B9\u5411\u9009\u62E9 mix(a, b, t) \u4F5C\u7528\u7C7B\u4F3C\u4E8E t == 0 ? a : b\n    vec2 uvVertical = mix(uvVerticalSub, uvVerticalAdd, isAdd);\n    vec2 uvHorizontal = mix(uvHorizontalSub, uvHorizontalAdd, isAdd);\n\n    // \u6700\u7EC8\u6839\u636E\u6392\u5217\u65B9\u5411\u9009\u62E9\n    vec2 uv = mix(uvHorizontal, uvVertical, isVertical);\n\n    vec4 colorImage = texture(image, uv);\n    vec3 mixedColor = mix(colorImage.rgb, color.rgb, mixRatio);\n    vec4 fragColor;\n    fragColor.rgb = mixedColor;\n    fragColor = czm_gammaCorrect(fragColor);\n\n    material.diffuse = mixedColor;\n    material.alpha = colorImage.a * color.a; // \u53EF\u6839\u636E\u9700\u8981\u51B3\u5B9A\u662F\u5426\u76F8\u4E58\n    material.emission = fragColor.rgb;\n\n    return material;\n}\n";
 import BaseMaterialProperty from "./BaseMaterialProperty";
-/* babel-plugin-inline-import './shader/DynamicWallShader.glsl' */
-var DynamicWallShader = "czm_material czm_getMaterial(czm_materialInput materialInput)\n{\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = materialInput.st;\n    float vertical = 1.0;\n    float directionAdd = 1.0;\n    // \u4F7F\u7528 abs(a - b) < 0.0001\uFF08\u901A\u8FC7 step\uFF09\u5224\u65AD\u6D6E\u70B9\u76F8\u7B49\uFF0C\u907F\u514D\u7CBE\u5EA6\u8BEF\u5DEE\n    // \u5224\u65AD\u6392\u5217\u65B9\u5411\u662F\u5426\u662F\u7EB5\u5411\uFF08freely == vertical\uFF09\n    float isVertical = 1.0 - step(0.0001, abs(freely - vertical));\n    // \u5224\u65AD\u8FD0\u52A8\u65B9\u5411\u662F\u5426\u662F\u52A0\uFF08direction == directionAdd\uFF09\n    float isAdd = 1.0 - step(0.0001, abs(direction - directionAdd));\n\n    // \u7EB5\u5411\u6392\u5217\uFF1Auv = (st.s, count * st.t \xB1 time)\n    // \u6A2A\u5411\u6392\u5217\uFF1Auv = (count * st.s \xB1 time, st.t)\n    vec2 uvVerticalAdd = vec2(fract(st.s), fract(count * st.t + time));\n    vec2 uvVerticalSub = vec2(fract(st.s), fract(count * st.t - time));\n    vec2 uvHorizontalAdd = vec2(fract(count * st.s + time), fract(st.t));\n    vec2 uvHorizontalSub = vec2(fract(count * st.s - time), fract(st.t));\n\n    // \u6309\u8FD0\u52A8\u65B9\u5411\u9009\u62E9 mix(a, b, t) \u4F5C\u7528\u7C7B\u4F3C\u4E8E t == 0 ? a : b\n    vec2 uvVertical = mix(uvVerticalSub, uvVerticalAdd, isAdd);\n    vec2 uvHorizontal = mix(uvHorizontalSub, uvHorizontalAdd, isAdd);\n\n    // \u6700\u7EC8\u6839\u636E\u6392\u5217\u65B9\u5411\u9009\u62E9\n    vec2 uv = mix(uvHorizontal, uvVertical, isVertical);\n\n    vec4 colorImage = texture(image, uv);\n    vec3 mixedColor = mix(colorImage.rgb, color.rgb, mixRatio);\n    vec4 fragColor;\n    fragColor.rgb = mixedColor;\n    fragColor = czm_gammaCorrect(fragColor);\n\n    material.diffuse = mixedColor;\n    material.alpha = colorImage.a * color.a; // \u53EF\u6839\u636E\u9700\u8981\u51B3\u5B9A\u662F\u5426\u76F8\u4E58\n    material.emission = fragColor.rgb;\n\n    return material;\n}\n"; // 动态墙材质
+
+// 动态墙材质
 var DynamicWallMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty) {
   _inherits(DynamicWallMaterialProperty, _BaseMaterialProperty);
   var _super = _createSuper(DynamicWallMaterialProperty);

package/dist/esm/material/{ImageGlowingMaterialProperty.js → entity/ImageGlowingMaterialProperty.js}

@@ -19,11 +19,11 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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, isEqual, merge } from 'lodash';
-import { DEFAULT_GLOW_MATERIAL_STYLE } from "../constant";
-import * as utils from "../tool/utils";
-import BaseMaterialProperty from "./BaseMaterialProperty";
-/* babel-plugin-inline-import './shader/ImageGlowingShader.glsl' */
+import { DEFAULT_GLOW_MATERIAL_STYLE } from "../../constant";
+import * as utils from "../../tool/utils";
+/* babel-plugin-inline-import '../shader/ImageGlowingShader.glsl' */
 var ImageGlowingShader = "uniform sampler2D image;\nuniform float glowStrength;\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 * glowStrength;\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 BaseMaterialProperty from "./BaseMaterialProperty";
 var ImageGlowingMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty) {
   _inherits(ImageGlowingMaterialProperty, _BaseMaterialProperty);
   var _super = _createSuper(ImageGlowingMaterialProperty);

package/dist/esm/material/{ImageMaterialProperty.js → entity/ImageMaterialProperty.js}

@@ -12,7 +12,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 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 * as utils from "../../tool/utils";
 var ImageMaterialProperty = /*#__PURE__*/function (_Cesium$ImageMaterial) {
   _inherits(ImageMaterialProperty, _Cesium$ImageMaterial);
   var _super = _createSuper(ImageMaterialProperty);

package/dist/esm/material/{PolylineTrailLinkMaterialProperty.js → entity/PolylineTrailLinkMaterialProperty.js}

@@ -20,12 +20,12 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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, isEqual, merge } from 'lodash';
-import { CAMERA_EVENT_TYPE, DEFAULT_POLYLINE_TRAIL_LINK_MATERIAL_STYLE } from "../constant";
-import BaseLayer from "../graphicLayer/BaseLayer";
-import * as utils from "../tool/utils";
-import BaseMaterialProperty from "./BaseMaterialProperty";
-/* babel-plugin-inline-import './shader/PolylineTrailLinkShader.glsl' */
+import { CAMERA_EVENT_TYPE, DEFAULT_POLYLINE_TRAIL_LINK_MATERIAL_STYLE } from "../../constant";
+import BaseLayer from "../../graphicLayer/BaseLayer";
+import * as utils from "../../tool/utils";
+/* babel-plugin-inline-import '../shader/PolylineTrailLinkShader.glsl' */
 var PolylineTrailLinkShader = "czm_material czm_getMaterial(czm_materialInput materialInput)\n{\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = vec2(fract(materialInput.st.s * repeat.x - time), fract(materialInput.st.t * repeat.y));\n    vec4 colorImage = texture(image, vec2(fract(st.s - time), st.t));\n    material.alpha = colorImage.a * color.a;\n    material.diffuse = mix(colorImage.rgb, color.rgb, mixRatio);\n    return material;\n}\n";
+import BaseMaterialProperty from "./BaseMaterialProperty";
 var PolylineTrailLinkMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty) {
   _inherits(PolylineTrailLinkMaterialProperty, _BaseMaterialProperty);
   var _super = _createSuper(PolylineTrailLinkMaterialProperty);

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

@@ -0,0 +1,8 @@
+export default class BaseMaterialAppearance {
+    type: string;
+    style: any;
+    material: any;
+    appearance: any;
+    constructor(type: string, style: any);
+    getType(): string;
+}

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

@@ -0,0 +1,27 @@
+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 _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 _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 { v4 as uuidv4 } from 'uuid';
+var BaseMaterialAppearance = /*#__PURE__*/function () {
+  function BaseMaterialAppearance(type, style) {
+    _classCallCheck(this, BaseMaterialAppearance);
+    _defineProperty(this, "type", void 0);
+    _defineProperty(this, "style", void 0);
+    _defineProperty(this, "material", void 0);
+    _defineProperty(this, "appearance", void 0);
+    this.type = type + uuidv4();
+    this.style = style || {};
+  }
+  _createClass(BaseMaterialAppearance, [{
+    key: "getType",
+    value: function getType() {
+      return this.type;
+    }
+  }]);
+  return BaseMaterialAppearance;
+}();
+export { BaseMaterialAppearance as default };

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

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

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

@@ -0,0 +1,75 @@
+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_GLOW_MATERIAL_STYLE, DEFAULT_MATERIAL_APPEARANCE } from "../../constant";
+import * as utils from "../../tool/utils";
+/* babel-plugin-inline-import '../shader/ImageGlowingShader.glsl' */
+var ImageGlowingShader = "uniform sampler2D image;\nuniform float glowStrength;\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 * glowStrength;\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";
+var ImageGlowingMaterialAppearance = /*#__PURE__*/function (_BaseMaterialAppearan) {
+  _inherits(ImageGlowingMaterialAppearance, _BaseMaterialAppearan);
+  var _super = _createSuper(ImageGlowingMaterialAppearance);
+  function ImageGlowingMaterialAppearance(material, appearance) {
+    var _this;
+    _classCallCheck(this, ImageGlowingMaterialAppearance);
+    var mergeMaterial = merge(DEFAULT_GLOW_MATERIAL_STYLE(), cloneDeep(material || {}));
+    _this = _super.call(this, 'ImageGlowingMaterialAsset', mergeMaterial);
+    _defineProperty(_assertThisInitialized(_this), "currMaterial", void 0);
+    _defineProperty(_assertThisInitialized(_this), "currAppearance", void 0);
+    _this.currMaterial = ImageGlowingMaterialAppearance.handleMaterial(mergeMaterial);
+    _this.currAppearance = merge(DEFAULT_MATERIAL_APPEARANCE(), appearance || {});
+    _this._createMaterial();
+    return _this;
+  }
+
+  // 处理参数
+  _createClass(ImageGlowingMaterialAppearance, [{
+    key: "_createMaterial",
+    value: function _createMaterial() {
+      this.material = new Cesium.Material({
+        fabric: {
+          type: this.type,
+          uniforms: _objectSpread({}, this.currMaterial),
+          source: ImageGlowingShader
+        }
+      });
+      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 ImageGlowingMaterialAppearance;
+}(BaseMaterialAppearance);
+export default ImageGlowingMaterialAppearance;