@antv/l7-layers 2.20.3 → 2.20.6

package/es/core/BaseModel.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _initializerDefineProperty from "@babel/runtime/helpers/esm/initializerDefineProperty";
@@ -13,13 +14,15 @@ import { rgb2arr } from '@antv/l7-utils';
 import { BlendTypes } from "../utils/blend";
 import { getStencil as _getStencil, getStencilMask } from "../utils/stencil";
 import { DefaultUniformStyleType, DefaultUniformStyleValue } from "./constant";
+import { MultipleOfFourNumber } from "./utils";
 import { getCommonStyleAttributeOptions, ShaderLocation } from "./CommonStyleAttribute";
 var shaderLocationMap = {
   opacity: ShaderLocation.OPACITY,
   stroke: ShaderLocation.STROKE,
   offsets: ShaderLocation.OFFSETS,
   rotation: ShaderLocation.ROTATION,
-  extrusionBase: ShaderLocation.EXTRUSION_BASE
+  extrusionBase: ShaderLocation.EXTRUSION_BASE,
+  thetaOffset: 15
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -32,6 +35,9 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
   // @lazyInject(TYPES.IShaderModuleService)
 
+  // 支持数据映射的buffer
+  // 不支持数据映射的buffer
+
   // style texture data mapping
 
   function BaseModel(layer) {
@@ -109,10 +115,21 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function getDefaultStyle() {
       return {};
     }
+    // public getUninforms(): IModelUniform {
+    //   throw new Error('Method not implemented.');
+    // }
   }, {
     key: "getUninforms",
     value: function getUninforms() {
-      throw new Error('Method not implemented.');
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      var result = _objectSpread(_objectSpread({}, attributeInfo.uniformsOption), commoninfo.uniformsOption);
+      //如果是regl渲染 需要在uniform中带上u_texture 暂时用this.rendererService.device判断
+      if (!this.rendererService.hasOwnProperty('device') && this.textures && this.textures.length === 1) {
+        result['u_texture'] = this.textures[0];
+      }
+      return result;
     }
   }, {
     key: "getAnimateUniforms",
@@ -212,6 +229,8 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         this.layer.setAnimateStartTime();
       }
     }
+
+    // 动态注入参与数据映射的uniform
   }, {
     key: "getInject",
     value: function getInject() {
@@ -230,6 +249,10 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         } else {
           uniforms.push("  ".concat(DefaultUniformStyleType[key], " u_").concat(key, ";"));
         }
+        var location = shaderLocationMap[key];
+        if (!location && key === 'THETA_OFFSET') {
+          location = 15;
+        }
         str += "\n          #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n          layout(location = ").concat(shaderLocationMap[key], ") in ").concat(DefaultUniformStyleType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n        #endif\n\n        ");
       });
       var attributeUniforms = uniforms.length ? "\nlayout(std140) uniform AttributeUniforms {\n".concat(uniforms.join('\n'), "\n};\n    ") : '';
@@ -286,6 +309,80 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function updateEncodeAttribute(type, flag) {
       this.encodeStyleAttribute[type] = flag;
     }
+  }, {
+    key: "initUniformsBuffer",
+    value: function initUniformsBuffer() {
+      var attrUniforms = this.getUniformsBufferInfo(this.getStyleAttribute());
+      var commonUniforms = this.getCommonUniformsInfo();
+      if (attrUniforms.uniformsLength !== 0) {
+        this.attributeUnifoms = this.rendererService.createBuffer({
+          data: new Float32Array(MultipleOfFourNumber(attrUniforms.uniformsLength)).fill(0),
+          // 长度需要大于等于 4
+          isUBO: true
+        });
+        this.uniformBuffers.push(this.attributeUnifoms);
+      }
+      if (commonUniforms.uniformsLength !== 0) {
+        this.commonUnifoms = this.rendererService.createBuffer({
+          data: new Float32Array(MultipleOfFourNumber(commonUniforms.uniformsLength)).fill(0),
+          isUBO: true
+        });
+        this.uniformBuffers.push(this.commonUnifoms);
+      }
+    }
+    // 获取数据映射 uniform 信息
+  }, {
+    key: "getUniformsBufferInfo",
+    value: function getUniformsBufferInfo(uniformsOption) {
+      var uniformsLength = 0;
+      var uniformsArray = [];
+      Object.values(uniformsOption).forEach(function (value) {
+        if (Array.isArray(value)) {
+          uniformsArray.push.apply(uniformsArray, _toConsumableArray(value));
+          uniformsLength += value.length;
+        } else if (typeof value === 'number') {
+          // 排除纹理
+          uniformsArray.push(value);
+          uniformsLength += 1;
+        } else if (typeof value === 'boolean') {
+          uniformsArray.push(Number(value));
+          uniformsLength += 1;
+        }
+      });
+      return {
+        uniformsOption: uniformsOption,
+        uniformsLength: uniformsLength,
+        uniformsArray: uniformsArray
+      };
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
+      return {
+        uniformsLength: 0,
+        uniformsArray: [],
+        uniformsOption: {}
+      };
+    }
+
+    // 更新支持数据映射的uniform
+  }, {
+    key: "updateStyleUnifoms",
+    value: function updateStyleUnifoms() {
+      var _this$attributeUnifom, _this$commonUnifoms;
+      var _this$getUniformsBuff = this.getUniformsBufferInfo(this.getStyleAttribute()),
+        uniformsArray = _this$getUniformsBuff.uniformsArray;
+      var _this$getCommonUnifor = this.getCommonUniformsInfo(),
+        commonUniformsArray = _this$getCommonUnifor.uniformsArray;
+      (_this$attributeUnifom = this.attributeUnifoms) === null || _this$attributeUnifom === void 0 || _this$attributeUnifom.subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array(uniformsArray).buffer)
+      });
+      (_this$commonUnifoms = this.commonUnifoms) === null || _this$commonUnifoms === void 0 || _this$commonUnifoms.subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array(commonUniformsArray).buffer)
+      });
+    }
   }]);
   return BaseModel;
 }(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "configService", [_dec], {

package/es/core/CommonStyleAttribute.d.ts

@@ -1,4 +1,4 @@
-import { IStyleAttribute } from '@antv/l7-core';
+import type { IStyleAttribute } from '@antv/l7-core';
 export declare enum ShaderLocation {
     POSITION = 0,
     COLOR = 1,
@@ -12,6 +12,9 @@ export declare enum ShaderLocation {
     SIZE = 9,
     SHAPE = 10,
     EXTRUDE = 11,
-    MAX = 12
+    MAX = 12,
+    NORMAL = 13,
+    UV = 14,
+    LINEAR = 15
 }
 export declare function getCommonStyleAttributeOptions(name: string): Partial<IStyleAttribute> | undefined;

package/es/core/CommonStyleAttribute.js

@@ -13,6 +13,9 @@ export var ShaderLocation = /*#__PURE__*/function (ShaderLocation) {
   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;
 }({});
 export function getCommonStyleAttributeOptions(name) {
@@ -127,6 +130,7 @@ export function getCommonStyleAttributeOptions(name) {
         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,

package/es/core/LayerPickService.d.ts

@@ -1,4 +1,4 @@
-import { IInteractionTarget, ILayer, ILayerPickService, IMapService } from '@antv/l7-core';
+import type { IInteractionTarget, ILayer, ILayerPickService, IMapService } from '@antv/l7-core';
 export default class BaseLayerPickService implements ILayerPickService {
     private layer;
     constructor(layer: ILayer);

package/es/core/TextureService.d.ts

@@ -1,5 +1,5 @@
-import { ILayer, ITexture2D, ITextureService } from '@antv/l7-core';
-import { IColorRamp } from '@antv/l7-utils';
+import type { ILayer, ITexture2D, ITextureService } from '@antv/l7-core';
+import type { IColorRamp } from '@antv/l7-utils';
 export default class TextureService implements ITextureService {
     private layer;
     private rendererService;

package/es/core/interface.d.ts

@@ -1,6 +1,6 @@
-import { IAnimateOption, IMapService, ITexture2D, StyleAttributeField, StyleAttributeOption } from '@antv/l7-core';
-import { IColorRamp } from '@antv/l7-utils';
-import { anchorType } from '../utils/symbol-layout';
+import type { IAnimateOption, IMapService, ITexture2D, StyleAttributeField, StyleAttributeOption } from '@antv/l7-core';
+import type { IColorRamp } from '@antv/l7-utils';
+import type { anchorType } from '../utils/symbol-layout';
 export declare enum lineStyleType {
     'solid' = 0,
     'dash' = 1
@@ -147,6 +147,10 @@ export interface IImageLayerStyleOptions extends IBaseLayerStyleOptions {
     clampHigh?: boolean;
     rampColors?: IColorRamp;
     colorTexture?: ITexture2D;
+    brightness?: number;
+    contrast?: number;
+    saturation?: number;
+    gamma?: number;
 }
 export interface ICityBuildLayerStyleOptions {
     opacity: number;

package/es/core/interface.js

@@ -13,7 +13,6 @@ export var TextureBlend = /*#__PURE__*/function (TextureBlend) {
   TextureBlend["REPLACE"] = "replace";
   return TextureBlend;
 }({});
-
 /**
  * 基础图层类型定义
  */

package/es/core/line_trangluation.d.ts

@@ -1,4 +1,4 @@
-import { IEncodeFeature } from '@antv/l7-core';
+import type { IEncodeFeature } from '@antv/l7-core';
 export declare function FlowHalfArrowFillTriangulation(feature: IEncodeFeature): {
     vertices: number[];
     normals: number[];

package/es/core/shape/arrow.d.ts

@@ -1,4 +1,4 @@
-import { ArrowType, IArrowOptions, ILineSymbol } from '../interface';
+import type { ArrowType, IArrowOptions, ILineSymbol } from '../interface';
 export interface IArrowData {
     vertices: number[];
     indices: number[];

package/es/core/shape/extrude.d.ts

@@ -1,4 +1,4 @@
-import { IPath } from './Path';
+import type { IPath } from './Path';
 export interface IExtrudeGeomety {
     positions: number[];
     index: number[];

package/es/core/triangulation.d.ts

@@ -1,4 +1,4 @@
-import { IEncodeFeature } from '@antv/l7-core';
+import type { IEncodeFeature } from '@antv/l7-core';
 /**
  * 计算2D 填充点图顶点
  * @param feature 映射feature

package/es/core/triangulation.js

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { calculateCentroid, calculatePointsCenterAndRadius, lngLatToMeters } from '@antv/l7-utils';
+import { calculateCentroid, calculatePointsCenterAndRadius, lngLatToMeters, aProjectFlat } from '@antv/l7-utils';
 import earcut from 'earcut';
 // @ts-ignore
 import { vec3 } from 'gl-matrix';
@@ -162,7 +162,8 @@ export function FlowLineFillTriangulation(feature) {
   };
 }
 export function SimpleLineTriangulation(feature) {
-  var coordinates = feature.coordinates;
+  var coordinates = feature.coordinates,
+    originCoordinates = feature.originCoordinates;
   var pos = [];
   if (!Array.isArray(coordinates[0])) {
     return {
@@ -173,7 +174,7 @@ export function SimpleLineTriangulation(feature) {
       count: 0
     };
   }
-  var _getSimpleLineVertice = getSimpleLineVertices(coordinates),
+  var _getSimpleLineVertice = getSimpleLineVertices(coordinates, originCoordinates),
     results = _getSimpleLineVertice.results,
     totalDistance = _getSimpleLineVertice.totalDistance;
   results.map(function (point) {
@@ -224,12 +225,17 @@ function pushDis(point, n) {
   }
   return point;
 }
-function getSimpleLineVertices(coordinates) {
+function getSimpleLineVertices(coordinates, originCoordinates) {
   var points = coordinates;
+  //除了amap2.0以外 coordinates就是经纬度数据
+  var 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
   var distance = 0;
   if (points.length < 2) {
     return {
@@ -241,13 +247,13 @@ function getSimpleLineVertices(coordinates) {
     var point = pushDis(points[0], distance);
     results.push(point);
     for (var i = 1; i < points.length - 1; i++) {
-      var subDistance = lineSegmentDistance(points[i - 1], points[i]);
+      var subDistance = lineSegmentDistance(aProjectFlat(originPoints[i - 1]), aProjectFlat(originPoints[i]));
       distance += subDistance;
       var mulPoint = pushDis(points[i], distance);
       results.push(mulPoint);
       results.push(mulPoint);
     }
-    var pointDistance = lineSegmentDistance(points[points.length - 2], points[points.length - 1]);
+    var pointDistance = lineSegmentDistance(aProjectFlat(originPoints[originPoints.length - 2]), aProjectFlat(originPoints[originPoints.length - 1]));
     distance += pointDistance;
     results.push(pushDis(points[points.length - 1], distance));
     return {

package/es/core/utils.d.ts

@@ -0,0 +1,4 @@
+export declare function formatUniformsOption2Std140(uniformsOption: {
+    [key: string]: any;
+}): string;
+export declare function MultipleOfFourNumber(num: number): number;

package/es/core/utils.js

@@ -0,0 +1,15 @@
+export function formatUniformsOption2Std140(uniformsOption) {
+  var std140_str = '';
+  Object.keys(uniformsOption).forEach(function (key) {
+    var value = uniformsOption[key];
+    if (Array.isArray(value)) {
+      std140_str += "vec".concat(value.length, " ").concat(key, ";\n");
+    } else {
+      std140_str += "flot ".concat(key, ";\n");
+    }
+  });
+  return std140_str;
+}
+export function MultipleOfFourNumber(num) {
+  return Math.max(Math.ceil(num / 4) * 4, 4);
+}

package/es/earth/index.d.ts

@@ -1,4 +1,4 @@
-import { ISourceCFG } from '@antv/l7-core';
+import type { ISourceCFG } from '@antv/l7-core';
 import BaseLayer from '../core/BaseLayer';
 interface IEarthLayerStyleOptions {
     opacity: number;

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

@@ -1,7 +1,13 @@
-import { IModel, IModelUniform } from '@antv/l7-core';
+import type { IModel } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class EarthAtomSphereModel extends BaseModel {
-    getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
     initModels(): Promise<IModel[]>;
     clearModels(): string;
     buildModels(): Promise<IModel[]>;

package/es/earth/models/atmosphere.js

@@ -11,10 +11,11 @@ import { AttributeType, gl } from '@antv/l7-core';
 import { lodashUtil } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { earthTriangulation } from "../../core/triangulation";
-/* babel-plugin-inline-import '../shaders/atmosphere_frag.glsl' */
-var atmoSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\n\nvarying vec3 vVertexNormal;\nvarying float v_offset;\nvarying vec4 v_Color;\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    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
-/* babel-plugin-inline-import '../shaders/atmosphere_vert.glsl' */
-var atmoSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nvarying float v_CamreaDistance;\n\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\nvarying 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";
+/* babel-plugin-inline-import '../shaders/atmosphere/atmosphere_frag.glsl' */
+var 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' */
+var 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";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 var isNumber = lodashUtil.isNumber;
 var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(EarthAtomSphereModel, _BaseModel);
@@ -24,14 +25,16 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
     return _super.apply(this, arguments);
   }
   _createClass(EarthAtomSphereModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
         _ref$opacity = _ref.opacity,
         opacity = _ref$opacity === void 0 ? 1 : _ref$opacity;
-      return {
+      var commonOptions = {
         u_opacity: isNumber(opacity) ? opacity : 1.0
       };
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
@@ -40,8 +43,9 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              this.initUniformsBuffer();
               return _context.abrupt("return", this.buildModels());
-            case 1:
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -101,6 +105,7 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: ShaderLocation.SIZE,
           buffer: {
             usage: gl.DYNAMIC_DRAW,
             data: [],
@@ -119,6 +124,7 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
+          shaderLocation: ShaderLocation.NORMAL,
           buffer: {
             usage: gl.STATIC_DRAW,
             data: [],
@@ -135,6 +141,7 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
+          shaderLocation: ShaderLocation.UV,
           buffer: {
             usage: gl.DYNAMIC_DRAW,
             data: [],

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

@@ -1,4 +1,4 @@
-import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
+import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class BaseEarthModel extends BaseModel {
     protected texture: ITexture2D;
@@ -7,7 +7,13 @@ export default class BaseEarthModel extends BaseModel {
     private sunY;
     private sunZ;
     private sunRadius;
-    getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
     setEarthTime(time: number): void;
     initModels(): Promise<IModel[]>;
     clearModels(): string;

package/es/earth/models/base.js

@@ -12,10 +12,11 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
 import { earthTriangulation } from "../../core/triangulation";
-/* babel-plugin-inline-import '../shaders/base_frag.glsl' */
-var baseFrag = "\nuniform sampler2D u_texture;\n\nvarying vec2 v_texCoord;\nvarying float v_lightWeight;\n\n\nvoid main() {\n\n    vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n    color.xyz = color.xyz * v_lightWeight;\n    gl_FragColor = color;\n}\n";
-/* babel-plugin-inline-import '../shaders/base_vert.glsl' */
-var baseVert = "// attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n\n// attribute vec2 a_Extrude;\n// attribute float a_Size;\n// attribute float a_Shape;\n\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform float u_ambientRatio : 0.5;\nuniform float u_diffuseRatio : 0.3;\nuniform float u_specularRatio : 0.2;\nuniform vec3 u_sunLight: [1.0, -10.5, 12.0];\n\n\n\nfloat calc_lighting(vec4 pos) {\n\n    vec3 worldPos = vec3(pos * u_ModelMatrix);\n\n    vec3 worldNormal = a_Normal;\n\n    // cal light weight\n    vec3 viewDir = normalize(u_CameraPosition - worldPos);\n\n    vec3 lightDir = normalize(u_sunLight);\n\n    vec3 halfDir = normalize(viewDir+lightDir);\n    // lambert\n    float lambert = dot(worldNormal, lightDir);\n    // specular\n    float specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);\n    //sum to light weight\n    float lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;\n\n    return lightWeight;\n}\n\nvarying float v_lightWeight;\nvoid main() {\n\n    v_texCoord = a_Uv;\n\n    float lightWeight = calc_lighting(vec4(a_Position, 1.0));\n    v_lightWeight = lightWeight;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
+/* babel-plugin-inline-import '../shaders/base/base_frag.glsl' */
+var 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' */
+var 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";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(BaseEarthModel, _BaseModel);
   var _super = _createSuper(BaseEarthModel);
@@ -35,8 +36,8 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     return _this;
   }
   _createClass(BaseEarthModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _this$layer$getLayerC = this.layer.getLayerConfig(),
         animateOption = _this$layer$getLayerC.animateOption,
         globalOptions = _this$layer$getLayerC.globalOptions;
@@ -51,16 +52,19 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
         this.sunX = Math.cos(this.earthTime) * (this.sunRadius - this.sunY);
         this.sunZ = Math.sin(this.earthTime) * (this.sunRadius - this.sunY);
       }
-      return {
+      var commonOptions = {
+        u_sunLight: [this.sunX, this.sunY, this.sunZ, 0.0],
         u_ambientRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.ambientRatio) || 0.6,
         // 环境光
         u_diffuseRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.diffuseRatio) || 0.4,
         // 漫反射
-        u_specularRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.specularRatio) || 0.1,
-        // 高光反射
-        u_sunLight: [this.sunX, this.sunY, this.sunZ],
-        u_texture: this.texture
+        u_specularRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.specularRatio) || 0.1 // 高光反射
+        // u_texture: this.texture,
       };
+
+      this.textures = [this.texture];
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "setEarthTime",
@@ -96,10 +100,12 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
                   width: imageData[0].width,
                   height: imageData[0].height
                 });
+                _this2.textures = [_this2.texture];
                 _this2.layerService.reRender();
               });
+              this.initUniformsBuffer();
               return _context.abrupt("return", this.buildModels());
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -158,6 +164,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: ShaderLocation.SIZE,
           buffer: {
             usage: gl.DYNAMIC_DRAW,
             data: [],
@@ -176,6 +183,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
+          shaderLocation: ShaderLocation.NORMAL,
           buffer: {
             usage: gl.STATIC_DRAW,
             data: [],
@@ -192,6 +200,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
+          shaderLocation: ShaderLocation.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,7 +1,13 @@
-import { IModel, IModelUniform } from '@antv/l7-core';
+import type { IModel } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class EarthBloomSphereModel extends BaseModel {
-    getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
     initModels(): Promise<IModel[]>;
     clearModels(): string;
     buildModels(): Promise<IModel[]>;