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

package/es/core/CommonStyleAttribute.js

@@ -1,23 +1,23 @@
 import { AttributeType, gl } from '@antv/l7-core';
-export let 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
+
+/**
+ * Attribute Layout Location in Shader
+ */
+export const 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
+};
 export function getCommonStyleAttributeOptions(name) {
   switch (name) {
     // // roate
@@ -27,7 +27,7 @@ export function getCommonStyleAttributeOptions(name) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Rotation',
-          shaderLocation: ShaderLocation.ROTATION,
+          shaderLocation: COMMON_ATTRIBUTE_LOCATION.ROTATION,
           buffer: {
             usage: gl.DYNAMIC_DRAW,
             data: [],
@@ -48,7 +48,7 @@ export function getCommonStyleAttributeOptions(name) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Stroke',
-          shaderLocation: ShaderLocation.STROKE,
+          shaderLocation: COMMON_ATTRIBUTE_LOCATION.STROKE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
@@ -70,7 +70,7 @@ export function getCommonStyleAttributeOptions(name) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Opacity',
-          shaderLocation: ShaderLocation.OPACITY,
+          shaderLocation: COMMON_ATTRIBUTE_LOCATION.OPACITY,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
@@ -86,35 +86,13 @@ export function getCommonStyleAttributeOptions(name) {
           }
         }
       };
-    case 'extrusionBase':
-      return {
-        name: 'extrusionBase',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_ExtrusionBase',
-          shaderLocation: ShaderLocation.EXTRUSION_BASE,
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.STATIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: feature => {
-            const {
-              extrusionBase: op = 0
-            } = feature;
-            return [op];
-          }
-        }
-      };
     case 'offsets':
       return {
         name: 'offsets',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Offsets',
-          shaderLocation: ShaderLocation.OFFSETS,
+          shaderLocation: COMMON_ATTRIBUTE_LOCATION.OFFSETS,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
@@ -130,28 +108,6 @@ export function getCommonStyleAttributeOptions(name) {
           }
         }
       };
-    case 'thetaOffset':
-      return {
-        name: 'thetaOffset',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_ThetaOffset',
-          shaderLocation: 15,
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.STATIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: feature => {
-            const {
-              thetaOffset: op = 1
-            } = feature;
-            return [op];
-          }
-        }
-      };
     default:
       return undefined;
   }

package/es/core/shape/extrude.js

@@ -1,6 +1,7 @@
 import { lngLatToMeters } from '@antv/l7-utils';
 import earcut from 'earcut';
 import { vec3 } from 'gl-matrix';
+import { getPolygonSurfaceIndices } from "../utils";
 /**
  * 拉伸多边形顶点，返回拉伸后的顶点信息
  * @param paths 路径数据组
@@ -64,7 +65,8 @@ export function extrude_PolygonNormal(path, needFlat = false // 是否需要转
   const flattengeo = earcut.flatten(path);
   const {
     vertices,
-    dimensions
+    dimensions,
+    holes
   } = flattengeo;
   const positions = [];
   const indexArray = [];
@@ -83,8 +85,9 @@ export function extrude_PolygonNormal(path, needFlat = false // 是否需要转
     );
     normals.push(0, 0, 1);
   }
-  const triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push(...triangles);
+  const indices = getPolygonSurfaceIndices(vertices, holes, dimensions, needFlat);
+  indexArray.push(...indices);
+
   // 设置侧面
   for (let i = 0; i < n; i++) {
     const prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);

package/es/core/triangulation.js

@@ -4,8 +4,9 @@ import earcut from 'earcut';
 import { vec3 } from 'gl-matrix';
 import { EARTH_RADIUS, EARTH_RADIUS_OUTER, EARTH_SEGMENTS, lglt2xyz, primitiveSphere } from "../earth/utils";
 import ExtrudePolyline from "../utils/extrude_polyline";
-import extrudePolygon, { extrude_PolygonNormal, fillPolygon } from "./shape/extrude";
 import { geometryShape } from "./shape/Path";
+import extrudePolygon, { extrude_PolygonNormal, fillPolygon } from "./shape/extrude";
+import { getPolygonSurfaceIndices } from "./utils";
 const GeometryCache = {};
 
 /**
@@ -75,9 +76,7 @@ export function PointImageTriangulation(feature) {
  */
 export function LineTriangulation(feature) {
   const {
-    coordinates,
-    originCoordinates,
-    version
+    coordinates
   } = feature;
   // let path = coordinates as number[][][] | number[][];
   // if (!Array.isArray(path[0][0])) {
@@ -88,32 +87,13 @@ export function LineTriangulation(feature) {
     dash: true,
     join: 'bevel'
   });
-  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);
-    });
+  let path = coordinates;
+  if (path[0] && !Array.isArray(path[0][0])) {
+    path = [coordinates];
   }
+  path.forEach(item => {
+    line.extrude(item);
+  });
   const linebuffer = line.complex;
   return {
     vertices: linebuffer.positions,
@@ -175,8 +155,7 @@ export function FlowLineFillTriangulation(feature) {
 }
 export function SimpleLineTriangulation(feature) {
   const {
-    coordinates,
-    originCoordinates
+    coordinates
   } = feature;
   const pos = [];
   if (!Array.isArray(coordinates[0])) {
@@ -191,7 +170,7 @@ export function SimpleLineTriangulation(feature) {
   const {
     results,
     totalDistance
-  } = getSimpleLineVertices(coordinates, originCoordinates);
+  } = getSimpleLineVertices(coordinates);
   results.map(point => {
     pos.push(point[0], point[1], point[2], point[3], 0, totalDistance);
   });
@@ -243,15 +222,11 @@ function pushDis(point, n) {
   }
   return point;
 }
-function getSimpleLineVertices(coordinates, originCoordinates) {
+function getSimpleLineVertices(coordinates) {
   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 = originCoordinates.flat();
-    // @ts-ignore
-    originPoints = originCoordinates.flat();
+    points = coordinates.flat();
   }
   //修改计算距离的方式,与普通线的计算方式保持一致 edit by huyang 20231214
   let distance = 0;
@@ -265,13 +240,13 @@ function getSimpleLineVertices(coordinates, originCoordinates) {
     const point = pushDis(points[0], distance);
     results.push(point);
     for (let i = 1; i < points.length - 1; i++) {
-      const subDistance = lineSegmentDistance(aProjectFlat(originPoints[i - 1]), aProjectFlat(originPoints[i]));
+      const subDistance = lineSegmentDistance(aProjectFlat(points[i - 1]), aProjectFlat(points[i]));
       distance += subDistance;
       const mulPoint = pushDis(points[i], distance);
       results.push(mulPoint);
       results.push(mulPoint);
     }
-    const pointDistance = lineSegmentDistance(aProjectFlat(originPoints[originPoints.length - 2]), aProjectFlat(originPoints[originPoints.length - 1]));
+    const pointDistance = lineSegmentDistance(aProjectFlat(points[points.length - 2]), aProjectFlat(points[points.length - 1]));
     distance += pointDistance;
     results.push(pushDis(points[points.length - 1], distance));
     return {
@@ -310,8 +285,9 @@ export function polygonTriangulation(feature) {
     dimensions,
     holes
   } = flattengeo;
+  const indices = getPolygonSurfaceIndices(vertices, holes, dimensions);
   return {
-    indices: earcut(vertices, holes, dimensions),
+    indices,
     vertices,
     size: dimensions
   };
@@ -320,18 +296,14 @@ export function polygonTriangulation(feature) {
 // 构建几何图形（带有中心点和大小）
 export function polygonTriangulationWithCenter(feature) {
   const {
-    coordinates
-  } = feature;
-  const flattengeo = earcut.flatten(coordinates);
-  const {
+    indices,
     vertices,
-    dimensions,
-    holes
-  } = flattengeo;
+    size
+  } = polygonTriangulation(feature);
   return {
-    indices: earcut(vertices, holes, dimensions),
+    indices: indices,
     vertices: getVerticesWithCenter(vertices),
-    size: dimensions + 4
+    size: size + 4
   };
 }
 function getVerticesWithCenter(vertices) {

package/es/core/utils.d.ts

@@ -1 +1,5 @@
 export declare function MultipleOfFourNumber(num: number): number;
+/**
+ * Get vertex indices for drawing polygon mesh (triangulation)
+ */
+export declare function getPolygonSurfaceIndices(positions: number[], holeIndices: number[], positionSize: number, preproject?: boolean): number[];

package/es/core/utils.js

@@ -1,3 +1,36 @@
+import { lngLatToMeters } from '@antv/l7-utils';
+import earcut from 'earcut';
 export function MultipleOfFourNumber(num) {
   return Math.max(Math.ceil(num / 4) * 4, 4);
+}
+
+/**
+ * Get vertex indices for drawing polygon mesh (triangulation)
+ */
+export function getPolygonSurfaceIndices(positions, holeIndices, positionSize, preproject = true) {
+  const is3d = positionSize === 3;
+  if (preproject) {
+    positions = positions.slice();
+    const p = [];
+    for (let i = 0; i < positions.length; i += positionSize) {
+      p[0] = positions[i];
+      p[1] = positions[i + 1];
+      if (is3d) {
+        p[2] = positions[i + 2];
+      }
+
+      // earcut is a 2D triangulation algorithm, and handles 3D data as if it was projected onto the XY plane
+      const xy = lngLatToMeters(p, true, {
+        enable: false,
+        decimal: 1
+      });
+      positions[i] = xy[0];
+      positions[i + 1] = xy[1];
+      if (is3d) {
+        positions[i + 2] = xy[2];
+      }
+    }
+  }
+  const indices = earcut(positions, holeIndices, positionSize);
+  return indices;
 }

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

@@ -1,6 +1,21 @@
 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/es/earth/models/atmosphere.js

@@ -2,16 +2,22 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { AttributeType, gl } from '@antv/l7-core';
 import { lodashUtil } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
-import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { earthTriangulation } from "../../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 = 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 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 {
   isNumber
 } = lodashUtil;
 export default class EarthAtomSphereModel extends BaseModel {
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      NORMAL: 9,
+      UV: 10
+    });
+  }
   getCommonUniformsInfo() {
     const {
       opacity = 1
@@ -41,6 +47,7 @@ export default class EarthAtomSphereModel extends BaseModel {
         moduleName: 'earthAtmoSphere',
         vertexShader: atmoSphereVert,
         fragmentShader: atmoSphereFrag,
+        defines: _this2.getDefines(),
         triangulation: earthTriangulation,
         depth: {
           enable: false
@@ -52,32 +59,31 @@ export default class EarthAtomSphereModel extends BaseModel {
   }
   registerBuiltinAttributes() {
     // point layer size;
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'size',
-      type: AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Size',
-        shaderLocation: ShaderLocation.SIZE,
-        buffer: {
-          usage: gl.DYNAMIC_DRAW,
-          data: [],
-          type: gl.FLOAT
-        },
-        size: 1,
-        update: feature => {
-          const {
-            size = 1
-          } = feature;
-          return Array.isArray(size) ? [size[0]] : [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: 'normal',
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: ShaderLocation.NORMAL,
+        shaderLocation: this.attributeLocation.NORMAL,
         buffer: {
           usage: gl.STATIC_DRAW,
           data: [],
@@ -94,7 +100,7 @@ export default class EarthAtomSphereModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: ShaderLocation.UV,
+        shaderLocation: this.attributeLocation.UV,
         buffer: {
           usage: gl.DYNAMIC_DRAW,
           data: [],

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

@@ -1,6 +1,21 @@
 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/es/earth/models/base.js

@@ -3,11 +3,10 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
 import { earthTriangulation } from "../../core/triangulation";
-import { ShaderLocation } from "../../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 = 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";
+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";
 export default class BaseEarthModel extends BaseModel {
   constructor(...args) {
     super(...args);
@@ -19,6 +18,13 @@ export default class BaseEarthModel extends BaseModel {
     _defineProperty(this, "sunZ", 1000);
     _defineProperty(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,
@@ -97,6 +103,7 @@ export default class BaseEarthModel extends BaseModel {
         moduleName: 'earthBase',
         vertexShader: baseVert,
         fragmentShader: baseFrag,
+        defines: _this2.getDefines(),
         triangulation: earthTriangulation,
         depth: {
           enable: true
@@ -107,32 +114,31 @@ export default class BaseEarthModel extends BaseModel {
     })();
   }
   registerBuiltinAttributes() {
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'size',
-      type: AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Size',
-        shaderLocation: ShaderLocation.SIZE,
-        buffer: {
-          usage: gl.DYNAMIC_DRAW,
-          data: [],
-          type: gl.FLOAT
-        },
-        size: 1,
-        update: feature => {
-          const {
-            size = 1
-          } = feature;
-          return Array.isArray(size) ? [size[0]] : [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: 'normal',
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: ShaderLocation.NORMAL,
+        shaderLocation: this.attributeLocation.NORMAL,
         buffer: {
           usage: gl.STATIC_DRAW,
           data: [],
@@ -149,7 +155,7 @@ export default class BaseEarthModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: ShaderLocation.UV,
+        shaderLocation: this.attributeLocation.UV,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.DYNAMIC_DRAW,

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

@@ -1,6 +1,21 @@
 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;