deeptwins-engine-3d 0.0.42 → 0.0.44

package/dist/material/CircleWaveMaterialProperty.js

@@ -1,108 +1,100 @@
+var _excluded = ["duration", "gradient"],
+  _excluded2 = ["color", "count", "gradient"];
 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 { v4 as uuidv4 } from 'uuid';
+import { cloneDeep, isEqual, merge } from 'lodash';
+import { DEFAULT_CIRCLE_WAVE_MATERIAL_STYLE } from "../constant";
 import * as utils from "../tool/utils";
-var CircleWaveMaterialProperty = /*#__PURE__*/function () {
-  function CircleWaveMaterialProperty(options) {
+import BaseMaterialProperty from "./BaseMaterialProperty";
+import CircleWaveShader from "./shader/CircleWaveShader.glsl";
+
+// 水波纹材质
+var CircleWaveMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty) {
+  _inherits(CircleWaveMaterialProperty, _BaseMaterialProperty);
+  var _super = _createSuper(CircleWaveMaterialProperty);
+  function CircleWaveMaterialProperty(style) {
+    var _this;
     _classCallCheck(this, CircleWaveMaterialProperty);
-    _defineProperty(this, "_definitionChanged", new Cesium.Event());
-    _defineProperty(this, "color", void 0);
-    _defineProperty(this, "duration", void 0);
-    _defineProperty(this, "count", void 0);
-    _defineProperty(this, "gradient", void 0);
-    _defineProperty(this, "time", void 0);
-    _defineProperty(this, "materialType", void 0);
-    this.materialType = 'CircleWaveMaterial' + uuidv4();
-    this.color = utils.colorString(options.color) || Cesium.Color.BLUE;
-    this.duration = options.duration || 2;
-    this.count = options.count || 3;
-    if (this.count <= 0) {
-      this.count = 1;
-    }
-    this.gradient = options.gradient || 0.1;
-    if (this.gradient > 1) {
-      this.gradient = 1;
-    }
-    this.time = new Date().getTime();
-    this._init();
+    var mergeStyle = merge(DEFAULT_CIRCLE_WAVE_MATERIAL_STYLE(), cloneDeep(style || {}));
+    _this = _super.call(this, 'CircleWaveMaterial', mergeStyle);
+    _defineProperty(_assertThisInitialized(_this), "currStyle", void 0);
+    _this.currStyle = CircleWaveMaterialProperty.handleStyle(mergeStyle);
+    _this._init();
+    return _this;
   }
+
+  // 处理参数
   _createClass(CircleWaveMaterialProperty, [{
     key: "_init",
     value: function _init() {
       // @ts-ignore
-      Cesium.Material._materialCache.addMaterial(this.materialType, {
+      Cesium.Material._materialCache.addMaterial(this.type, {
         fabric: {
-          type: this.materialType,
-          uniforms: {
-            color: new Cesium.Color(181, 241, 254, 1),
-            time: 1,
-            count: 1,
-            gradient: 0.1
-          },
-          source: this.getShader()
+          type: this.type,
+          uniforms: _objectSpread(_objectSpread({}, this.currStyle), {}, {
+            time: this._time
+          }),
+          source: CircleWaveShader
         },
         translucent: function translucent() {
           return true;
         }
       });
     }
-  }, {
-    key: "isConstant",
-    get: function get() {
-      return false;
-    }
-  }, {
-    key: "definitionChanged",
-    get: function get() {
-      return this._definitionChanged;
-    }
-  }, {
-    key: "getType",
-    value: function getType() {
-      return this.materialType;
-    }
   }, {
     key: "getValue",
     value: function getValue(time, result) {
+      var _Object$keys;
       if (!Cesium.defined(result)) {
         result = {};
       }
-      // @ts-ignore
-      result.color = Cesium.Property.getValueOrClonedDefault(this.color, time, Cesium.Color.WHITE, result.color);
-      result.time = (new Date().getTime() - this.time) % (this.duration * 1000) / (this.duration * 1000);
-      result.count = this.count;
-      result.gradient = 1 + 10 * (1 - this.gradient);
+      var _this$currStyle = this.currStyle,
+        duration = _this$currStyle.duration,
+        gradient = _this$currStyle.gradient,
+        options = _objectWithoutProperties(_this$currStyle, _excluded);
+      (_Object$keys = Object.keys(options)) === null || _Object$keys === void 0 || _Object$keys.forEach(function (key) {
+        result[key] = options[key];
+      });
+      result.time = (new Date().getTime() - this._time) % (duration * 1000) / (duration * 1000);
+      result.gradient = 1 + 10 * (1 - gradient);
       return result;
     }
   }, {
     key: "equals",
     value: function equals(other) {
-      return this === other || other instanceof CircleWaveMaterialProperty &&
-      // @ts-ignore
-      Cesium.Property.equals(this.color, other.color) && this.duration === other.duration && this.count === other.count && this.gradient === other.gradient;
+      return other instanceof CircleWaveMaterialProperty && isEqual(this.style, other.style);
     }
-  }, {
-    key: "getShader",
-    value: function getShader() {
-      return "\n                      czm_material czm_getMaterial(czm_materialInput materialInput) {\n                        czm_material material = czm_getDefaultMaterial(materialInput);\n                        material.diffuse = 1.5 * color.rgb;\n                        vec2 st = materialInput.st;\n                        vec3 str = materialInput.str;\n                        float dis = distance(st, vec2(0.5, 0.5));\n                        float per = fract(time);\n                        if (abs(str.z) > 0.001) {\n                          discard;\n                        }\n                        if (dis > 0.5) {\n                          discard;\n                        } else {\n                          float perDis = 0.5 / count;\n                          float disNum;\n                          float bl = .0;\n                          for (int i = 0; i <= 9; i++) {\n                            if (float(i) <= count) {\n                              disNum = perDis *float(i) - dis + per / count;\n                              if (disNum > 0.0) {\n                                if (disNum < perDis) {\n                                  bl = 1.0 - disNum / perDis;\n                                } else if(disNum - perDis < perDis) {\n                                  bl = 1.0 - abs(1.0 - disNum / perDis);\n                                }\n                                material.alpha = pow(bl, gradient);\n                              }\n                            }\n                          }\n                        }\n                        return material;\n                      }\n                      ";
+  }], [{
+    key: "handleStyle",
+    value: function handleStyle(style) {
+      var color = style.color,
+        count = style.count,
+        gradient = style.gradient,
+        options = _objectWithoutProperties(style, _excluded2);
+      var backStyle = _objectSpread({}, options);
+      backStyle.color = utils.colorString(color);
+      backStyle.count = count <= 0 ? 1 : count;
+      backStyle.gradient = gradient <= 0 ? 0 : gradient > 1 ? 1 : gradient;
+      return backStyle;
     }
   }]);
   return CircleWaveMaterialProperty;
-}();
-export { CircleWaveMaterialProperty as default };
-Object.defineProperties(CircleWaveMaterialProperty.prototype, {
-  // @ts-ignore
-  color: Cesium.createPropertyDescriptor('color'),
-  // @ts-ignore
-  gradient: Cesium.createPropertyDescriptor('gradient'),
-  // @ts-ignore
-  duration: Cesium.createPropertyDescriptor('duration'),
-  // @ts-ignore
-  count: Cesium.createPropertyDescriptor('count')
-});
+}(BaseMaterialProperty);
+export { CircleWaveMaterialProperty as default };

package/dist/material/DynamicWallMaterialProperty.d.ts

@@ -1,45 +1,9 @@
-export default class DynamicWallMaterialProperty {
-    private _definitionChanged;
-    private _time;
-    color: string;
-    mixRatio: number;
-    duration: number;
-    direction: string;
-    freely: string;
-    image: any;
-    count: number;
-    materialType: any;
-    private _map;
-    constructor(options: any);
+import BaseMaterialProperty from './BaseMaterialProperty';
+export default class DynamicWallMaterialProperty extends BaseMaterialProperty {
+    private readonly currStyle;
+    constructor(style: any);
+    static handleStyle(style: any): any;
     private _init;
-    get isConstant(): boolean;
-    get definitionChanged(): any;
-    /**
-     * 获取材质类型
-     * @returns {String} 材质类型
-     */
-    getType(): any;
-    /**
-     * 获取材质值
-     * @param {Cesium.JulianDate} time 当前时间
-     * @param {Object} [result] 输出结果对象
-     * @returns {Object} 材质值
-     */
     getValue(time: any, result: any): any;
-    /**
-     * 判断材质是否相等
-     * @param {DynamicWallMaterialProperty} other 另一个材质实例
-     * @returns {Boolean} 是否相等
-     */
-    equals(other: any): any;
-    /**
-     * 带方向的墙体
-     * @param {*} options.get:true/false
-     * @param {*} options.count:数量
-     * @param {*} options.freely:vertical/horizontal
-     * @param {*} options.direction:+/-
-     * @param {*} options.color:颜色
-     * @param {*} options.mixRatio:颜色混合比例
-     */
-    getShader(options: any): string | undefined;
+    equals(other: any): boolean;
 }

package/dist/material/DynamicWallMaterialProperty.js

@@ -1,162 +1,100 @@
+var _excluded = ["duration"],
+  _excluded2 = ["color", "count", "freely", "direction"];
 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 { v4 as uuidv4 } from 'uuid';
+import { cloneDeep, isEqual, merge } from 'lodash';
+import { DEFAULT_DYNAMIC_WALL_MATERIAL_STYLE } from "../constant";
 import * as utils from "../tool/utils";
+import BaseMaterialProperty from "./BaseMaterialProperty";
+import DynamicWallShader from "./shader/DynamicWallShader.glsl";
 
 // 动态墙材质
-var DynamicWallMaterialProperty = /*#__PURE__*/function () {
-  function DynamicWallMaterialProperty(options) {
+var DynamicWallMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty) {
+  _inherits(DynamicWallMaterialProperty, _BaseMaterialProperty);
+  var _super = _createSuper(DynamicWallMaterialProperty);
+  function DynamicWallMaterialProperty(style) {
+    var _this;
     _classCallCheck(this, DynamicWallMaterialProperty);
-    _defineProperty(this, "_definitionChanged", new Cesium.Event());
-    _defineProperty(this, "_time", void 0);
-    _defineProperty(this, "color", void 0);
-    _defineProperty(this, "mixRatio", void 0);
-    _defineProperty(this, "duration", void 0);
-    _defineProperty(this, "direction", void 0);
-    _defineProperty(this, "freely", void 0);
-    _defineProperty(this, "image", void 0);
-    _defineProperty(this, "count", void 0);
-    _defineProperty(this, "materialType", void 0);
-    _defineProperty(this, "_map", void 0);
-    this.materialType = 'DynamicWallMaterial' + uuidv4();
-    this._time = new Date().getTime();
-    this.color = utils.colorString(options.color) || Cesium.Color.BLUE;
-    this.mixRatio = options.mixRatio || 0.5;
-    this.duration = options.duration || 2;
-    this.direction = options.direction || '-';
-    this.freely = options.freely || 'vertical';
-    this.count = options.count || 3;
-    if (this.count <= 0) {
-      this.count = 1;
-    }
-    this.image = options.image || utils.getDeepTwinsFile('Image/wall.png');
-    this._map = options.map;
-    this._init();
+    var mergeStyle = merge(DEFAULT_DYNAMIC_WALL_MATERIAL_STYLE(), cloneDeep(style || {}));
+    _this = _super.call(this, 'DynamicWallMaterial', mergeStyle);
+    _defineProperty(_assertThisInitialized(_this), "currStyle", void 0);
+    _this.currStyle = DynamicWallMaterialProperty.handleStyle(mergeStyle);
+    _this._init();
+    return _this;
   }
+
+  // 处理参数
   _createClass(DynamicWallMaterialProperty, [{
     key: "_init",
     value: function _init() {
       // @ts-ignore
-      Cesium.Material._materialCache.addMaterial(this.materialType, {
+      Cesium.Material._materialCache.addMaterial(this.type, {
         fabric: {
-          type: this.materialType,
-          uniforms: {
-            color: new Cesium.Color(1.0, 0.0, 0.0, 0.5),
-            image: Cesium.Material.DefaultImageId,
-            time: -20
-          },
-          source: this.getShader({
-            get: true,
-            count: this.count,
-            freely: this.freely,
-            direction: this.direction,
-            color: this.color,
-            mixRatio: this.mixRatio
-          })
+          type: this.type,
+          uniforms: _objectSpread(_objectSpread({}, this.currStyle), {}, {
+            time: this._time
+          }),
+          source: DynamicWallShader
         },
         translucent: function translucent() {
           return true;
         }
       });
     }
-  }, {
-    key: "isConstant",
-    get: function get() {
-      return false;
-    }
-  }, {
-    key: "definitionChanged",
-    get: function get() {
-      return this._definitionChanged;
-    }
-
-    /**
-     * 获取材质类型
-     * @returns {String} 材质类型
-     */
-  }, {
-    key: "getType",
-    value: function getType() {
-      return this.materialType;
-    }
-
-    /**
-     * 获取材质值
-     * @param {Cesium.JulianDate} time 当前时间
-     * @param {Object} [result] 输出结果对象
-     * @returns {Object} 材质值
-     */
   }, {
     key: "getValue",
     value: function getValue(time, result) {
+      var _Object$keys;
       if (!Cesium.defined(result)) {
         result = {};
       }
-      // @ts-ignore
-      result.color = Cesium.Property.getValueOrClonedDefault(
-      // this._color,
-      this.color, time, Cesium.Color.WHITE, result.color);
-      result.image = this.image;
-      if (this.duration) {
-        result.time = (new Date().getTime() - this._time) % (this.duration * 1000) / (this.duration * 1000);
-      }
-      this._map.scene.requestRender();
+      var _this$currStyle = this.currStyle,
+        duration = _this$currStyle.duration,
+        options = _objectWithoutProperties(_this$currStyle, _excluded);
+      (_Object$keys = Object.keys(options)) === null || _Object$keys === void 0 || _Object$keys.forEach(function (key) {
+        result[key] = options[key];
+      });
+      result.time = (new Date().getTime() - this._time) % (duration * 1000) / (duration * 1000);
       return result;
     }
-
-    /**
-     * 判断材质是否相等
-     * @param {DynamicWallMaterialProperty} other 另一个材质实例
-     * @returns {Boolean} 是否相等
-     */
   }, {
     key: "equals",
     value: function equals(other) {
-      return this === other || other instanceof DynamicWallMaterialProperty &&
-      // @ts-ignore
-      Cesium.Property.equals(this.color, other.color) && this.duration === other.duration && this.direction === other.direction && this.freely === other.freely && this.image === other.image && this.count === other.count && this.mixRatio === other.mixRatio;
+      return other instanceof DynamicWallMaterialProperty && isEqual(this.style, other.style);
     }
-
-    /**
-     * 带方向的墙体
-     * @param {*} options.get:true/false
-     * @param {*} options.count:数量
-     * @param {*} options.freely:vertical/horizontal
-     * @param {*} options.direction:+/-
-     * @param {*} options.color:颜色
-     * @param {*} options.mixRatio:颜色混合比例
-     */
-  }, {
-    key: "getShader",
-    value: function getShader(options) {
-      if (options && options.get) {
-        var materail = 'czm_material czm_getMaterial(czm_materialInput materialInput)\n\
-      {\n\
-          czm_material material = czm_getDefaultMaterial(materialInput);\n\
-          vec2 st = materialInput.st;';
-        if (options.freely == 'vertical') {
-          //（由下到上）
-          materail += 'vec4 colorImage = texture(image, vec2(fract(st.s), fract(float(' + options.count + ')*st.t' + options.direction + ' time)));\n ';
-        } else {
-          //（逆时针）
-          materail += 'vec4 colorImage = texture(image, vec2(fract(float(' + options.count + ')*st.s ' + options.direction + ' time), fract(st.t)));\n ';
-        }
-        //泛光
-        materail += "\n        vec3 mixedColor = mix(colorImage.rgb, color.rgb, ".concat(options.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      }");
-        return materail;
-      }
+  }], [{
+    key: "handleStyle",
+    value: function handleStyle(style) {
+      var color = style.color,
+        count = style.count,
+        freely = style.freely,
+        direction = style.direction,
+        options = _objectWithoutProperties(style, _excluded2);
+      var backStyle = _objectSpread({}, options);
+      backStyle.color = utils.colorString(color);
+      backStyle.count = count <= 0 ? 1 : count;
+      backStyle.freely = freely === 'vertical' ? 1.0 : 0.0;
+      backStyle.direction = direction === '+' ? 1.0 : 0.0;
+      return backStyle;
     }
   }]);
   return DynamicWallMaterialProperty;
-}();
-export { DynamicWallMaterialProperty as default };
-Object.defineProperties(DynamicWallMaterialProperty.prototype, {
-  // @ts-ignore
-  color: Cesium.createPropertyDescriptor('color')
-});
+}(BaseMaterialProperty);
+export { DynamicWallMaterialProperty as default };

package/dist/material/PolylineTrailLinkMaterialProperty.d.ts

@@ -1,19 +1,9 @@
-export default class PolylineTrailLinkMaterialProperty {
-    private _definitionChanged;
-    private _color;
-    private _time;
-    color: any;
-    mixRatio: number;
-    duration: number;
-    image: any;
-    count: number;
-    materialType: any;
-    constructor(options: any);
+import BaseMaterialProperty from './BaseMaterialProperty';
+export default class PolylineTrailLinkMaterialProperty extends BaseMaterialProperty {
+    private readonly currStyle;
+    constructor(style: any);
+    static handleStyle(style: any): any;
     private _init;
-    get isConstant(): boolean;
-    get definitionChanged(): any;
-    getType(): any;
     getValue(time: any, result: any): any;
-    equals(other: any): any;
-    getShader(): string;
+    equals(other: any): boolean;
 }