@antv/l7-layers 2.9.17-alpha.0 → 2.9.17

package/es/utils/simpleLine.js

@@ -0,0 +1,105 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { aProjectFlat } from '@antv/l7-utils';
+import { vec2 } from 'gl-matrix';
+var lineA = vec2.create();
+export function direction(out, a, b) {
+  vec2.sub(out, a, b);
+  vec2.normalize(out, out);
+  return out;
+}
+
+var ExtrudePolyline = function () {
+  function ExtrudePolyline() {
+    _classCallCheck(this, ExtrudePolyline);
+
+    _defineProperty(this, "complex", void 0);
+
+    _defineProperty(this, "started", false);
+
+    _defineProperty(this, "totalDistance", 0);
+
+    _defineProperty(this, "currentIndex", 0);
+
+    this.complex = {
+      positions: [],
+      indices: [],
+      startIndex: 0,
+      indexes: []
+    };
+  }
+
+  _createClass(ExtrudePolyline, [{
+    key: "simpleExtrude",
+    value: function simpleExtrude(points) {
+      var complex = this.complex;
+
+      if (points.length <= 1) {
+        return complex;
+      }
+
+      this.started = false;
+      this.totalDistance = 0;
+      var total = points.length;
+      var count = complex.startIndex;
+
+      for (var i = 1; i < total; i++) {
+        var last = points[i - 1];
+        var cur = points[i];
+        var amt = this.simpleSegment(complex, count, last, cur);
+        count += amt;
+      }
+
+      for (var _i = 0; _i < complex.positions.length / 6; _i++) {
+        complex.positions[_i * 6 + 5] = this.totalDistance;
+      }
+
+      return complex;
+    }
+  }, {
+    key: "simpleSegment",
+    value: function simpleSegment(complex, index, last, cur) {
+      var count = 0;
+      var indices = complex.indices;
+      var positions = complex.positions;
+      var flatCur = aProjectFlat([cur[0], cur[1]]);
+      var flatLast = aProjectFlat([last[0], last[1]]);
+      direction(lineA, flatCur, flatLast);
+      var segmentDistance = this.lineSegmentDistance(flatCur, flatLast);
+      this.totalDistance += segmentDistance;
+
+      if (!this.started) {
+        this.started = true;
+        this.extrusions(positions, last, this.totalDistance - segmentDistance);
+      }
+
+      this.extrusions(positions, cur, this.totalDistance);
+      indices.push(index + 0, index + 1, index + 2);
+      indices.push(index + 2, index + 1, index + 3);
+      count += 2;
+      return count;
+    }
+  }, {
+    key: "extrusions",
+    value: function extrusions(positions, point, distanceRadio) {
+      positions.push(point[0], point[1], point[2] | 0, distanceRadio, 0, point[2] | 0);
+      this.complex.indexes.push(this.currentIndex);
+      positions.push(point[0], point[1], point[2] | 0, distanceRadio, 0, point[2] | 0);
+      this.complex.indexes.push(this.currentIndex);
+      this.currentIndex++;
+    }
+  }, {
+    key: "lineSegmentDistance",
+    value: function lineSegmentDistance(b1, a1) {
+      var dx = a1[0] - b1[0];
+      var dy = a1[1] - b1[1];
+      return Math.sqrt(dx * dx + dy * dy);
+    }
+  }]);
+
+  return ExtrudePolyline;
+}();
+
+export { ExtrudePolyline as default };
+//# sourceMappingURL=simpleLine.js.map

package/es/utils/simpleLine.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utils/simpleLine.ts"],"names":["aProjectFlat","vec2","lineA","create","direction","out","a","b","sub","normalize","ExtrudePolyline","complex","positions","indices","startIndex","indexes","points","length","started","totalDistance","total","count","i","last","cur","amt","simpleSegment","index","flatCur","flatLast","segmentDistance","lineSegmentDistance","extrusions","push","point","distanceRadio","currentIndex","b1","a1","dx","dy","Math","sqrt"],"mappings":"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","sourcesContent":["import { aProjectFlat } from '@antv/l7-utils';\nimport { vec2, vec3 } from 'gl-matrix';\n\nconst lineA = vec2.create();\n\nexport function direction(out: vec2, a: vec2, b: vec2) {\n  vec2.sub(out, a, b);\n  vec2.normalize(out, out);\n  return out;\n}\n\nexport default class ExtrudePolyline {\n  public complex: {\n    positions: number[];\n    indices: number[];\n    startIndex: number;\n    indexes: number[];\n  };\n\n  private started: boolean = false;\n\n  private totalDistance: number = 0;\n  private currentIndex: number = 0;\n\n  constructor() {\n    this.complex = {\n      positions: [],\n      indices: [],\n      startIndex: 0,\n      indexes: [],\n    };\n  }\n\n  public simpleExtrude(points: number[][]) {\n    const complex = this.complex;\n    if (points.length <= 1) {\n      return complex;\n    }\n\n    this.started = false;\n\n    this.totalDistance = 0;\n\n    const total = points.length;\n    let count = complex.startIndex;\n    for (let i = 1; i < total; i++) {\n      const last = points[i - 1] as vec3;\n      const cur = points[i] as vec3;\n      const amt = this.simpleSegment(complex, count, last, cur);\n      count += amt;\n    }\n\n    for (let i = 0; i < complex.positions.length / 6; i++) {\n      complex.positions[i * 6 + 5] = this.totalDistance;\n    }\n    return complex;\n  }\n  private simpleSegment(complex: any, index: number, last: vec3, cur: vec3) {\n    let count = 0;\n    const indices = complex.indices;\n    const positions = complex.positions;\n    const flatCur = aProjectFlat([cur[0], cur[1]]) as [number, number];\n    const flatLast = aProjectFlat([last[0], last[1]]) as [number, number];\n\n    direction(lineA, flatCur, flatLast);\n\n    const segmentDistance = this.lineSegmentDistance(flatCur, flatLast);\n    this.totalDistance += segmentDistance;\n\n    if (!this.started) {\n      this.started = true;\n      this.extrusions(positions, last, this.totalDistance - segmentDistance);\n    }\n\n    this.extrusions(positions, cur, this.totalDistance);\n    indices.push(index + 0, index + 1, index + 2);\n    indices.push(index + 2, index + 1, index + 3);\n    count += 2;\n\n    return count;\n  }\n  private extrusions(\n    positions: number[],\n    point: vec3, // 顶点\n    distanceRadio: number,\n  ) {\n    positions.push(\n      point[0],\n      point[1],\n      point[2] | 0,\n      distanceRadio,\n      0,\n      point[2] | 0,\n    );\n    this.complex.indexes.push(this.currentIndex);\n    positions.push(\n      point[0],\n      point[1],\n      point[2] | 0,\n      distanceRadio,\n      0,\n      point[2] | 0,\n    );\n    this.complex.indexes.push(this.currentIndex);\n    this.currentIndex++;\n  }\n  private lineSegmentDistance(b1: [number, number], a1: [number, number]) {\n    const dx = a1[0] - b1[0];\n    const dy = a1[1] - b1[1];\n    return Math.sqrt(dx * dx + dy * dy);\n  }\n}\n"],"file":"simpleLine.js"}

package/es/wind/index.js

@@ -37,24 +37,14 @@ var WindLayer = function (_BaseLayer) {
   _createClass(WindLayer, [{
     key: "buildModels",
     value: function buildModels() {
-      var _this2 = this;
-
       var modelType = this.getModelType();
       this.layerModel = new WindModels[modelType](this);
-      this.layerModel.initModels(function (models) {
-        _this2.models = models;
-
-        _this2.renderLayers();
-      });
+      this.models = this.layerModel.initModels();
     }
   }, {
     key: "rebuildModels",
     value: function rebuildModels() {
-      var _this3 = this;
-
-      this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
-      });
+      this.models = this.layerModel.buildModels();
     }
   }, {
     key: "renderModels",

package/es/wind/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/wind/index.ts"],"names":["BaseLayer","WindModels","WindLayer","modelType","getModelType","layerModel","initModels","models","renderLayers","buildModels","render","properties","opacity","type","minimum","maximum","defaultConfig","wind"],"mappings":";;;;;;;;;;;;AAAA,OAAOA,SAAP,MAAsB,mBAAtB;AAEA,OAAOC,UAAP,MAA0C,UAA1C;;IACqBC,S;;;;;;;;;;;;;;;;2DACG,W;;;;;;;WACtB,uBAAqB;AAAA;;AACnB,UAAMC,SAAS,GAAG,KAAKC,YAAL,EAAlB;AACA,WAAKC,UAAL,GAAkB,IAAIJ,UAAU,CAACE,SAAD,CAAd,CAA0B,IAA1B,CAAlB;AACA,WAAKE,UAAL,CAAgBC,UAAhB,CAA2B,UAACC,MAAD,EAAY;AACrC,QAAA,MAAI,CAACA,MAAL,GAAcA,MAAd;;AACA,QAAA,MAAI,CAACC,YAAL;AACD,OAHD;AAID;;;WACD,yBAAuB;AAAA;;AACrB,WAAKH,UAAL,CAAgBI,WAAhB,CAA4B,UAACF,MAAD;AAAA,eAAa,MAAI,CAACA,MAAL,GAAcA,MAA3B;AAAA,OAA5B;AACD;;;WAED,wBAAsB;AACpB,UAAI,KAAKF,UAAT,EAAqB;AACnB,aAAKA,UAAL,CAAgBK,MAAhB;AACD;;AAED,aAAO,IAAP;AACD;;;WACD,2BAA4B;AAC1B,aAAO;AACLC,QAAAA,UAAU,EAAE;AACVC,UAAAA,OAAO,EAAE;AACPC,YAAAA,IAAI,EAAE,QADC;AAEPC,YAAAA,OAAO,EAAE,CAFF;AAGPC,YAAAA,OAAO,EAAE;AAHF;AADC;AADP,OAAP;AASD;;;WACD,4BAA6B;AAC3B,UAAMF,IAAI,GAAG,KAAKT,YAAL,EAAb;AACA,UAAMY,aAAa,GAAG;AACpBC,QAAAA,IAAI,EAAE;AADc,OAAtB;AAGA,aAAOD,aAAa,CAACH,IAAD,CAApB;AACD;;;WAED,wBAAwC;AACtC,aAAO,MAAP;AACD;;;;EA1CoCb,S;;SAAlBE,S","sourcesContent":["import BaseLayer from '../core/BaseLayer';\nimport { IWindLayerStyleOptions } from '../core/interface';\nimport WindModels, { WindModelType } from './models';\nexport default class WindLayer extends BaseLayer<IWindLayerStyleOptions> {\n  public type: string = 'WindLayer';\n  public buildModels() {\n    const modelType = this.getModelType();\n    this.layerModel = new WindModels[modelType](this);\n    this.layerModel.initModels((models) => {\n      this.models = models;\n      this.renderLayers();\n    });\n  }\n  public rebuildModels() {\n    this.layerModel.buildModels((models) => (this.models = models));\n  }\n\n  public renderModels() {\n    if (this.layerModel) {\n      this.layerModel.render(); // 独立的渲染流程\n    }\n\n    return this;\n  }\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n  protected getDefaultConfig() {\n    const type = this.getModelType();\n    const defaultConfig = {\n      wind: {},\n    };\n    return defaultConfig[type];\n  }\n\n  protected getModelType(): WindModelType {\n    return 'wind';\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/wind/index.ts"],"names":["BaseLayer","WindModels","WindLayer","modelType","getModelType","layerModel","models","initModels","buildModels","render","properties","opacity","type","minimum","maximum","defaultConfig","wind"],"mappings":";;;;;;;;;;;;AAAA,OAAOA,SAAP,MAAsB,mBAAtB;AAEA,OAAOC,UAAP,MAA0C,UAA1C;;IACqBC,S;;;;;;;;;;;;;;;;2DACG,W;;;;;;;WACtB,uBAAqB;AACnB,UAAMC,SAAS,GAAG,KAAKC,YAAL,EAAlB;AACA,WAAKC,UAAL,GAAkB,IAAIJ,UAAU,CAACE,SAAD,CAAd,CAA0B,IAA1B,CAAlB;AACA,WAAKG,MAAL,GAAc,KAAKD,UAAL,CAAgBE,UAAhB,EAAd;AACD;;;WACD,yBAAuB;AACrB,WAAKD,MAAL,GAAc,KAAKD,UAAL,CAAgBG,WAAhB,EAAd;AACD;;;WAED,wBAAsB;AACpB,UAAI,KAAKH,UAAT,EAAqB;AACnB,aAAKA,UAAL,CAAgBI,MAAhB;AACD;;AAED,aAAO,IAAP;AACD;;;WACD,2BAA4B;AAC1B,aAAO;AACLC,QAAAA,UAAU,EAAE;AACVC,UAAAA,OAAO,EAAE;AACPC,YAAAA,IAAI,EAAE,QADC;AAEPC,YAAAA,OAAO,EAAE,CAFF;AAGPC,YAAAA,OAAO,EAAE;AAHF;AADC;AADP,OAAP;AASD;;;WACD,4BAA6B;AAC3B,UAAMF,IAAI,GAAG,KAAKR,YAAL,EAAb;AACA,UAAMW,aAAa,GAAG;AACpBC,QAAAA,IAAI,EAAE;AADc,OAAtB;AAGA,aAAOD,aAAa,CAACH,IAAD,CAApB;AACD;;;WAED,wBAAwC;AACtC,aAAO,MAAP;AACD;;;;EAvCoCZ,S;;SAAlBE,S","sourcesContent":["import BaseLayer from '../core/BaseLayer';\nimport { IWindLayerStyleOptions } from '../core/interface';\nimport WindModels, { WindModelType } from './models';\nexport default class WindLayer extends BaseLayer<IWindLayerStyleOptions> {\n  public type: string = 'WindLayer';\n  public buildModels() {\n    const modelType = this.getModelType();\n    this.layerModel = new WindModels[modelType](this);\n    this.models = this.layerModel.initModels();\n  }\n  public rebuildModels() {\n    this.models = this.layerModel.buildModels();\n  }\n\n  public renderModels() {\n    if (this.layerModel) {\n      this.layerModel.render(); // 独立的渲染流程\n    }\n\n    return this;\n  }\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n  protected getDefaultConfig() {\n    const type = this.getModelType();\n    const defaultConfig = {\n      wind: {},\n    };\n    return defaultConfig[type];\n  }\n\n  protected getModelType(): WindModelType {\n    return 'wind';\n  }\n}\n"],"file":"index.js"}

package/es/wind/models/wind.d.ts

@@ -9,12 +9,12 @@ export default class WindModel extends BaseModel {
     private frequency;
     render(): void;
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): IModel[];
     getWindSize(): {
         imageWidth: number;
         imageHeight: number;
     };
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): IModel[];
     clearModels(): void;
     protected getConfigSchema(): {
         properties: {

package/es/wind/models/wind.js

@@ -76,9 +76,35 @@ var WindModel = function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
+    value: function initModels() {
       var _this3 = this;
 
+      var _ref = this.layer.getLayerConfig(),
+          _ref$uMin = _ref.uMin,
+          uMin = _ref$uMin === void 0 ? -21.32 : _ref$uMin,
+          _ref$uMax = _ref.uMax,
+          uMax = _ref$uMax === void 0 ? 26.8 : _ref$uMax,
+          _ref$vMin = _ref.vMin,
+          vMin = _ref$vMin === void 0 ? -21.57 : _ref$vMin,
+          _ref$vMax = _ref.vMax,
+          vMax = _ref$vMax === void 0 ? 21.42 : _ref$vMax,
+          _ref$fadeOpacity = _ref.fadeOpacity,
+          fadeOpacity = _ref$fadeOpacity === void 0 ? 0.996 : _ref$fadeOpacity,
+          _ref$speedFactor = _ref.speedFactor,
+          speedFactor = _ref$speedFactor === void 0 ? 0.25 : _ref$speedFactor,
+          _ref$dropRate = _ref.dropRate,
+          dropRate = _ref$dropRate === void 0 ? 0.003 : _ref$dropRate,
+          _ref$dropRateBump = _ref.dropRateBump,
+          dropRateBump = _ref$dropRateBump === void 0 ? 0.01 : _ref$dropRateBump,
+          _ref$rampColors = _ref.rampColors,
+          rampColors = _ref$rampColors === void 0 ? defaultRampColors : _ref$rampColors,
+          _ref$sizeScale = _ref.sizeScale,
+          sizeScale = _ref$sizeScale === void 0 ? 0.5 : _ref$sizeScale,
+          _ref$mask = _ref.mask,
+          mask = _ref$mask === void 0 ? false : _ref$mask,
+          _ref$maskInside = _ref.maskInside,
+          maskInside = _ref$maskInside === void 0 ? true : _ref$maskInside;
+
       var createTexture2D = this.rendererService.createTexture2D;
       var source = this.layer.getSource();
       this.texture = createTexture2D({
@@ -88,28 +114,6 @@ var WindModel = function (_BaseModel) {
       var glContext = this.rendererService.getGLContext();
       this.imageCoords = source.data.dataArray[0].coordinates;
       source.data.images.then(function (imageData) {
-        var _ref = _this3.layer.getLayerConfig(),
-            _ref$uMin = _ref.uMin,
-            uMin = _ref$uMin === void 0 ? -21.32 : _ref$uMin,
-            _ref$uMax = _ref.uMax,
-            uMax = _ref$uMax === void 0 ? 26.8 : _ref$uMax,
-            _ref$vMin = _ref.vMin,
-            vMin = _ref$vMin === void 0 ? -21.57 : _ref$vMin,
-            _ref$vMax = _ref.vMax,
-            vMax = _ref$vMax === void 0 ? 21.42 : _ref$vMax,
-            _ref$fadeOpacity = _ref.fadeOpacity,
-            fadeOpacity = _ref$fadeOpacity === void 0 ? 0.996 : _ref$fadeOpacity,
-            _ref$speedFactor = _ref.speedFactor,
-            speedFactor = _ref$speedFactor === void 0 ? 0.25 : _ref$speedFactor,
-            _ref$dropRate = _ref.dropRate,
-            dropRate = _ref$dropRate === void 0 ? 0.003 : _ref$dropRate,
-            _ref$dropRateBump = _ref.dropRateBump,
-            dropRateBump = _ref$dropRateBump === void 0 ? 0.01 : _ref$dropRateBump,
-            _ref$rampColors = _ref.rampColors,
-            rampColors = _ref$rampColors === void 0 ? defaultRampColors : _ref$rampColors,
-            _ref$sizeScale = _ref.sizeScale,
-            sizeScale = _ref$sizeScale === void 0 ? 0.5 : _ref$sizeScale;
-
         _this3.sizeScale = sizeScale;
 
         var _this3$getWindSize = _this3.getWindSize(),
@@ -146,8 +150,8 @@ var WindModel = function (_BaseModel) {
 
         _this3.layerService.renderLayers();
       });
-      this.layer.buildLayerModel({
-        moduleName: 'wind',
+      this.colorModel = this.layer.buildLayerModel({
+        moduleName: 'WindLayer',
         vertexShader: WindVert,
         fragmentShader: WindFrag,
         triangulation: RasterImageTriangulation,
@@ -156,13 +160,8 @@ var WindModel = function (_BaseModel) {
           enable: false
         },
         blend: this.getBlend()
-      }).then(function (model) {
-        _this3.colorModel = model;
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
       });
+      return [this.colorModel];
     }
   }, {
     key: "getWindSize",
@@ -178,8 +177,8 @@ var WindModel = function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
+    value: function buildModels() {
+      return this.initModels();
     }
   }, {
     key: "clearModels",
@@ -284,12 +283,10 @@ var WindModel = function (_BaseModel) {
   }, {
     key: "drawColorMode",
     value: function drawColorMode() {
-      var _this$colorModel;
-
       var _ref3 = this.layer.getLayerConfig(),
           opacity = _ref3.opacity;
 
-      (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 ? void 0 : _this$colorModel.draw({
+      this.colorModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_texture: this.texture

package/es/wind/models/wind.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/wind/models/wind.ts"],"names":["AttributeType","gl","FrequencyController","BaseModel","RasterImageTriangulation","Wind","defaultRampColors","WindModel","frequency","run","drawWind","drawColorMode","Error","callbackModel","createTexture2D","rendererService","source","layer","getSource","texture","height","width","glContext","getGLContext","imageCoords","data","dataArray","coordinates","images","then","imageData","getLayerConfig","uMin","uMax","vMin","vMax","fadeOpacity","speedFactor","dropRate","dropRateBump","rampColors","sizeScale","getWindSize","imageWidth","imageHeight","options","wind","setWind","image","layerService","updateLayerRenderList","renderLayers","buildLayerModel","moduleName","vertexShader","WindVert","fragmentShader","WindFrag","triangulation","primitive","TRIANGLES","depth","enable","blend","getBlend","model","colorModel","catch","err","console","warn","p1","mapService","lngLatToPixel","p2","Math","floor","x","y","initModels","destroy","properties","opacity","type","minimum","maximum","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","vertex","attributeIdx","numParticles","reSize","updateWindDir","updateParticelNum","updateColorRampTexture","draw","d","w","h","setBaseState","uniforms","u_opacity","u_texture"],"mappings":";;;;;;;;;;;;AAAA,SACEA,aADF,EAEEC,EAFF,QAQO,eARP;AASA,SAASC,mBAAT,QAAoC,gBAApC;AACA,OAAOC,SAAP,MAAsB,sBAAtB;AAEA,SAASC,wBAAT,QAAyC,0BAAzC;;;AAGA,SAA4BC,IAA5B,QAAwC,cAAxC;AAEA,IAAMC,iBAAiB,GAAG;AACxB,OAAK,SADmB;AAExB,OAAK,SAFmB;AAGxB,OAAK,SAHmB;AAIxB,OAAK,SAJmB;AAKxB,OAAK,SALmB;AAMxB,OAAK,SANmB;AAOxB,OAAK,SAPmB;AAQxB,OAAK;AARmB,CAA1B;;IAWqBC,S;;;;;;;;;;;;;;;;;;;;;;;;gEAMS,G;;gEAIR,IAAIL,mBAAJ,CAAwB,GAAxB,C;;;;;;;WAEpB,kBAAgB;AAAA;;AAEd,WAAKM,SAAL,CAAeC,GAAf,CAAmB,YAAM;AACvB,QAAA,MAAI,CAACC,QAAL;AACD,OAFD;AAGA,WAAKC,aAAL;AACD;;;WAED,wBAAqC;AACnC,YAAM,IAAIC,KAAJ,CAAU,yBAAV,CAAN;AACD;;;WAED,oBAAkBC,aAAlB,EAA6D;AAAA;;AAC3D,UAAQC,eAAR,GAA4B,KAAKC,eAAjC,CAAQD,eAAR;AAEA,UAAME,MAAM,GAAG,KAAKC,KAAL,CAAWC,SAAX,EAAf;AACA,WAAKC,OAAL,GAAeL,eAAe,CAAC;AAC7BM,QAAAA,MAAM,EAAE,CADqB;AAE7BC,QAAAA,KAAK,EAAE;AAFsB,OAAD,CAA9B;AAKA,UAAMC,SAAS,GAAG,KAAKP,eAAL,CAAqBQ,YAArB,EAAlB;AACA,WAAKC,WAAL,GAAmBR,MAAM,CAACS,IAAP,CAAYC,SAAZ,CAAsB,CAAtB,EAAyBC,WAA5C;AAEAX,MAAAA,MAAM,CAACS,IAAP,CAAYG,MAAZ,CAAmBC,IAAnB,CAAwB,UAACC,SAAD,EAAmC;AACzD,mBAWI,MAAI,CAACb,KAAL,CAAWc,cAAX,EAXJ;AAAA,6BACEC,IADF;AAAA,YACEA,IADF,0BACS,CAAC,KADV;AAAA,6BAEEC,IAFF;AAAA,YAEEA,IAFF,0BAES,IAFT;AAAA,6BAGEC,IAHF;AAAA,YAGEA,IAHF,0BAGS,CAAC,KAHV;AAAA,6BAIEC,IAJF;AAAA,YAIEA,IAJF,0BAIS,KAJT;AAAA,oCAKEC,WALF;AAAA,YAKEA,WALF,iCAKgB,KALhB;AAAA,oCAMEC,WANF;AAAA,YAMEA,WANF,iCAMgB,IANhB;AAAA,iCAOEC,QAPF;AAAA,YAOEA,QAPF,8BAOa,KAPb;AAAA,qCAQEC,YARF;AAAA,YAQEA,YARF,kCAQiB,IARjB;AAAA,mCASEC,UATF;AAAA,YASEA,UATF,gCASelC,iBATf;AAAA,kCAUEmC,SAVF;AAAA,YAUEA,SAVF,+BAUc,GAVd;;AAYA,QAAA,MAAI,CAACA,SAAL,GAAiBA,SAAjB;;AAEA,iCAAoC,MAAI,CAACC,WAAL,EAApC;AAAA,YAAQC,UAAR,sBAAQA,UAAR;AAAA,YAAoBC,WAApB,sBAAoBA,WAApB;;AAEA,YAAMC,OAAmB,GAAG;AAC1BvB,UAAAA,SAAS,EAATA,SAD0B;AAE1BqB,UAAAA,UAAU,EAAVA,UAF0B;AAG1BC,UAAAA,WAAW,EAAXA,WAH0B;AAI1BR,UAAAA,WAAW,EAAXA,WAJ0B;AAK1BC,UAAAA,WAAW,EAAXA,WAL0B;AAM1BC,UAAAA,QAAQ,EAARA,QAN0B;AAO1BC,UAAAA,YAAY,EAAZA,YAP0B;AAQ1BC,UAAAA,UAAU,EAAVA;AAR0B,SAA5B;AAWA,QAAA,MAAI,CAACM,IAAL,GAAY,IAAIzC,IAAJ,CAASwC,OAAT,CAAZ;;AAGA,QAAA,MAAI,CAACC,IAAL,CAAUC,OAAV,CAAkB;AAChBf,UAAAA,IAAI,EAAJA,IADgB;AAEhBC,UAAAA,IAAI,EAAJA,IAFgB;AAGhBC,UAAAA,IAAI,EAAJA,IAHgB;AAIhBC,UAAAA,IAAI,EAAJA,IAJgB;AAKhBa,UAAAA,KAAK,EAAElB,SAAS,CAAC,CAAD;AALA,SAAlB;;AAQA,QAAA,MAAI,CAACX,OAAL,GAAeL,eAAe,CAAC;AAC7BW,UAAAA,IAAI,EAAEK,SAAS,CAAC,CAAD,CADc;AAE7BT,UAAAA,KAAK,EAAES,SAAS,CAAC,CAAD,CAAT,CAAaT,KAFS;AAG7BD,UAAAA,MAAM,EAAEU,SAAS,CAAC,CAAD,CAAT,CAAaV;AAHQ,SAAD,CAA9B;;AAMA,QAAA,MAAI,CAAC6B,YAAL,CAAkBC,qBAAlB;;AACA,QAAA,MAAI,CAACD,YAAL,CAAkBE,YAAlB;AACD,OA/CD;AAiDA,WAAKlC,KAAL,CACGmC,eADH,CACmB;AACfC,QAAAA,UAAU,EAAE,MADG;AAEfC,QAAAA,YAAY,EAAEC,QAFC;AAGfC,QAAAA,cAAc,EAAEC,QAHD;AAIfC,QAAAA,aAAa,EAAEtD,wBAJA;AAKfuD,QAAAA,SAAS,EAAE1D,EAAE,CAAC2D,SALC;AAMfC,QAAAA,KAAK,EAAE;AAAEC,UAAAA,MAAM,EAAE;AAAV,SANQ;AAOfC,QAAAA,KAAK,EAAE,KAAKC,QAAL;AAPQ,OADnB,EAUGnC,IAVH,CAUQ,UAACoC,KAAD,EAAW;AACf,QAAA,MAAI,CAACC,UAAL,GAAkBD,KAAlB;AACApD,QAAAA,aAAa,CAAC,CAACoD,KAAD,CAAD,CAAb;AACD,OAbH,EAcGE,KAdH,CAcS,UAACC,GAAD,EAAS;AACdC,QAAAA,OAAO,CAACC,IAAR,CAAaF,GAAb;AACAvD,QAAAA,aAAa,CAAC,EAAD,CAAb;AACD,OAjBH;AAkBD;;;WAED,uBAAqB;AACnB,UAAM0D,EAAE,GAAG,KAAKC,UAAL,CAAgBC,aAAhB,CAA8B,KAAKjD,WAAL,CAAiB,CAAjB,CAA9B,CAAX;AACA,UAAMkD,EAAE,GAAG,KAAKF,UAAL,CAAgBC,aAAhB,CAA8B,KAAKjD,WAAL,CAAiB,CAAjB,CAA9B,CAAX;AAEA,UAAMmB,UAAU,GAAGgC,IAAI,CAACC,KAAL,CAAW,CAACF,EAAE,CAACG,CAAH,GAAON,EAAE,CAACM,CAAX,IAAgB,KAAKpC,SAAhC,CAAnB;AACA,UAAMG,WAAW,GAAG+B,IAAI,CAACC,KAAL,CAAW,CAACL,EAAE,CAACO,CAAH,GAAOJ,EAAE,CAACI,CAAX,IAAgB,KAAKrC,SAAhC,CAApB;AACA,aAAO;AAAEE,QAAAA,UAAU,EAAVA,UAAF;AAAcC,QAAAA,WAAW,EAAXA;AAAd,OAAP;AACD;;;WAED,qBAAmB/B,aAAnB,EAA8D;AAC5D,WAAKkE,UAAL,CAAgBlE,aAAhB;AACD;;;WAED,uBAA2B;AAAA;;AACzB,4BAAKM,OAAL,gEAAc6D,OAAd;AACA,yBAAKlC,IAAL,0DAAWkC,OAAX;AACD;;;WAED,2BAA4B;AAC1B,aAAO;AACLC,QAAAA,UAAU,EAAE;AACVC,UAAAA,OAAO,EAAE;AACPC,YAAAA,IAAI,EAAE,QADC;AAEPC,YAAAA,OAAO,EAAE,CAFF;AAGPC,YAAAA,OAAO,EAAE;AAHF;AADC;AADP,OAAP;AASD;;;WAED,qCAAsC;AAEpC,WAAKC,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,IAD0C;AAEhDL,QAAAA,IAAI,EAAEnF,aAAa,CAACyF,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVF,UAAAA,IAAI,EAAE,MADI;AAEVG,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAE3F,EAAE,CAAC4F,YAFJ;AAGNpE,YAAAA,IAAI,EAAE,EAHA;AAIN0D,YAAAA,IAAI,EAAElF,EAAE,CAAC6F;AAJH,WAFE;AAQVC,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBACNC,OADM,EAENC,UAFM,EAGNC,MAHM,EAINC,YAJM,EAKH;AACH,mBAAO,CAACD,MAAM,CAAC,CAAD,CAAP,EAAYA,MAAM,CAAC,CAAD,CAAlB,CAAP;AACD;AAhBS;AAHoC,OAAlD;AAsBD;;;WAED,oBAAmB;AACjB,UAAI,KAAKrD,IAAT,EAAe;AACb,oBAYI,KAAK7B,KAAL,CAAWc,cAAX,EAZJ;AAAA,+BACEC,IADF;AAAA,YACEA,IADF,2BACS,CAAC,KADV;AAAA,+BAEEC,IAFF;AAAA,YAEEA,IAFF,2BAES,IAFT;AAAA,+BAGEC,IAHF;AAAA,YAGEA,IAHF,2BAGS,CAAC,KAHV;AAAA,+BAIEC,IAJF;AAAA,YAIEA,IAJF,2BAIS,KAJT;AAAA,uCAKEkE,YALF;AAAA,YAKEA,YALF,mCAKiB,KALjB;AAAA,sCAMEjE,WANF;AAAA,YAMEA,WANF,kCAMgB,KANhB;AAAA,sCAOEC,WAPF;AAAA,YAOEA,WAPF,kCAOgB,IAPhB;AAAA,mCAQEC,QARF;AAAA,YAQEA,QARF,+BAQa,KARb;AAAA,uCASEC,YATF;AAAA,YASEA,YATF,mCASiB,IATjB;AAAA,qCAUEC,UAVF;AAAA,YAUEA,UAVF,iCAUelC,iBAVf;AAAA,oCAWEmC,SAXF;AAAA,YAWEA,SAXF,gCAWc,GAXd;;AAaA,YAAI,OAAOA,SAAP,KAAqB,QAArB,IAAiCA,SAAS,KAAK,KAAKA,SAAxD,EAAmE;AACjE,eAAKA,SAAL,GAAiBA,SAAjB;;AACA,kCAAoC,KAAKC,WAAL,EAApC;AAAA,cAAQC,UAAR,qBAAQA,UAAR;AAAA,cAAoBC,WAApB,qBAAoBA,WAApB;;AACA,eAAKE,IAAL,CAAUwD,MAAV,CAAiB3D,UAAjB,EAA6BC,WAA7B;AACD;;AAED,aAAKE,IAAL,CAAUyD,aAAV,CAAwBvE,IAAxB,EAA8BC,IAA9B,EAAoCC,IAApC,EAA0CC,IAA1C;AAEA,aAAKW,IAAL,CAAU0D,iBAAV,CAA4BH,YAA5B;AAEA,aAAKvD,IAAL,CAAU2D,sBAAV,CAAiCjE,UAAjC;AAEA,aAAKM,IAAL,CAAUV,WAAV,GAAwBA,WAAxB;AACA,aAAKU,IAAL,CAAUT,WAAV,GAAwBA,WAAxB;AACA,aAAKS,IAAL,CAAUR,QAAV,GAAqBA,QAArB;AACA,aAAKQ,IAAL,CAAUP,YAAV,GAAyBA,YAAzB;;AAEA,8BAAoB,KAAKO,IAAL,CAAU4D,IAAV,EAApB;AAAA,YAAQC,CAAR,mBAAQA,CAAR;AAAA,YAAWC,CAAX,mBAAWA,CAAX;AAAA,YAAcC,CAAd,mBAAcA,CAAd;;AAEA,aAAK9F,eAAL,CAAqB+F,YAArB;AACA,aAAK3F,OAAL,CAAa6E,MAAb,CAAoB;AAClBvE,UAAAA,IAAI,EAAEkF,CADY;AAElBtF,UAAAA,KAAK,EAAEuF,CAFW;AAGlBxF,UAAAA,MAAM,EAAEyF;AAHU,SAApB;AAKD;AACF;;;WAED,yBAAwB;AAAA;;AACtB,kBAAoB,KAAK5F,KAAL,CAAWc,cAAX,EAApB;AAAA,UAAQmD,OAAR,SAAQA,OAAR;;AACA,+BAAKhB,UAAL,sEAAiBwC,IAAjB,CAAsB;AACpBK,QAAAA,QAAQ,EAAE;AACRC,UAAAA,SAAS,EAAE9B,OAAO,IAAI,GADd;AAER+B,UAAAA,SAAS,EAAE,KAAK9F;AAFR;AADU,OAAtB;AAMD;;;;EApNoChB,S;;SAAlBI,S","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n  ITexture2D,\n  Point,\n} from '@antv/l7-core';\nimport { FrequencyController } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IWindLayerStyleOptions } from '../../core/interface';\nimport { RasterImageTriangulation } from '../../core/triangulation';\nimport WindFrag from '../shaders/wind_frag.glsl';\nimport WindVert from '../shaders/wind_vert.glsl';\nimport { IWind, IWindProps, Wind } from './windRender';\n\nconst defaultRampColors = {\n  0.0: '#3288bd',\n  0.1: '#66c2a5',\n  0.2: '#abdda4',\n  0.3: '#e6f598',\n  0.4: '#fee08b',\n  0.5: '#fdae61',\n  0.6: '#f46d43',\n  1.0: '#d53e4f',\n};\n\nexport default class WindModel extends BaseModel {\n  protected texture: ITexture2D;\n\n  private colorModel: IModel;\n  private wind: IWind;\n  private imageCoords: [Point, Point];\n  private sizeScale: number = 0.5;\n  // https://mapbox.github.io/webgl-wind/demo/\n  // source: 'http://nomads.ncep.noaa.gov',\n\n  private frequency = new FrequencyController(7.2);\n\n  public render() {\n    // TODO: 控制风场的平均更新频率\n    this.frequency.run(() => {\n      this.drawWind();\n    });\n    this.drawColorMode();\n  }\n\n  public getUninforms(): IModelUniform {\n    throw new Error('Method not implemented.');\n  }\n\n  public initModels(callbackModel: (models: IModel[]) => void) {\n    const { createTexture2D } = this.rendererService;\n\n    const source = this.layer.getSource();\n    this.texture = createTexture2D({\n      height: 0,\n      width: 0,\n    });\n\n    const glContext = this.rendererService.getGLContext();\n    this.imageCoords = source.data.dataArray[0].coordinates as [Point, Point];\n\n    source.data.images.then((imageData: HTMLImageElement[]) => {\n      const {\n        uMin = -21.32,\n        uMax = 26.8,\n        vMin = -21.57,\n        vMax = 21.42,\n        fadeOpacity = 0.996,\n        speedFactor = 0.25,\n        dropRate = 0.003,\n        dropRateBump = 0.01,\n        rampColors = defaultRampColors,\n        sizeScale = 0.5,\n      } = this.layer.getLayerConfig() as IWindLayerStyleOptions;\n      this.sizeScale = sizeScale;\n\n      const { imageWidth, imageHeight } = this.getWindSize();\n\n      const options: IWindProps = {\n        glContext,\n        imageWidth,\n        imageHeight,\n        fadeOpacity,\n        speedFactor,\n        dropRate,\n        dropRateBump,\n        rampColors,\n      };\n\n      this.wind = new Wind(options);\n\n      // imageData[0] 风场图\n      this.wind.setWind({\n        uMin,\n        uMax,\n        vMin,\n        vMax,\n        image: imageData[0],\n      });\n\n      this.texture = createTexture2D({\n        data: imageData[0],\n        width: imageData[0].width,\n        height: imageData[0].height,\n      });\n\n      this.layerService.updateLayerRenderList();\n      this.layerService.renderLayers();\n    });\n\n    this.layer\n      .buildLayerModel({\n        moduleName: 'wind',\n        vertexShader: WindVert,\n        fragmentShader: WindFrag,\n        triangulation: RasterImageTriangulation,\n        primitive: gl.TRIANGLES,\n        depth: { enable: false },\n        blend: this.getBlend(),\n      })\n      .then((model) => {\n        this.colorModel = model;\n        callbackModel([model]);\n      })\n      .catch((err) => {\n        console.warn(err);\n        callbackModel([]);\n      });\n  }\n\n  public getWindSize() {\n    const p1 = this.mapService.lngLatToPixel(this.imageCoords[0]);\n    const p2 = this.mapService.lngLatToPixel(this.imageCoords[1]);\n\n    const imageWidth = Math.floor((p2.x - p1.x) * this.sizeScale);\n    const imageHeight = Math.floor((p1.y - p2.y) * this.sizeScale);\n    return { imageWidth, imageHeight };\n  }\n\n  public buildModels(callbackModel: (models: IModel[]) => void) {\n    this.initModels(callbackModel);\n  }\n\n  public clearModels(): void {\n    this.texture?.destroy();\n    this.wind?.destroy();\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n\n  protected registerBuiltinAttributes() {\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'uv',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Uv',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 2,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          return [vertex[3], vertex[4]];\n        },\n      },\n    });\n  }\n\n  private drawWind() {\n    if (this.wind) {\n      const {\n        uMin = -21.32,\n        uMax = 26.8,\n        vMin = -21.57,\n        vMax = 21.42,\n        numParticles = 65535,\n        fadeOpacity = 0.996,\n        speedFactor = 0.25,\n        dropRate = 0.003,\n        dropRateBump = 0.01,\n        rampColors = defaultRampColors,\n        sizeScale = 0.5,\n      } = this.layer.getLayerConfig() as IWindLayerStyleOptions;\n      if (typeof sizeScale === 'number' && sizeScale !== this.sizeScale) {\n        this.sizeScale = sizeScale;\n        const { imageWidth, imageHeight } = this.getWindSize();\n        this.wind.reSize(imageWidth, imageHeight);\n      }\n\n      this.wind.updateWindDir(uMin, uMax, vMin, vMax);\n\n      this.wind.updateParticelNum(numParticles);\n\n      this.wind.updateColorRampTexture(rampColors);\n\n      this.wind.fadeOpacity = fadeOpacity;\n      this.wind.speedFactor = speedFactor;\n      this.wind.dropRate = dropRate;\n      this.wind.dropRateBump = dropRateBump;\n\n      const { d, w, h } = this.wind.draw();\n      // TODO: 恢复 L7 渲染流程中 gl 状态\n      this.rendererService.setBaseState();\n      this.texture.update({\n        data: d,\n        width: w,\n        height: h,\n      });\n    }\n  }\n\n  private drawColorMode() {\n    const { opacity } = this.layer.getLayerConfig() as IWindLayerStyleOptions;\n    this.colorModel?.draw({\n      uniforms: {\n        u_opacity: opacity || 1.0,\n        u_texture: this.texture,\n      },\n    });\n  }\n}\n"],"file":"wind.js"}
+{"version":3,"sources":["../../../src/wind/models/wind.ts"],"names":["AttributeType","gl","FrequencyController","BaseModel","RasterImageTriangulation","Wind","defaultRampColors","WindModel","frequency","run","drawWind","drawColorMode","Error","layer","getLayerConfig","uMin","uMax","vMin","vMax","fadeOpacity","speedFactor","dropRate","dropRateBump","rampColors","sizeScale","mask","maskInside","createTexture2D","rendererService","source","getSource","texture","height","width","glContext","getGLContext","imageCoords","data","dataArray","coordinates","images","then","imageData","getWindSize","imageWidth","imageHeight","options","wind","setWind","image","layerService","updateLayerRenderList","renderLayers","colorModel","buildLayerModel","moduleName","vertexShader","WindVert","fragmentShader","WindFrag","triangulation","primitive","TRIANGLES","depth","enable","blend","getBlend","p1","mapService","lngLatToPixel","p2","Math","floor","x","y","initModels","destroy","properties","opacity","type","minimum","maximum","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","vertex","attributeIdx","numParticles","reSize","updateWindDir","updateParticelNum","updateColorRampTexture","draw","d","w","h","setBaseState","uniforms","u_opacity","u_texture"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n  ITexture2D,\n  Point,\n} from '@antv/l7-core';\nimport { FrequencyController, getMask } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IWindLayerStyleOptions } from '../../core/interface';\nimport { RasterImageTriangulation } from '../../core/triangulation';\nimport WindFrag from '../shaders/wind_frag.glsl';\nimport WindVert from '../shaders/wind_vert.glsl';\nimport { IWind, IWindProps, Wind } from './windRender';\n\nconst defaultRampColors = {\n  0.0: '#3288bd',\n  0.1: '#66c2a5',\n  0.2: '#abdda4',\n  0.3: '#e6f598',\n  0.4: '#fee08b',\n  0.5: '#fdae61',\n  0.6: '#f46d43',\n  1.0: '#d53e4f',\n};\n\nexport default class WindModel extends BaseModel {\n  protected texture: ITexture2D;\n  private colorModel: IModel;\n  private wind: IWind;\n  private imageCoords: [Point, Point];\n  private sizeScale: number = 0.5;\n  // https://mapbox.github.io/webgl-wind/demo/\n  // source: 'http://nomads.ncep.noaa.gov',\n\n  private frequency = new FrequencyController(7.2);\n\n  public render() {\n    // TODO: 控制风场的平均更新频率\n    this.frequency.run(() => {\n      this.drawWind();\n    });\n    this.drawColorMode();\n  }\n\n  public getUninforms(): IModelUniform {\n    throw new Error('Method not implemented.');\n  }\n\n  public initModels() {\n    const {\n      uMin = -21.32,\n      uMax = 26.8,\n      vMin = -21.57,\n      vMax = 21.42,\n      fadeOpacity = 0.996,\n      speedFactor = 0.25,\n      dropRate = 0.003,\n      dropRateBump = 0.01,\n      rampColors = defaultRampColors,\n      sizeScale = 0.5,\n      // mask\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IWindLayerStyleOptions;\n    const { createTexture2D } = this.rendererService;\n    const source = this.layer.getSource();\n    this.texture = createTexture2D({\n      height: 0,\n      width: 0,\n    });\n\n    const glContext = this.rendererService.getGLContext();\n    this.imageCoords = source.data.dataArray[0].coordinates as [Point, Point];\n\n    source.data.images.then((imageData: HTMLImageElement[]) => {\n      this.sizeScale = sizeScale;\n\n      const { imageWidth, imageHeight } = this.getWindSize();\n\n      const options: IWindProps = {\n        glContext,\n        imageWidth,\n        imageHeight,\n        fadeOpacity,\n        speedFactor,\n        dropRate,\n        dropRateBump,\n        rampColors,\n      };\n\n      this.wind = new Wind(options);\n\n      // imageData[0] 风场图\n      this.wind.setWind({\n        uMin,\n        uMax,\n        vMin,\n        vMax,\n        image: imageData[0],\n      });\n\n      this.texture = createTexture2D({\n        data: imageData[0],\n        width: imageData[0].width,\n        height: imageData[0].height,\n      });\n\n      this.layerService.updateLayerRenderList();\n      this.layerService.renderLayers();\n    });\n\n    this.colorModel = this.layer.buildLayerModel({\n      moduleName: 'WindLayer',\n      vertexShader: WindVert,\n      fragmentShader: WindFrag,\n      triangulation: RasterImageTriangulation,\n      primitive: gl.TRIANGLES,\n      depth: { enable: false },\n      blend: this.getBlend(),\n      // stencil: getMask(mask, maskInside),\n    });\n\n    return [this.colorModel];\n  }\n\n  public getWindSize() {\n    const p1 = this.mapService.lngLatToPixel(this.imageCoords[0]);\n    const p2 = this.mapService.lngLatToPixel(this.imageCoords[1]);\n\n    const imageWidth = Math.floor((p2.x - p1.x) * this.sizeScale);\n    const imageHeight = Math.floor((p1.y - p2.y) * this.sizeScale);\n    return { imageWidth, imageHeight };\n  }\n\n  public buildModels() {\n    return this.initModels();\n  }\n\n  public clearModels(): void {\n    this.texture?.destroy();\n    this.wind?.destroy();\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n\n  protected registerBuiltinAttributes() {\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'uv',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Uv',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 2,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          return [vertex[3], vertex[4]];\n        },\n      },\n    });\n  }\n\n  private drawWind() {\n    if (this.wind) {\n      const {\n        uMin = -21.32,\n        uMax = 26.8,\n        vMin = -21.57,\n        vMax = 21.42,\n        numParticles = 65535,\n        fadeOpacity = 0.996,\n        speedFactor = 0.25,\n        dropRate = 0.003,\n        dropRateBump = 0.01,\n        rampColors = defaultRampColors,\n        sizeScale = 0.5,\n      } = this.layer.getLayerConfig() as IWindLayerStyleOptions;\n      if (typeof sizeScale === 'number' && sizeScale !== this.sizeScale) {\n        this.sizeScale = sizeScale;\n        const { imageWidth, imageHeight } = this.getWindSize();\n        this.wind.reSize(imageWidth, imageHeight);\n      }\n\n      this.wind.updateWindDir(uMin, uMax, vMin, vMax);\n\n      this.wind.updateParticelNum(numParticles);\n\n      this.wind.updateColorRampTexture(rampColors);\n\n      this.wind.fadeOpacity = fadeOpacity;\n      this.wind.speedFactor = speedFactor;\n      this.wind.dropRate = dropRate;\n      this.wind.dropRateBump = dropRateBump;\n\n      const { d, w, h } = this.wind.draw();\n      // TODO: 恢复 L7 渲染流程中 gl 状态\n      this.rendererService.setBaseState();\n      this.texture.update({\n        data: d,\n        width: w,\n        height: h,\n      });\n    }\n  }\n\n  private drawColorMode() {\n    const { opacity } = this.layer.getLayerConfig() as IWindLayerStyleOptions;\n    this.colorModel.draw({\n      uniforms: {\n        u_opacity: opacity || 1.0,\n        u_texture: this.texture,\n      },\n    });\n  }\n}\n"],"file":"wind.js"}

package/lib/Geometry/index.js

@@ -51,24 +51,14 @@ var GeometryLayer = function (_BaseLayer) {
   (0, _createClass2.default)(GeometryLayer, [{
     key: "buildModels",
     value: function buildModels() {
-      var _this2 = this;
-
       var modelType = this.getModelType();
       this.layerModel = new _models.default[modelType](this);
-      this.layerModel.initModels(function (models) {
-        _this2.models = models;
-
-        _this2.renderLayers();
-      });
+      this.models = this.layerModel.initModels();
     }
   }, {
     key: "rebuildModels",
     value: function rebuildModels() {
-      var _this3 = this;
-
-      this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
-      });
+      this.models = this.layerModel.buildModels();
     }
   }, {
     key: "getConfigSchema",

package/lib/Geometry/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Geometry/index.ts"],"names":["GeometryLayer","modelType","getModelType","layerModel","GeometryModels","initModels","models","renderLayers","buildModels","properties","opacity","type","minimum","maximum","defaultConfig","plane","sprite","billboard","shapeAttribute","styleAttributeService","getLayerStyleAttribute","shape","scale","field","BaseLayer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAEA;;;;;;IAEqBA,a;;;;;;;;;;;;;;;uFAGG,e;;;;;;WACtB,uBAAqB;AAAA;;AACnB,UAAMC,SAAS,GAAG,KAAKC,YAAL,EAAlB;AACA,WAAKC,UAAL,GAAkB,IAAIC,gBAAeH,SAAf,CAAJ,CAA8B,IAA9B,CAAlB;AACA,WAAKE,UAAL,CAAgBE,UAAhB,CAA2B,UAACC,MAAD,EAAY;AACrC,QAAA,MAAI,CAACA,MAAL,GAAcA,MAAd;;AACA,QAAA,MAAI,CAACC,YAAL;AACD,OAHD;AAID;;;WACD,yBAAuB;AAAA;;AACrB,WAAKJ,UAAL,CAAgBK,WAAhB,CAA4B,UAACF,MAAD;AAAA,eAAa,MAAI,CAACA,MAAL,GAAcA,MAA3B;AAAA,OAA5B;AACD;;;WAED,2BAA4B;AAC1B,aAAO;AACLG,QAAAA,UAAU,EAAE;AACVC,UAAAA,OAAO,EAAE;AACPC,YAAAA,IAAI,EAAE,QADC;AAEPC,YAAAA,OAAO,EAAE,CAFF;AAGPC,YAAAA,OAAO,EAAE;AAHF;AADC;AADP,OAAP;AASD;;;WACD,4BAA6B;AAC3B,UAAMF,IAAI,GAAG,KAAKT,YAAL,EAAb;AACA,UAAMY,aAAa,GAAG;AACpBC,QAAAA,KAAK,EAAE,EADa;AAEpBC,QAAAA,MAAM,EAAE,EAFY;AAGpBC,QAAAA,SAAS,EAAE;AAHS,OAAtB;AAKA,aAAOH,aAAa,CAACH,IAAD,CAApB;AACD;;;WAED,wBAA4C;AAAA;;AAC1C,UAAMO,cAAc,GAAG,KAAKC,qBAAL,CAA2BC,sBAA3B,CACrB,OADqB,CAAvB;AAGA,UAAMC,KAAK,GAAGH,cAAH,aAAGA,cAAH,gDAAGA,cAAc,CAAEI,KAAnB,0DAAG,sBAAuBC,KAArC;;AACA,UAAIF,KAAK,KAAK,OAAd,EAAuB;AACrB,eAAO,OAAP;AACD,OAFD,MAEO,IAAIA,KAAK,KAAK,QAAd,EAAwB;AAC7B,eAAO,QAAP;AACD,OAFM,MAEA,IAAIA,KAAK,KAAK,WAAd,EAA2B;AAChC,eAAO,WAAP;AACD,OAFM,MAEA;AACL,eAAO,OAAP;AACD;AACF;;;EAnDwCG,mB","sourcesContent":["import BaseLayer from '../core/BaseLayer';\nimport { IGeometryLayerStyleOptions } from '../core/interface';\nimport GeometryModels, { GeometryModelType } from './models';\n\nexport default class GeometryLayer extends BaseLayer<\n  IGeometryLayerStyleOptions\n> {\n  public type: string = 'GeometryLayer';\n  public buildModels() {\n    const modelType = this.getModelType();\n    this.layerModel = new GeometryModels[modelType](this);\n    this.layerModel.initModels((models) => {\n      this.models = models;\n      this.renderLayers();\n    });\n  }\n  public rebuildModels() {\n    this.layerModel.buildModels((models) => (this.models = models));\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n  protected getDefaultConfig() {\n    const type = this.getModelType();\n    const defaultConfig = {\n      plane: {},\n      sprite: {},\n      billboard: {},\n    };\n    return defaultConfig[type];\n  }\n\n  protected getModelType(): GeometryModelType {\n    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute(\n      'shape',\n    );\n    const shape = shapeAttribute?.scale?.field as GeometryModelType;\n    if (shape === 'plane') {\n      return 'plane';\n    } else if (shape === 'sprite') {\n      return 'sprite';\n    } else if (shape === 'billboard') {\n      return 'billboard';\n    } else {\n      return 'plane';\n    }\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/Geometry/index.ts"],"names":["GeometryLayer","modelType","getModelType","layerModel","GeometryModels","models","initModels","buildModels","properties","opacity","type","minimum","maximum","defaultConfig","plane","sprite","billboard","shapeAttribute","styleAttributeService","getLayerStyleAttribute","shape","scale","field","BaseLayer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAEA;;;;;;IAEqBA,a;;;;;;;;;;;;;;;uFAGG,e;;;;;;WACtB,uBAAqB;AACnB,UAAMC,SAAS,GAAG,KAAKC,YAAL,EAAlB;AACA,WAAKC,UAAL,GAAkB,IAAIC,gBAAeH,SAAf,CAAJ,CAA8B,IAA9B,CAAlB;AACA,WAAKI,MAAL,GAAc,KAAKF,UAAL,CAAgBG,UAAhB,EAAd;AACD;;;WACD,yBAAuB;AACrB,WAAKD,MAAL,GAAc,KAAKF,UAAL,CAAgBI,WAAhB,EAAd;AACD;;;WAED,2BAA4B;AAC1B,aAAO;AACLC,QAAAA,UAAU,EAAE;AACVC,UAAAA,OAAO,EAAE;AACPC,YAAAA,IAAI,EAAE,QADC;AAEPC,YAAAA,OAAO,EAAE,CAFF;AAGPC,YAAAA,OAAO,EAAE;AAHF;AADC;AADP,OAAP;AASD;;;WACD,4BAA6B;AAC3B,UAAMF,IAAI,GAAG,KAAKR,YAAL,EAAb;AACA,UAAMW,aAAa,GAAG;AACpBC,QAAAA,KAAK,EAAE,EADa;AAEpBC,QAAAA,MAAM,EAAE,EAFY;AAGpBC,QAAAA,SAAS,EAAE;AAHS,OAAtB;AAKA,aAAOH,aAAa,CAACH,IAAD,CAApB;AACD;;;WAED,wBAA4C;AAAA;;AAC1C,UAAMO,cAAc,GAAG,KAAKC,qBAAL,CAA2BC,sBAA3B,CACrB,OADqB,CAAvB;AAGA,UAAMC,KAAK,GAAGH,cAAH,aAAGA,cAAH,gDAAGA,cAAc,CAAEI,KAAnB,0DAAG,sBAAuBC,KAArC;;AACA,UAAIF,KAAK,KAAK,OAAd,EAAuB;AACrB,eAAO,OAAP;AACD,OAFD,MAEO,IAAIA,KAAK,KAAK,QAAd,EAAwB;AAC7B,eAAO,QAAP;AACD,OAFM,MAEA,IAAIA,KAAK,KAAK,WAAd,EAA2B;AAChC,eAAO,WAAP;AACD,OAFM,MAEA;AACL,eAAO,OAAP;AACD;AACF;;;EAhDwCG,mB","sourcesContent":["import BaseLayer from '../core/BaseLayer';\nimport { IGeometryLayerStyleOptions } from '../core/interface';\nimport GeometryModels, { GeometryModelType } from './models';\n\nexport default class GeometryLayer extends BaseLayer<\n  IGeometryLayerStyleOptions\n> {\n  public type: string = 'GeometryLayer';\n  public buildModels() {\n    const modelType = this.getModelType();\n    this.layerModel = new GeometryModels[modelType](this);\n    this.models = this.layerModel.initModels();\n  }\n  public rebuildModels() {\n    this.models = this.layerModel.buildModels();\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n  protected getDefaultConfig() {\n    const type = this.getModelType();\n    const defaultConfig = {\n      plane: {},\n      sprite: {},\n      billboard: {},\n    };\n    return defaultConfig[type];\n  }\n\n  protected getModelType(): GeometryModelType {\n    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute(\n      'shape',\n    );\n    const shape = shapeAttribute?.scale?.field as GeometryModelType;\n    if (shape === 'plane') {\n      return 'plane';\n    } else if (shape === 'sprite') {\n      return 'sprite';\n    } else if (shape === 'billboard') {\n      return 'billboard';\n    } else {\n      return 'plane';\n    }\n  }\n}\n"],"file":"index.js"}

package/lib/Geometry/models/billboard.js

@@ -103,7 +103,7 @@ var BillBoardModel = function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
+    value: function initModels() {
       var _ref3 = this.layer.getLayerConfig(),
           _ref3$mask = _ref3.mask,
           mask = _ref3$mask === void 0 ? false : _ref3$mask,
@@ -121,8 +121,8 @@ var BillBoardModel = function (_BaseModel) {
         this.updateTexture(drawCanvas);
       }
 
-      this.layer.buildLayerModel({
-        moduleName: 'geometryBillboard',
+      return [this.layer.buildLayerModel({
+        moduleName: 'geometry_billboard',
         vertexShader: planeVert,
         fragmentShader: planeFrag,
         triangulation: this.planeGeometryTriangulation,
@@ -132,17 +132,12 @@ var BillBoardModel = function (_BaseModel) {
         },
         blend: this.getBlend(),
         stencil: (0, _l7Utils.getMask)(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
+      })];
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
+    value: function buildModels() {
+      return this.initModels();
     }
   }, {
     key: "updateTexture",

package/lib/Geometry/models/billboard.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/Geometry/models/billboard.ts"],"names":["BillBoardModel","layer","getLayerConfig","center","size","indices","vertices","opacity","width","height","raisingHeight","rotateFlag","mapService","version","radian","Math","PI","getRotation","u_raisingHeight","Number","u_RotateMatrix","Float32Array","cos","sin","u_opacity","u_texture","texture","u_size","destroy","callbackModel","mask","maskInside","drawCanvas","createTexture2D","rendererService","updateTexture","buildLayerModel","moduleName","vertexShader","planeVert","fragmentShader","planeFrag","triangulation","planeGeometryTriangulation","primitive","gl","TRIANGLES","depth","enable","blend","getBlend","stencil","then","model","catch","err","console","warn","initModels","canvasWidth","canvasHeight","canvas","document","createElement","ctx","getContext","data","wrapS","CLAMP_TO_EDGE","wrapT","layerService","updateLayerRenderList","renderLayers","properties","type","minimum","maximum","styleAttributeService","registerStyleAttribute","name","AttributeType","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","update","feature","featureIdx","vertex","attributeIdx","extrude","extrudeIndex","BaseModel"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IAttrubuteAndElements,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n  ITexture2D,\n} from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IGeometryLayerStyleOptions } from '../../core/interface';\nimport planeFrag from '../shaders/billboard_frag.glsl';\nimport planeVert from '../shaders/billboard_vert.glsl';\n\nexport default class BillBoardModel extends BaseModel {\n  protected texture: ITexture2D;\n  private radian: number = 0; // 旋转的弧度\n\n  public planeGeometryTriangulation = () => {\n    const {\n      center = [120, 30],\n    } = this.layer.getLayerConfig() as IGeometryLayerStyleOptions;\n    return {\n      size: 4,\n      indices: [0, 1, 2, 2, 3, 0],\n      vertices: [\n        ...center,\n        ...[1, 1],\n        ...center,\n        ...[0, 1],\n        ...center,\n        ...[0, 0],\n        ...center,\n        ...[1, 0],\n      ],\n    };\n  };\n\n  public getUninforms(): IModelUniform {\n    const {\n      opacity,\n      width = 1,\n      height = 1,\n      raisingHeight = 0,\n    } = this.layer.getLayerConfig() as IGeometryLayerStyleOptions;\n\n    /**\n     *               rotateFlag\n     * L7MAP            1\n     * MAPBOX           1\n     * GAODE2.x         -1\n     * GAODE1.x         -1\n     */\n    let rotateFlag = 1;\n    if (\n      this.mapService.version === 'GAODE2.x' ||\n      this.mapService.version === 'GAODE1.x'\n    ) {\n      rotateFlag = -1;\n    }\n    // 控制图标的旋转角度（绕 Z 轴旋转）\n    this.radian =\n      (rotateFlag * Math.PI * (this.mapService.getRotation() % 360)) / 180;\n\n    return {\n      u_raisingHeight: Number(raisingHeight),\n      u_RotateMatrix: new Float32Array([\n        // z\n        Math.cos(this.radian),\n        Math.sin(this.radian),\n        -Math.sin(this.radian),\n        Math.cos(this.radian),\n      ]),\n      u_opacity: opacity || 1,\n      u_texture: this.texture,\n      u_size: [width, height],\n    };\n  }\n\n  public clearModels(): void {\n    this.texture?.destroy();\n  }\n\n  public initModels(callbackModel: (models: IModel[]) => void) {\n    const {\n      mask = false,\n      maskInside = true,\n      drawCanvas,\n    } = this.layer.getLayerConfig() as IGeometryLayerStyleOptions;\n\n    const { createTexture2D } = this.rendererService;\n    this.texture = createTexture2D({\n      height: 0,\n      width: 0,\n    });\n\n    if (drawCanvas) {\n      this.updateTexture(drawCanvas);\n    }\n\n    this.layer\n      .buildLayerModel({\n        moduleName: 'geometryBillboard',\n        vertexShader: planeVert,\n        fragmentShader: planeFrag,\n        triangulation: this.planeGeometryTriangulation,\n        primitive: gl.TRIANGLES,\n        depth: { enable: true },\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      })\n      .then((model) => {\n        callbackModel([model]);\n      })\n      .catch((err) => {\n        console.warn(err);\n        callbackModel([]);\n      });\n  }\n\n  public buildModels(callbackModel: (models: IModel[]) => void) {\n    this.initModels(callbackModel);\n  }\n\n  public updateTexture(drawCanvas: (canvas: HTMLCanvasElement) => void): void {\n    const { createTexture2D } = this.rendererService;\n\n    const {\n      canvasWidth = 1,\n      canvasHeight = 1,\n    } = this.layer.getLayerConfig() as IGeometryLayerStyleOptions;\n    const canvas = document.createElement('canvas');\n    canvas.width = canvasWidth;\n    canvas.height = canvasHeight;\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      drawCanvas(canvas);\n      this.texture = createTexture2D({\n        data: canvas,\n        width: canvas.width,\n        height: canvas.height,\n        wrapS: gl.CLAMP_TO_EDGE,\n        wrapT: gl.CLAMP_TO_EDGE,\n      });\n      this.layerService.updateLayerRenderList();\n      this.layerService.renderLayers();\n    }\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n\n  protected registerBuiltinAttributes() {\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'extrude',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Extrude',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 3,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];\n          const extrudeIndex = (attributeIdx % 4) * 3;\n          return [\n            extrude[extrudeIndex],\n            extrude[extrudeIndex + 1],\n            extrude[extrudeIndex + 2],\n          ];\n        },\n      },\n    });\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'uv',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Uv',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 2,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          return [vertex[2], vertex[3]];\n        },\n      },\n    });\n  }\n}\n"],"file":"billboard.js"}
+{"version":3,"sources":["../../../src/Geometry/models/billboard.ts"],"names":["BillBoardModel","layer","getLayerConfig","center","size","indices","vertices","opacity","width","height","raisingHeight","rotateFlag","mapService","version","radian","Math","PI","getRotation","u_raisingHeight","Number","u_RotateMatrix","Float32Array","cos","sin","u_opacity","u_texture","texture","u_size","destroy","mask","maskInside","drawCanvas","createTexture2D","rendererService","updateTexture","buildLayerModel","moduleName","vertexShader","planeVert","fragmentShader","planeFrag","triangulation","planeGeometryTriangulation","primitive","gl","TRIANGLES","depth","enable","blend","getBlend","stencil","initModels","canvasWidth","canvasHeight","canvas","document","createElement","ctx","getContext","data","wrapS","CLAMP_TO_EDGE","wrapT","layerService","updateLayerRenderList","renderLayers","properties","type","minimum","maximum","styleAttributeService","registerStyleAttribute","name","AttributeType","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","update","feature","featureIdx","vertex","attributeIdx","extrude","extrudeIndex","BaseModel"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IAttrubuteAndElements,\n  IEncodeFeature,\n  IModelUniform,\n  ITexture2D,\n} from '@antv/l7-core';\nimport { getMask, isMini } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IGeometryLayerStyleOptions } from '../../core/interface';\nimport planeFrag from '../shaders/billboard_frag.glsl';\nimport planeVert from '../shaders/billboard_vert.glsl';\n\nexport default class BillBoardModel extends BaseModel {\n  protected texture: ITexture2D;\n  private radian: number = 0; // 旋转的弧度\n\n  public planeGeometryTriangulation = () => {\n    const {\n      center = [120, 30],\n    } = this.layer.getLayerConfig() as IGeometryLayerStyleOptions;\n    return {\n      size: 4,\n      indices: [0, 1, 2, 2, 3, 0],\n      vertices: [\n        ...center,\n        ...[1, 1],\n        ...center,\n        ...[0, 1],\n        ...center,\n        ...[0, 0],\n        ...center,\n        ...[1, 0],\n      ],\n    };\n  };\n\n  public getUninforms(): IModelUniform {\n    const {\n      opacity,\n      width = 1,\n      height = 1,\n      raisingHeight = 0,\n    } = this.layer.getLayerConfig() as IGeometryLayerStyleOptions;\n\n    /**\n     *               rotateFlag\n     * L7MAP            1\n     * MAPBOX           1\n     * GAODE2.x         -1\n     * GAODE1.x         -1\n     */\n    let rotateFlag = 1;\n    if (\n      this.mapService.version === 'GAODE2.x' ||\n      this.mapService.version === 'GAODE1.x'\n    ) {\n      rotateFlag = -1;\n    }\n    // 控制图标的旋转角度（绕 Z 轴旋转）\n    this.radian =\n      (rotateFlag * Math.PI * (this.mapService.getRotation() % 360)) / 180;\n\n    return {\n      u_raisingHeight: Number(raisingHeight),\n      u_RotateMatrix: new Float32Array([\n        // z\n        Math.cos(this.radian),\n        Math.sin(this.radian),\n        -Math.sin(this.radian),\n        Math.cos(this.radian),\n      ]),\n      u_opacity: opacity || 1,\n      u_texture: this.texture,\n      u_size: [width, height],\n    };\n  }\n\n  public clearModels(): void {\n    this.texture?.destroy();\n  }\n\n  public initModels() {\n    const {\n      mask = false,\n      maskInside = true,\n      drawCanvas,\n    } = this.layer.getLayerConfig() as IGeometryLayerStyleOptions;\n\n    const { createTexture2D } = this.rendererService;\n    this.texture = createTexture2D({\n      height: 0,\n      width: 0,\n    });\n\n    if (drawCanvas) {\n      this.updateTexture(drawCanvas);\n    }\n\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'geometry_billboard',\n        vertexShader: planeVert,\n        fragmentShader: planeFrag,\n        triangulation: this.planeGeometryTriangulation,\n        primitive: gl.TRIANGLES,\n        depth: { enable: true },\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n\n  public buildModels() {\n    return this.initModels();\n  }\n\n  public updateTexture(drawCanvas: (canvas: HTMLCanvasElement) => void): void {\n    const { createTexture2D } = this.rendererService;\n\n    const {\n      canvasWidth = 1,\n      canvasHeight = 1,\n    } = this.layer.getLayerConfig() as IGeometryLayerStyleOptions;\n    const canvas = document.createElement('canvas');\n    canvas.width = canvasWidth;\n    canvas.height = canvasHeight;\n    const ctx = canvas.getContext('2d');\n    if (ctx) {\n      drawCanvas(canvas);\n      this.texture = createTexture2D({\n        data: canvas,\n        width: canvas.width,\n        height: canvas.height,\n        wrapS: gl.CLAMP_TO_EDGE,\n        wrapT: gl.CLAMP_TO_EDGE,\n      });\n      this.layerService.updateLayerRenderList();\n      this.layerService.renderLayers();\n    }\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n\n  protected registerBuiltinAttributes() {\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'extrude',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Extrude',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 3,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];\n          const extrudeIndex = (attributeIdx % 4) * 3;\n          return [\n            extrude[extrudeIndex],\n            extrude[extrudeIndex + 1],\n            extrude[extrudeIndex + 2],\n          ];\n        },\n      },\n    });\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'uv',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Uv',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 2,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          return [vertex[2], vertex[3]];\n        },\n      },\n    });\n  }\n}\n"],"file":"billboard.js"}

package/lib/Geometry/models/plane.js

@@ -187,7 +187,7 @@ var PlaneModel = function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
+    value: function initModels() {
       var _ref5 = this.layer.getLayerConfig(),
           _ref5$mask = _ref5.mask,
           mask = _ref5$mask === void 0 ? false : _ref5$mask,
@@ -202,8 +202,8 @@ var PlaneModel = function (_BaseModel) {
         width: 0
       });
       this.updateTexture(mapTexture);
-      this.layer.buildLayerModel({
-        moduleName: 'geometryPlane',
+      return [this.layer.buildLayerModel({
+        moduleName: 'geometry_plane',
         vertexShader: planeVert,
         fragmentShader: planeFrag,
         triangulation: this.planeGeometryTriangulation,
@@ -211,23 +211,18 @@ var PlaneModel = function (_BaseModel) {
         depth: {
           enable: true
         },
-        stencil: (0, _l7Utils.getMask)(mask, maskInside),
         blend: this.getBlend(),
+        stencil: (0, _l7Utils.getMask)(mask, maskInside),
         cull: {
           enable: true,
           face: _l7Core.gl.BACK
         }
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
+      })];
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
+    value: function buildModels() {
+      return this.initModels();
     }
   }, {
     key: "createModelData",