@antv/l7-layers 2.8.34 → 2.8.37

package/es/Geometry/index.d.ts

@@ -14,6 +14,6 @@ export default class GeometryLayer extends BaseLayer<IGeometryLayerStyleOptions>
             };
         };
     };
-    protected getDefaultConfig(): {} | {};
+    protected getDefaultConfig(): {} | {} | {};
     protected getModelType(): GeometryModelType;
 }

package/es/Geometry/index.js

@@ -65,7 +65,8 @@ var GeometryLayer = function (_BaseLayer) {
       var type = this.getModelType();
       var defaultConfig = {
         plane: {},
-        sprite: {}
+        sprite: {},
+        billboard: {}
       };
       return defaultConfig[type];
     }
@@ -81,6 +82,8 @@ var GeometryLayer = function (_BaseLayer) {
         return 'plane';
       } else if (shape === 'sprite') {
         return 'sprite';
+      } else if (shape === 'billboard') {
+        return 'billboard';
       } else {
         return 'plane';
       }

package/es/Geometry/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Geometry/index.ts"],"names":["BaseLayer","GeometryModels","GeometryLayer","modelType","getModelType","layerModel","models","initModels","buildModels","properties","opacity","type","minimum","maximum","defaultConfig","plane","sprite","shapeAttribute","styleAttributeService","getLayerStyleAttribute","shape","scale","field"],"mappings":";;;;;;;;;;;;AAAA,OAAOA,SAAP,MAAsB,mBAAtB;AAEA,OAAOC,cAAP,MAAkD,UAAlD;;IAEqBC,a;;;;;;;;;;;;;;;;2DAGG,e;;;;;;;WACtB,uBAAqB;AACnB,UAAMC,SAAS,GAAG,KAAKC,YAAL,EAAlB;AACA,WAAKC,UAAL,GAAkB,IAAIJ,cAAc,CAACE,SAAD,CAAlB,CAA8B,IAA9B,CAAlB;AACA,WAAKG,MAAL,GAAc,KAAKD,UAAL,CAAgBE,UAAhB,EAAd;AACD;;;WACD,yBAAuB;AACrB,WAAKD,MAAL,GAAc,KAAKD,UAAL,CAAgBG,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,KAAKP,YAAL,EAAb;AACA,UAAMU,aAAa,GAAG;AACpBC,QAAAA,KAAK,EAAE,EADa;AAEpBC,QAAAA,MAAM,EAAE;AAFY,OAAtB;AAIA,aAAOF,aAAa,CAACH,IAAD,CAApB;AACD;;;WAED,wBAA4C;AAAA;;AAC1C,UAAMM,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;AACL,eAAO,OAAP;AACD;AACF;;;;EA7CwCpB,S;;SAAtBE,a","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    };\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 {\n      return 'plane';\n    }\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/Geometry/index.ts"],"names":["BaseLayer","GeometryModels","GeometryLayer","modelType","getModelType","layerModel","models","initModels","buildModels","properties","opacity","type","minimum","maximum","defaultConfig","plane","sprite","billboard","shapeAttribute","styleAttributeService","getLayerStyleAttribute","shape","scale","field"],"mappings":";;;;;;;;;;;;AAAA,OAAOA,SAAP,MAAsB,mBAAtB;AAEA,OAAOC,cAAP,MAAkD,UAAlD;;IAEqBC,a;;;;;;;;;;;;;;;;2DAGG,e;;;;;;;WACtB,uBAAqB;AACnB,UAAMC,SAAS,GAAG,KAAKC,YAAL,EAAlB;AACA,WAAKC,UAAL,GAAkB,IAAIJ,cAAc,CAACE,SAAD,CAAlB,CAA8B,IAA9B,CAAlB;AACA,WAAKG,MAAL,GAAc,KAAKD,UAAL,CAAgBE,UAAhB,EAAd;AACD;;;WACD,yBAAuB;AACrB,WAAKD,MAAL,GAAc,KAAKD,UAAL,CAAgBG,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,KAAKP,YAAL,EAAb;AACA,UAAMU,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;;;;EAhDwCrB,S;;SAAtBE,a","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/es/Geometry/models/billboard.d.ts

@@ -0,0 +1,26 @@
+import { IModelUniform, ITexture2D } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class BillBoardModel extends BaseModel {
+    protected texture: ITexture2D;
+    private radian;
+    planeGeometryTriangulation: () => {
+        size: number;
+        indices: number[];
+        vertices: number[];
+    };
+    getUninforms(): IModelUniform;
+    clearModels(): void;
+    initModels(): import("@antv/l7-core").IModel[];
+    buildModels(): import("@antv/l7-core").IModel[];
+    updateTexture(drawCanvas: (canvas: HTMLCanvasElement) => void): void;
+    protected getConfigSchema(): {
+        properties: {
+            opacity: {
+                type: string;
+                minimum: number;
+                maximum: number;
+            };
+        };
+    };
+    protected registerBuiltinAttributes(): void;
+}

package/es/Geometry/models/billboard.js

@@ -0,0 +1,213 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+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 _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; } }
+
+import { AttributeType, gl } from '@antv/l7-core';
+import { getMask } from '@antv/l7-utils';
+import BaseModel from '../../core/BaseModel';
+var planeFrag = "\nuniform sampler2D u_texture;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"picking\"\nvoid main() {\n  gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));\n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform float u_raisingHeight: 0.0;\nuniform mat4 u_Mvp;\nuniform float u_opacity;\nuniform vec2 u_size: [1.0, 1.0];\nuniform mat2 u_RotateMatrix;\n\nattribute vec3 a_Extrude;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nattribute vec3 a_Color;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   vec3 extrude = a_Extrude;\n   v_Color = a_Color;\n   v_uv = a_Uv;\n\n   float raiseHeight = u_raisingHeight;\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      raiseHeight = u_raisingHeight * mapboxZoomScale;\n   }\n\n   // \u8BA1\u7B97\u7ECF\u7EAC\u5EA6\u70B9\u4F4D\u5750\u6807\n   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n   // \u8BA1\u7B97\u7ED5 z \u8F74\u65CB\u8F6C\u540E\u7684\u504F\u79FB\n   vec2 offsetXY = project_pixel(u_RotateMatrix * vec2(extrude.x * u_size.x, 0.0));\n   // \u7ED5 z \u8F74\u65CB\u8F6C\n   float x = project_pos.x + offsetXY.x;\n   float y = project_pos.y + offsetXY.y;\n   // z \u8F74\u4E0D\u53C2\u4E0E\u65CB\u8F6C\n   float z = project_pixel(extrude.y * u_size.y + raiseHeight);\n\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      // gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));\n      gl_Position = u_Mvp * (vec4(x, y, z, 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(x , y, z , 1.0));\n   }\n\n   setPickingColor(a_PickingColor);\n}\n";
+
+var BillBoardModel = function (_BaseModel) {
+  _inherits(BillBoardModel, _BaseModel);
+
+  var _super = _createSuper(BillBoardModel);
+
+  function BillBoardModel() {
+    var _this;
+
+    _classCallCheck(this, BillBoardModel);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "texture", void 0);
+
+    _defineProperty(_assertThisInitialized(_this), "radian", 0);
+
+    _defineProperty(_assertThisInitialized(_this), "planeGeometryTriangulation", function () {
+      var _ref = _this.layer.getLayerConfig(),
+          _ref$center = _ref.center,
+          center = _ref$center === void 0 ? [120, 30] : _ref$center;
+
+      return {
+        size: 4,
+        indices: [0, 1, 2, 2, 3, 0],
+        vertices: [].concat(_toConsumableArray(center), [1, 1], _toConsumableArray(center), [0, 1], _toConsumableArray(center), [0, 0], _toConsumableArray(center), [1, 0])
+      };
+    });
+
+    return _this;
+  }
+
+  _createClass(BillBoardModel, [{
+    key: "getUninforms",
+    value: function getUninforms() {
+      var _ref2 = this.layer.getLayerConfig(),
+          opacity = _ref2.opacity,
+          _ref2$width = _ref2.width,
+          width = _ref2$width === void 0 ? 1 : _ref2$width,
+          _ref2$height = _ref2.height,
+          height = _ref2$height === void 0 ? 1 : _ref2$height,
+          _ref2$raisingHeight = _ref2.raisingHeight,
+          raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
+
+      var rotateFlag = 1;
+
+      if (this.mapService.version === 'GAODE2.x' || this.mapService.version === 'GAODE1.x') {
+        rotateFlag = -1;
+      }
+
+      this.radian = rotateFlag * Math.PI * (this.mapService.getRotation() % 360) / 180;
+      return {
+        u_raisingHeight: Number(raisingHeight),
+        u_RotateMatrix: new Float32Array([Math.cos(this.radian), Math.sin(this.radian), -Math.sin(this.radian), Math.cos(this.radian)]),
+        u_opacity: opacity || 1,
+        u_texture: this.texture,
+        u_size: [width, height]
+      };
+    }
+  }, {
+    key: "clearModels",
+    value: function clearModels() {
+      var _this$texture;
+
+      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+    }
+  }, {
+    key: "initModels",
+    value: function initModels() {
+      var _ref3 = this.layer.getLayerConfig(),
+          _ref3$mask = _ref3.mask,
+          mask = _ref3$mask === void 0 ? false : _ref3$mask,
+          _ref3$maskInside = _ref3.maskInside,
+          maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside,
+          drawCanvas = _ref3.drawCanvas;
+
+      var createTexture2D = this.rendererService.createTexture2D;
+      this.texture = createTexture2D({
+        height: 0,
+        width: 0
+      });
+
+      if (drawCanvas) {
+        this.updateTexture(drawCanvas);
+      }
+
+      return [this.layer.buildLayerModel({
+        moduleName: 'geometry_billboard',
+        vertexShader: planeVert,
+        fragmentShader: planeFrag,
+        triangulation: this.planeGeometryTriangulation,
+        primitive: gl.TRIANGLES,
+        depth: {
+          enable: true
+        },
+        blend: this.getBlend(),
+        stencil: getMask(mask, maskInside)
+      })];
+    }
+  }, {
+    key: "buildModels",
+    value: function buildModels() {
+      return this.initModels();
+    }
+  }, {
+    key: "updateTexture",
+    value: function updateTexture(drawCanvas) {
+      var createTexture2D = this.rendererService.createTexture2D;
+
+      var _ref4 = this.layer.getLayerConfig(),
+          _ref4$canvasWidth = _ref4.canvasWidth,
+          canvasWidth = _ref4$canvasWidth === void 0 ? 1 : _ref4$canvasWidth,
+          _ref4$canvasHeight = _ref4.canvasHeight,
+          canvasHeight = _ref4$canvasHeight === void 0 ? 1 : _ref4$canvasHeight;
+
+      var canvas = document.createElement('canvas');
+      canvas.width = canvasWidth;
+      canvas.height = canvasHeight;
+      var ctx = canvas.getContext('2d');
+
+      if (ctx) {
+        drawCanvas(canvas);
+        this.texture = createTexture2D({
+          data: canvas,
+          width: canvas.width,
+          height: canvas.height,
+          wrapS: gl.CLAMP_TO_EDGE,
+          wrapT: gl.CLAMP_TO_EDGE
+        });
+        this.layerService.updateLayerRenderList();
+        this.layerService.renderLayers();
+      }
+    }
+  }, {
+    key: "getConfigSchema",
+    value: function getConfigSchema() {
+      return {
+        properties: {
+          opacity: {
+            type: 'number',
+            minimum: 0,
+            maximum: 1
+          }
+        }
+      };
+    }
+  }, {
+    key: "registerBuiltinAttributes",
+    value: function registerBuiltinAttributes() {
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'extrude',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Extrude',
+          buffer: {
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 3,
+          update: function update(feature, featureIdx, vertex, attributeIdx) {
+            var extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];
+            var extrudeIndex = attributeIdx % 4 * 3;
+            return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
+          }
+        }
+      });
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'uv',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Uv',
+          buffer: {
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 2,
+          update: function update(feature, featureIdx, vertex, attributeIdx) {
+            return [vertex[2], vertex[3]];
+          }
+        }
+      });
+    }
+  }]);
+
+  return BillBoardModel;
+}(BaseModel);
+
+export { BillBoardModel as default };
+//# sourceMappingURL=billboard.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/Geometry/models/billboard.ts"],"names":["AttributeType","gl","getMask","BaseModel","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","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","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","update","feature","featureIdx","vertex","attributeIdx","extrude","extrudeIndex"],"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/es/Geometry/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type GeometryModelType = 'plane' | 'sprite';
+export declare type GeometryModelType = 'plane' | 'sprite' | 'billboard';
 declare const GeometryModels: {
     [key in GeometryModelType]: any;
 };

package/es/Geometry/models/index.js

@@ -1,8 +1,10 @@
+import BillBoardModel from './billboard';
 import PlaneModel from './plane';
 import SpriteModel from './sprite';
 var GeometryModels = {
   plane: PlaneModel,
-  sprite: SpriteModel
+  sprite: SpriteModel,
+  billboard: BillBoardModel
 };
 export default GeometryModels;
 //# sourceMappingURL=index.js.map

package/es/Geometry/models/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/Geometry/models/index.ts"],"names":["PlaneModel","SpriteModel","GeometryModels","plane","sprite"],"mappings":"AAAA,OAAOA,UAAP,MAAuB,SAAvB;AACA,OAAOC,WAAP,MAAwB,UAAxB;AAGA,IAAMC,cAAmD,GAAG;AAC1DC,EAAAA,KAAK,EAAEH,UADmD;AAE1DI,EAAAA,MAAM,EAAEH;AAFkD,CAA5D;AAIA,eAAeC,cAAf","sourcesContent":["import PlaneModel from './plane';\nimport SpriteModel from './sprite';\nexport type GeometryModelType = 'plane' | 'sprite';\n\nconst GeometryModels: { [key in GeometryModelType]: any } = {\n  plane: PlaneModel,\n  sprite: SpriteModel,\n};\nexport default GeometryModels;\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/Geometry/models/index.ts"],"names":["BillBoardModel","PlaneModel","SpriteModel","GeometryModels","plane","sprite","billboard"],"mappings":"AAAA,OAAOA,cAAP,MAA2B,aAA3B;AACA,OAAOC,UAAP,MAAuB,SAAvB;AACA,OAAOC,WAAP,MAAwB,UAAxB;AAGA,IAAMC,cAAmD,GAAG;AAC1DC,EAAAA,KAAK,EAAEH,UADmD;AAE1DI,EAAAA,MAAM,EAAEH,WAFkD;AAG1DI,EAAAA,SAAS,EAAEN;AAH+C,CAA5D;AAKA,eAAeG,cAAf","sourcesContent":["import BillBoardModel from './billboard';\nimport PlaneModel from './plane';\nimport SpriteModel from './sprite';\nexport type GeometryModelType = 'plane' | 'sprite' | 'billboard';\n\nconst GeometryModels: { [key in GeometryModelType]: any } = {\n  plane: PlaneModel,\n  sprite: SpriteModel,\n  billboard: BillBoardModel,\n};\nexport default GeometryModels;\n"],"file":"index.js"}

package/es/Geometry/models/sprite.js

@@ -15,8 +15,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { gl } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
 import BaseModel from '../../core/BaseModel';
-var spriteFrag = "\nuniform sampler2D u_texture;\nuniform float u_mapFlag;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying float v_d;\n\n#pragma include \"picking\"\nvoid main() {\n\n  if(v_d < 0.0) {\n    discard;\n  }\n\n  if(u_mapFlag > 0.0) {\n    gl_FragColor = texture2D(u_texture, gl_PointCoord);\n    gl_FragColor.a *= u_opacity;\n  } else {\n    gl_FragColor = vec4(v_Color, u_opacity);\n  }\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
-var spriteVert = "precision highp float;\n\nattribute vec3 a_Position;\nattribute vec3 a_Color;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_opacity;\nuniform float u_Scale;\nvarying vec3 v_Color;\nvarying float v_d;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   v_Color = a_Color;\n  \n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_d = a_Position.z;\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n   }\n\n   gl_PointSize = pow((u_Zoom - 1.0), 2.0) * u_Scale;\n\n   setPickingColor(a_PickingColor);\n}\n";
+var spriteFrag = "\nuniform sampler2D u_texture;\nuniform float u_mapFlag;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying float v_d;\n\nvoid main() {\n\n  if(v_d < 0.0) {\n    discard;\n  }\n\n  if(u_mapFlag > 0.0) {\n    gl_FragColor = texture2D(u_texture, gl_PointCoord);\n    gl_FragColor.a *= u_opacity;\n  } else {\n    gl_FragColor = vec4(v_Color, u_opacity);\n  }\n}\n";
+var spriteVert = "precision highp float;\n\nattribute vec3 a_Position;\nattribute vec3 a_Color;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_opacity;\nuniform float u_Scale;\nvarying vec3 v_Color;\nvarying float v_d;\n\n#pragma include \"projection\"\nvoid main() {\n   v_Color = a_Color;\n  \n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_d = a_Position.z;\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n   }\n\n   gl_PointSize = pow((u_Zoom - 1.0), 2.0) * u_Scale;\n}\n";
 var SPRITE_ANIMATE_DIR;
 
 (function (SPRITE_ANIMATE_DIR) {

package/es/core/BaseLayer.d.ts

@@ -1,9 +1,9 @@
 import { SyncBailHook, SyncHook, SyncWaterfallHook } from '@antv/async-hook';
-import { BlendType, IActiveOption, IAnimateOption, IAttrubuteAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPlugin, ILayerService, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
+import { BlendType, IActiveOption, IAnimateOption, IAttrubuteAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPlugin, ILayerService, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { EventEmitter } from 'eventemitter3';
 import { Container } from 'inversify';
-export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter implements ILayer {
+export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter<LayerEventType> implements ILayer {
     id: string;
     name: string;
     type: string;