@antv/l7-layers 2.21.9-beta.0 → 2.21.10

package/lib/core/CommonStyleAttribute.js

@@ -3,27 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.COMMON_ATTRIBUTE_LOCATION = void 0;
+exports.ShaderLocation = void 0;
 exports.getCommonStyleAttributeOptions = getCommonStyleAttributeOptions;
 var _l7Core = require("@antv/l7-core");
-/**
- * Attribute Layout Location in Shader
- */
-const COMMON_ATTRIBUTE_LOCATION = exports.COMMON_ATTRIBUTE_LOCATION = {
-  // common attribute in RegisterStyleAttributePlugin
-  POSITION: 0,
-  // low part for double precision POSITION attribute
-  POSITION_64LOW: 1,
-  COLOR: 2,
-  PICKING_COLOR: 3,
-  // common style attribute
-  STROKE: 4,
-  OPACITY: 5,
-  OFFSETS: 6,
-  ROTATION: 7,
-  // last index
-  MAX: 8
-};
+let ShaderLocation = exports.ShaderLocation = /*#__PURE__*/function (ShaderLocation) {
+  ShaderLocation[ShaderLocation["POSITION"] = 0] = "POSITION";
+  ShaderLocation[ShaderLocation["COLOR"] = 1] = "COLOR";
+  ShaderLocation[ShaderLocation["VERTEX_ID"] = 2] = "VERTEX_ID";
+  ShaderLocation[ShaderLocation["PICKING_COLOR"] = 3] = "PICKING_COLOR";
+  ShaderLocation[ShaderLocation["STROKE"] = 4] = "STROKE";
+  ShaderLocation[ShaderLocation["OPACITY"] = 5] = "OPACITY";
+  ShaderLocation[ShaderLocation["OFFSETS"] = 6] = "OFFSETS";
+  ShaderLocation[ShaderLocation["ROTATION"] = 7] = "ROTATION";
+  ShaderLocation[ShaderLocation["EXTRUSION_BASE"] = 8] = "EXTRUSION_BASE";
+  ShaderLocation[ShaderLocation["SIZE"] = 9] = "SIZE";
+  ShaderLocation[ShaderLocation["SHAPE"] = 10] = "SHAPE";
+  ShaderLocation[ShaderLocation["EXTRUDE"] = 11] = "EXTRUDE";
+  ShaderLocation[ShaderLocation["MAX"] = 12] = "MAX";
+  ShaderLocation[ShaderLocation["NORMAL"] = 13] = "NORMAL";
+  ShaderLocation[ShaderLocation["UV"] = 14] = "UV";
+  ShaderLocation[ShaderLocation["LINEAR"] = 15] = "LINEAR";
+  return ShaderLocation;
+}({}); // Polygon Linear
 function getCommonStyleAttributeOptions(name) {
   switch (name) {
     // // roate
@@ -33,7 +34,7 @@ function getCommonStyleAttributeOptions(name) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Rotation',
-          shaderLocation: COMMON_ATTRIBUTE_LOCATION.ROTATION,
+          shaderLocation: ShaderLocation.ROTATION,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
@@ -54,7 +55,7 @@ function getCommonStyleAttributeOptions(name) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Stroke',
-          shaderLocation: COMMON_ATTRIBUTE_LOCATION.STROKE,
+          shaderLocation: ShaderLocation.STROKE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -76,7 +77,7 @@ function getCommonStyleAttributeOptions(name) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Opacity',
-          shaderLocation: COMMON_ATTRIBUTE_LOCATION.OPACITY,
+          shaderLocation: ShaderLocation.OPACITY,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
@@ -92,13 +93,35 @@ function getCommonStyleAttributeOptions(name) {
           }
         }
       };
+    case 'extrusionBase':
+      return {
+        name: 'extrusionBase',
+        type: _l7Core.AttributeType.Attribute,
+        descriptor: {
+          name: 'a_ExtrusionBase',
+          shaderLocation: ShaderLocation.EXTRUSION_BASE,
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: _l7Core.gl.STATIC_DRAW,
+            data: [],
+            type: _l7Core.gl.FLOAT
+          },
+          size: 1,
+          update: feature => {
+            const {
+              extrusionBase: op = 0
+            } = feature;
+            return [op];
+          }
+        }
+      };
     case 'offsets':
       return {
         name: 'offsets',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Offsets',
-          shaderLocation: COMMON_ATTRIBUTE_LOCATION.OFFSETS,
+          shaderLocation: ShaderLocation.OFFSETS,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
@@ -114,6 +137,28 @@ function getCommonStyleAttributeOptions(name) {
           }
         }
       };
+    case 'thetaOffset':
+      return {
+        name: 'thetaOffset',
+        type: _l7Core.AttributeType.Attribute,
+        descriptor: {
+          name: 'a_ThetaOffset',
+          shaderLocation: 15,
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: _l7Core.gl.STATIC_DRAW,
+            data: [],
+            type: _l7Core.gl.FLOAT
+          },
+          size: 1,
+          update: feature => {
+            const {
+              thetaOffset: op = 1
+            } = feature;
+            return [op];
+          }
+        }
+      };
     default:
       return undefined;
   }

package/lib/core/triangulation.js

@@ -103,7 +103,9 @@ function PointImageTriangulation(feature) {
  */
 function LineTriangulation(feature) {
   const {
-    coordinates
+    coordinates,
+    originCoordinates,
+    version
   } = feature;
   // let path = coordinates as number[][][] | number[][];
   // if (!Array.isArray(path[0][0])) {
@@ -114,13 +116,32 @@ function LineTriangulation(feature) {
     dash: true,
     join: 'bevel'
   });
-  let path = coordinates;
-  if (path[0] && !Array.isArray(path[0][0])) {
-    path = [coordinates];
+  if (version === 'GAODE2.x') {
+    // 处理高德2.0几何体构建
+    let path1 = coordinates; // 计算位置
+    if (!Array.isArray(path1[0][0])) {
+      path1 = [coordinates];
+    }
+    let path2 = originCoordinates; // 计算法线
+    if (!Array.isArray(path2[0][0])) {
+      path2 = [originCoordinates];
+    }
+    for (let i = 0; i < path1.length; i++) {
+      // 高德2.0在计算线时，需要使用经纬度计算发现，使用 customCoords.lnglatToCoords 计算的数据来计算顶点的位置
+      const item1 = path1[i];
+      const item2 = path2[i];
+      line.extrude_gaode2(item1, item2);
+    }
+  } else {
+    // 处理非高德2.0的几何体构建
+    let path = coordinates;
+    if (path[0] && !Array.isArray(path[0][0])) {
+      path = [coordinates];
+    }
+    path.forEach(item => {
+      line.extrude(item);
+    });
   }
-  path.forEach(item => {
-    line.extrude(item);
-  });
   const linebuffer = line.complex;
   return {
     vertices: linebuffer.positions,
@@ -182,7 +203,8 @@ function FlowLineFillTriangulation(feature) {
 }
 function SimpleLineTriangulation(feature) {
   const {
-    coordinates
+    coordinates,
+    originCoordinates
   } = feature;
   const pos = [];
   if (!Array.isArray(coordinates[0])) {
@@ -197,7 +219,7 @@ function SimpleLineTriangulation(feature) {
   const {
     results,
     totalDistance
-  } = getSimpleLineVertices(coordinates);
+  } = getSimpleLineVertices(coordinates, originCoordinates);
   results.map(point => {
     pos.push(point[0], point[1], point[2], point[3], 0, totalDistance);
   });
@@ -249,11 +271,15 @@ function pushDis(point, n) {
   }
   return point;
 }
-function getSimpleLineVertices(coordinates) {
+function getSimpleLineVertices(coordinates, originCoordinates) {
   let points = coordinates;
+  //除了amap2.0以外 coordinates就是经纬度数据
+  let originPoints = originCoordinates || coordinates;
   if (Array.isArray(points) && Array.isArray(points[0]) && Array.isArray(points[0][0])) {
     // @ts-ignore
-    points = coordinates.flat();
+    points = originCoordinates.flat();
+    // @ts-ignore
+    originPoints = originCoordinates.flat();
   }
   //修改计算距离的方式,与普通线的计算方式保持一致 edit by huyang 20231214
   let distance = 0;
@@ -267,13 +293,13 @@ function getSimpleLineVertices(coordinates) {
     const point = pushDis(points[0], distance);
     results.push(point);
     for (let i = 1; i < points.length - 1; i++) {
-      const subDistance = lineSegmentDistance((0, _l7Utils.aProjectFlat)(points[i - 1]), (0, _l7Utils.aProjectFlat)(points[i]));
+      const subDistance = lineSegmentDistance((0, _l7Utils.aProjectFlat)(originPoints[i - 1]), (0, _l7Utils.aProjectFlat)(originPoints[i]));
       distance += subDistance;
       const mulPoint = pushDis(points[i], distance);
       results.push(mulPoint);
       results.push(mulPoint);
     }
-    const pointDistance = lineSegmentDistance((0, _l7Utils.aProjectFlat)(points[points.length - 2]), (0, _l7Utils.aProjectFlat)(points[points.length - 1]));
+    const pointDistance = lineSegmentDistance((0, _l7Utils.aProjectFlat)(originPoints[originPoints.length - 2]), (0, _l7Utils.aProjectFlat)(originPoints[originPoints.length - 1]));
     distance += pointDistance;
     results.push(pushDis(points[points.length - 1], distance));
     return {

package/lib/earth/models/atmosphere.d.ts

@@ -1,21 +1,6 @@
 import type { IModel } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class EarthAtomSphereModel extends BaseModel {
-    protected get attributeLocation(): {
-        readonly POSITION: 0;
-        readonly POSITION_64LOW: 1;
-        readonly COLOR: 2;
-        readonly PICKING_COLOR: 3;
-        readonly STROKE: 4;
-        readonly OPACITY: 5;
-        readonly OFFSETS: 6;
-        readonly ROTATION: 7;
-        readonly MAX: 8;
-    } & Record<string, number> & {
-        MAX: 8;
-        NORMAL: number;
-        UV: number;
-    };
     protected getCommonUniformsInfo(): {
         uniformsArray: number[];
         uniformsLength: number;

package/lib/earth/models/atmosphere.js

@@ -9,22 +9,16 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation = require("../../core/triangulation");
 /* babel-plugin-inline-import '../shaders/atmosphere/atmosphere_frag.glsl' */
 const atmoSphereFrag = "\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\nin vec3 vVertexNormal;\nin float v_offset;\nin vec4 v_Color;\n\n#pragma include \"scene_uniforms\"\nout vec4 outputColor;\nvoid main() {\n    \n    \n    // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    // \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
 /* babel-plugin-inline-import '../shaders/atmosphere/atmosphere_vert.glsl' */
-const atmoSphereVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\n\n#pragma include \"scene_uniforms\"\nout vec3 vVertexNormal;\nout vec4 v_Color;\nout float v_offset;\n\nvoid main() {\n    float EARTH_RADIUS = 100.0;\n\n    v_Color = a_Color;\n\n    v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
+const atmoSphereVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) vec4 a_Color;\nlayout(location = 13) in vec3 a_Normal;\nlayout(location = 14) in vec2 a_Uv;\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\n#pragma include \"scene_uniforms\"\nout vec3 vVertexNormal;\nout vec4 v_Color;\nout float v_offset;\n\nvoid main() {\n    float EARTH_RADIUS = 100.0;\n    \n    v_Color = a_Color;\n\n    v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 const {
   isNumber
 } = _l7Utils.lodashUtil;
 class EarthAtomSphereModel extends _BaseModel.default {
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      NORMAL: 9,
-      UV: 10
-    });
-  }
   getCommonUniformsInfo() {
     const {
       opacity = 1
@@ -54,7 +48,6 @@ class EarthAtomSphereModel extends _BaseModel.default {
         moduleName: 'earthAtmoSphere',
         vertexShader: atmoSphereVert,
         fragmentShader: atmoSphereFrag,
-        defines: _this2.getDefines(),
         triangulation: _triangulation.earthTriangulation,
         depth: {
           enable: false
@@ -66,31 +59,32 @@ class EarthAtomSphereModel extends _BaseModel.default {
   }
   registerBuiltinAttributes() {
     // point layer size;
-    // this.styleAttributeService.registerStyleAttribute({
-    //   name: 'size',
-    //   type: AttributeType.Attribute,
-    //   descriptor: {
-    //     name: 'a_Size',
-    //     shaderLocation: this.attributeLocation.SIZE,
-    //     buffer: {
-    //       usage: gl.DYNAMIC_DRAW,
-    //       data: [],
-    //       type: gl.FLOAT,
-    //     },
-    //     size: 1,
-    //     update: (feature: IEncodeFeature) => {
-    //       const { size = 1 } = feature;
-    //       return Array.isArray(size) ? [size[0]] : [size as number];
-    //     },
-    //   },
-    // });
-
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'size',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Size',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        buffer: {
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 1,
+        update: feature => {
+          const {
+            size = 1
+          } = feature;
+          return Array.isArray(size) ? [size[0]] : [size];
+        }
+      }
+    });
     this.styleAttributeService.registerStyleAttribute({
       name: 'normal',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: this.attributeLocation.NORMAL,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
         buffer: {
           usage: _l7Core.gl.STATIC_DRAW,
           data: [],
@@ -107,7 +101,7 @@ class EarthAtomSphereModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: this.attributeLocation.UV,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
         buffer: {
           usage: _l7Core.gl.DYNAMIC_DRAW,
           data: [],

package/lib/earth/models/base.d.ts

@@ -1,21 +1,6 @@
 import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class BaseEarthModel extends BaseModel {
-    protected get attributeLocation(): {
-        readonly POSITION: 0;
-        readonly POSITION_64LOW: 1;
-        readonly COLOR: 2;
-        readonly PICKING_COLOR: 3;
-        readonly STROKE: 4;
-        readonly OPACITY: 5;
-        readonly OFFSETS: 6;
-        readonly ROTATION: 7;
-        readonly MAX: 8;
-    } & Record<string, number> & {
-        MAX: 8;
-        NORMAL: number;
-        UV: number;
-    };
     protected texture: ITexture2D;
     private earthTime;
     private sunX;

package/lib/earth/models/base.js

@@ -10,10 +10,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _l7Core = require("@antv/l7-core");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 /* babel-plugin-inline-import '../shaders/base/base_frag.glsl' */
 const baseFrag = "uniform sampler2D u_texture;\n\nin vec2 v_texCoord;\nin float v_lightWeight;\nout vec4 outputColor;\n\nvoid main() {\n    vec4 color = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y));\n    color.xyz = color.xyz * v_lightWeight;\n    outputColor = color;\n}\n";
 /* babel-plugin-inline-import '../shaders/base/base_vert.glsl' */
-const baseVert = "// attribute vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\n// attribute vec2 a_Extrude;\n// attribute float a_Size;\n// attribute float a_Shape;\n\nlayout(std140) uniform commonUniforms {\n\tvec4 u_sunLight: [1.0, -10.5, 12.0,0.0];\n\tfloat u_ambientRatio : 0.5;\n\tfloat u_diffuseRatio : 0.3;\n\tfloat u_specularRatio : 0.2;\n};\n\n#pragma include \"scene_uniforms\"\n\nout vec2 v_texCoord;\nout float v_lightWeight;\n\nfloat calc_lighting(vec4 pos) {\n\n\tvec3 worldPos = vec3(pos * u_ModelMatrix);\n\n\tvec3 worldNormal = a_Normal;\n\n\t// cal light weight\n\tvec3 viewDir = normalize(u_CameraPosition - worldPos);\n\n\tvec3 lightDir = normalize(u_sunLight.xyz);\n\n\tvec3 halfDir = normalize(viewDir+lightDir);\n\t// lambert\n\tfloat lambert = dot(worldNormal, lightDir);\n\t// specular\n\tfloat specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);\n\t//sum to light weight\n\tfloat lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;\n\n\treturn lightWeight;\n}\n\nvoid main() {\n\n\tv_texCoord = a_Uv;\n\n\tfloat lightWeight = calc_lighting(vec4(a_Position, 1.0));\n\tv_lightWeight = lightWeight;\n\n\tgl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
+const baseVert = "// attribute vec4 a_Color;\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 13) in vec3 a_Normal;\nlayout(location = 14) in vec2 a_Uv;\n\n// attribute vec2 a_Extrude;\n// attribute float a_Size;\n// attribute float a_Shape;\n\nlayout(std140) uniform commonUniforms {\n\tvec4 u_sunLight: [1.0, -10.5, 12.0,0.0];\n\tfloat u_ambientRatio : 0.5;\n\tfloat u_diffuseRatio : 0.3;\n\tfloat u_specularRatio : 0.2;\n};\n\n#pragma include \"scene_uniforms\"\n\nout vec2 v_texCoord;\nout float v_lightWeight;\n\nfloat calc_lighting(vec4 pos) {\n\n\tvec3 worldPos = vec3(pos * u_ModelMatrix);\n\n\tvec3 worldNormal = a_Normal;\n\n\t// cal light weight\n\tvec3 viewDir = normalize(u_CameraPosition - worldPos);\n\n\tvec3 lightDir = normalize(u_sunLight.xyz);\n\n\tvec3 halfDir = normalize(viewDir+lightDir);\n\t// lambert\n\tfloat lambert = dot(worldNormal, lightDir);\n\t// specular\n\tfloat specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);\n\t//sum to light weight\n\tfloat lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;\n\n\treturn lightWeight;\n}\n\nvoid main() {\n\n\tv_texCoord = a_Uv;\n\n\tfloat lightWeight = calc_lighting(vec4(a_Position, 1.0));\n\tv_lightWeight = lightWeight;\n\n\tgl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 class BaseEarthModel extends _BaseModel.default {
   constructor(...args) {
     super(...args);
@@ -25,13 +26,6 @@ class BaseEarthModel extends _BaseModel.default {
     (0, _defineProperty2.default)(this, "sunZ", 1000);
     (0, _defineProperty2.default)(this, "sunRadius", Math.sqrt(this.sunX * this.sunX + this.sunY * this.sunY + this.sunZ * this.sunZ));
   }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      NORMAL: 9,
-      UV: 10
-    });
-  }
   getCommonUniformsInfo() {
     const {
       animateOption,
@@ -110,7 +104,6 @@ class BaseEarthModel extends _BaseModel.default {
         moduleName: 'earthBase',
         vertexShader: baseVert,
         fragmentShader: baseFrag,
-        defines: _this2.getDefines(),
         triangulation: _triangulation.earthTriangulation,
         depth: {
           enable: true
@@ -121,31 +114,32 @@ class BaseEarthModel extends _BaseModel.default {
     })();
   }
   registerBuiltinAttributes() {
-    // this.styleAttributeService.registerStyleAttribute({
-    //   name: 'size',
-    //   type: AttributeType.Attribute,
-    //   descriptor: {
-    //     name: 'a_Size',
-    //     shaderLocation: this.attributeLocation.SIZE,
-    //     buffer: {
-    //       usage: gl.DYNAMIC_DRAW,
-    //       data: [],
-    //       type: gl.FLOAT,
-    //     },
-    //     size: 1,
-    //     update: (feature: IEncodeFeature) => {
-    //       const { size = 1 } = feature;
-    //       return Array.isArray(size) ? [size[0]] : [size as number];
-    //     },
-    //   },
-    // });
-
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'size',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Size',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        buffer: {
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 1,
+        update: feature => {
+          const {
+            size = 1
+          } = feature;
+          return Array.isArray(size) ? [size[0]] : [size];
+        }
+      }
+    });
     this.styleAttributeService.registerStyleAttribute({
       name: 'normal',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: this.attributeLocation.NORMAL,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
         buffer: {
           usage: _l7Core.gl.STATIC_DRAW,
           data: [],
@@ -162,7 +156,7 @@ class BaseEarthModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: this.attributeLocation.UV,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: _l7Core.gl.DYNAMIC_DRAW,

package/lib/earth/models/bloomsphere.d.ts

@@ -1,21 +1,6 @@
 import type { IModel } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class EarthBloomSphereModel extends BaseModel {
-    protected get attributeLocation(): {
-        readonly POSITION: 0;
-        readonly POSITION_64LOW: 1;
-        readonly COLOR: 2;
-        readonly PICKING_COLOR: 3;
-        readonly STROKE: 4;
-        readonly OPACITY: 5;
-        readonly OFFSETS: 6;
-        readonly ROTATION: 7;
-        readonly MAX: 8;
-    } & Record<string, number> & {
-        MAX: 8;
-        NORMAL: number;
-        UV: number;
-    };
     protected getCommonUniformsInfo(): {
         uniformsArray: number[];
         uniformsLength: number;

package/lib/earth/models/bloomsphere.js

@@ -9,22 +9,16 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation = require("../../core/triangulation");
 /* babel-plugin-inline-import '../shaders/bloomshpere/bloomsphere_frag.glsl' */
 const bloomSphereFrag = "\nin vec3 vVertexNormal;\nin vec4 v_Color;\n\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\nout vec4 outputColor;\n#pragma include \"scene_uniforms\"\nvoid main() {\n    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));\n    // \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
 /* babel-plugin-inline-import '../shaders/bloomshpere/bloomsphere_vert.glsl' */
-const bloomSphereVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\n#pragma include \"scene_uniforms\"\n\nout vec3 vVertexNormal;\nout vec4 v_Color;\n\nvoid main() {\n    v_Color = a_Color;\n\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
+const bloomSphereVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) vec4 a_Color;\nlayout(location = 13) in vec3 a_Normal;\nlayout(location = 14) in vec2 a_Uv;\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\n#pragma include \"scene_uniforms\"\n\nout vec3 vVertexNormal;\nout vec4 v_Color;\n\nvoid main() {\n    v_Color = a_Color;\n\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 const {
   isNumber
 } = _l7Utils.lodashUtil;
 class EarthBloomSphereModel extends _BaseModel.default {
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      NORMAL: 9,
-      UV: 10
-    });
-  }
   getCommonUniformsInfo() {
     const {
       opacity = 1
@@ -54,7 +48,6 @@ class EarthBloomSphereModel extends _BaseModel.default {
         moduleName: 'earthBloom',
         vertexShader: bloomSphereVert,
         fragmentShader: bloomSphereFrag,
-        defines: _this2.getDefines(),
         triangulation: _triangulation.earthOuterTriangulation,
         depth: {
           enable: false
@@ -65,31 +58,32 @@ class EarthBloomSphereModel extends _BaseModel.default {
     })();
   }
   registerBuiltinAttributes() {
-    // this.styleAttributeService.registerStyleAttribute({
-    //   name: 'size',
-    //   type: AttributeType.Attribute,
-    //   descriptor: {
-    //     name: 'a_Size',
-    //     shaderLocation: this.attributeLocation.SIZE,
-    //     buffer: {
-    //       usage: gl.DYNAMIC_DRAW,
-    //       data: [],
-    //       type: gl.FLOAT,
-    //     },
-    //     size: 1,
-    //     update: (feature: IEncodeFeature) => {
-    //       const { size = 1 } = feature;
-    //       return Array.isArray(size) ? [size[0]] : [size as number];
-    //     },
-    //   },
-    // });
-
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'size',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Size',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        buffer: {
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 1,
+        update: feature => {
+          const {
+            size = 1
+          } = feature;
+          return Array.isArray(size) ? [size[0]] : [size];
+        }
+      }
+    });
     this.styleAttributeService.registerStyleAttribute({
       name: 'normal',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: this.attributeLocation.NORMAL,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
         buffer: {
           usage: _l7Core.gl.STATIC_DRAW,
           data: [],
@@ -106,7 +100,7 @@ class EarthBloomSphereModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: this.attributeLocation.UV,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
         buffer: {
           usage: _l7Core.gl.DYNAMIC_DRAW,
           data: [],

package/lib/earth/shaders/atmosphere/atmosphere_vert.glsl

@@ -1,12 +1,10 @@
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_COLOR) vec4 a_Color;
-layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
-layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
-
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) vec4 a_Color;
+layout(location = 13) in vec3 a_Normal;
+layout(location = 14) in vec2 a_Uv;
 layout(std140) uniform commonUniforms {
  float u_opacity;
 };
-
 #pragma include "scene_uniforms"
 out vec3 vVertexNormal;
 out vec4 v_Color;
@@ -14,7 +12,7 @@ out float v_offset;
 
 void main() {
     float EARTH_RADIUS = 100.0;
-
+    
     v_Color = a_Color;
 
     v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);

package/lib/earth/shaders/base/base_vert.glsl

@@ -1,7 +1,7 @@
 // attribute vec4 a_Color;
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
-layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
+layout(location = 0) in vec3 a_Position;
+layout(location = 13) in vec3 a_Normal;
+layout(location = 14) in vec2 a_Uv;
 
 // attribute vec2 a_Extrude;
 // attribute float a_Size;

package/lib/earth/shaders/bloomshpere/bloomsphere_vert.glsl

@@ -1,8 +1,7 @@
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_COLOR) vec4 a_Color;
-layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
-layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
-
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) vec4 a_Color;
+layout(location = 13) in vec3 a_Normal;
+layout(location = 14) in vec2 a_Uv;
 layout(std140) uniform commonUniforms {
  float u_opacity;
 };