@antv/l7-layers 2.20.5 → 2.20.6

package/lib/core/triangulation.js

@@ -191,7 +191,8 @@ function FlowLineFillTriangulation(feature) {
   };
 }
 function SimpleLineTriangulation(feature) {
-  var coordinates = feature.coordinates;
+  var coordinates = feature.coordinates,
+    originCoordinates = feature.originCoordinates;
   var pos = [];
   if (!Array.isArray(coordinates[0])) {
     return {
@@ -202,7 +203,7 @@ function SimpleLineTriangulation(feature) {
       count: 0
     };
   }
-  var _getSimpleLineVertice = getSimpleLineVertices(coordinates),
+  var _getSimpleLineVertice = getSimpleLineVertices(coordinates, originCoordinates),
     results = _getSimpleLineVertice.results,
     totalDistance = _getSimpleLineVertice.totalDistance;
   results.map(function (point) {
@@ -253,12 +254,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 {
@@ -270,13 +276,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((0, _l7Utils.aProjectFlat)(originPoints[i - 1]), (0, _l7Utils.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((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/core/utils.js

@@ -18,5 +18,5 @@ function formatUniformsOption2Std140(uniformsOption) {
   return std140_str;
 }
 function MultipleOfFourNumber(num) {
-  return Math.ceil(num / 4) * 4;
+  return Math.max(Math.ceil(num / 4) * 4, 4);
 }

package/lib/earth/models/atmosphere.js

@@ -16,12 +16,13 @@ var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
-/* 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";
 var isNumber = _l7Utils.lodashUtil.isNumber;
 var EarthAtomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(EarthAtomSphereModel, _BaseModel);
@@ -31,14 +32,16 @@ var EarthAtomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
     return _super.apply(this, arguments);
   }
   (0, _createClass2.default)(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",
@@ -47,8 +50,9 @@ var EarthAtomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
         return _regenerator.default.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();
           }
@@ -108,6 +112,7 @@ var EarthAtomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
@@ -126,6 +131,7 @@ var EarthAtomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
           buffer: {
             usage: _l7Core.gl.STATIC_DRAW,
             data: [],
@@ -142,6 +148,7 @@ var EarthAtomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],

package/lib/earth/models/base.js

@@ -17,12 +17,13 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _l7Core = require("@antv/l7-core");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
-/* 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";
 var BaseEarthModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(BaseEarthModel, _BaseModel);
   var _super = _createSuper(BaseEarthModel);
@@ -42,8 +43,8 @@ var BaseEarthModel = exports.default = /*#__PURE__*/function (_BaseModel) {
     return _this;
   }
   (0, _createClass2.default)(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;
@@ -58,16 +59,19 @@ var BaseEarthModel = exports.default = /*#__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",
@@ -103,10 +107,12 @@ var BaseEarthModel = exports.default = /*#__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();
           }
@@ -165,6 +171,7 @@ var BaseEarthModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
@@ -183,6 +190,7 @@ var BaseEarthModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
           buffer: {
             usage: _l7Core.gl.STATIC_DRAW,
             data: [],
@@ -199,6 +207,7 @@ var BaseEarthModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_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.js

@@ -16,12 +16,13 @@ var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
-/* babel-plugin-inline-import '../shaders/bloomsphere_frag.glsl' */
-var bloomSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\nvarying vec3 vVertexNormal;\n\nvarying vec4 v_Color;\nvoid main() {\n\n\n    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));\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/bloomsphere_vert.glsl' */
-var bloomSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying 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";
+/* babel-plugin-inline-import '../shaders/bloomshpere/bloomsphere_frag.glsl' */
+var 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' */
+var 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";
 var isNumber = _l7Utils.lodashUtil.isNumber;
 var EarthBloomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(EarthBloomSphereModel, _BaseModel);
@@ -31,14 +32,16 @@ var EarthBloomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
     return _super.apply(this, arguments);
   }
   (0, _createClass2.default)(EarthBloomSphereModel, [{
-    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",
@@ -47,8 +50,9 @@ var EarthBloomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
         return _regenerator.default.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();
           }
@@ -107,6 +111,7 @@ var EarthBloomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
@@ -125,6 +130,7 @@ var EarthBloomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
           buffer: {
             usage: _l7Core.gl.STATIC_DRAW,
             data: [],
@@ -141,6 +147,7 @@ var EarthBloomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel)
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],

package/lib/earth/shaders/{atmosphere_frag.glsl → atmosphere/atmosphere_frag.glsl}

@@ -1,10 +1,13 @@
 
-uniform float u_opacity;
-uniform vec3 u_CameraPosition;
+layout(std140) uniform commonUniforms {
+ float u_opacity;
+};
+in vec3 vVertexNormal;
+in float v_offset;
+in vec4 v_Color;
 
-varying vec3 vVertexNormal;
-varying float v_offset;
-varying vec4 v_Color;
+#pragma include "scene_uniforms"
+out vec4 outputColor;
 void main() {
     
     
@@ -13,5 +16,5 @@ void main() {
     // 去除背面
     if(intensity > 1.0) intensity = 0.0;
 
-    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
+    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
 }

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

@@ -0,0 +1,22 @@
+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;
+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);
+    vVertexNormal = a_Normal;
+
+    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);
+}

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

@@ -0,0 +1,11 @@
+uniform sampler2D u_texture;
+
+in vec2 v_texCoord;
+in float v_lightWeight;
+out vec4 outputColor;
+
+void main() {
+    vec4 color = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y));
+    color.xyz = color.xyz * v_lightWeight;
+    outputColor = color;
+}

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

@@ -0,0 +1,52 @@
+// attribute vec4 a_Color;
+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;
+// attribute float a_Shape;
+
+layout(std140) uniform commonUniforms {
+	vec4 u_sunLight: [1.0, -10.5, 12.0,0.0];
+	float u_ambientRatio : 0.5;
+	float u_diffuseRatio : 0.3;
+	float u_specularRatio : 0.2;
+};
+
+#pragma include "scene_uniforms"
+
+out vec2 v_texCoord;
+out float v_lightWeight;
+
+float calc_lighting(vec4 pos) {
+
+	vec3 worldPos = vec3(pos * u_ModelMatrix);
+
+	vec3 worldNormal = a_Normal;
+
+	// cal light weight
+	vec3 viewDir = normalize(u_CameraPosition - worldPos);
+
+	vec3 lightDir = normalize(u_sunLight.xyz);
+
+	vec3 halfDir = normalize(viewDir+lightDir);
+	// lambert
+	float lambert = dot(worldNormal, lightDir);
+	// specular
+	float specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);
+	//sum to light weight
+	float lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;
+
+	return lightWeight;
+}
+
+void main() {
+
+	v_texCoord = a_Uv;
+
+	float lightWeight = calc_lighting(vec4(a_Position, 1.0));
+	v_lightWeight = lightWeight;
+
+	gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);
+}

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

@@ -0,0 +1,16 @@
+
+in vec3 vVertexNormal;
+in vec4 v_Color;
+
+layout(std140) uniform commonUniforms {
+ float u_opacity;
+};
+out vec4 outputColor;
+#pragma include "scene_uniforms"
+void main() {
+    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));
+    // 去除背面
+    if(intensity > 1.0) intensity = 0.0;
+
+    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
+}

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

@@ -0,0 +1,19 @@
+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;
+
+void main() {
+    v_Color = a_Color;
+
+    vVertexNormal = a_Normal;
+
+    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);
+}

package/lib/geometry/models/billboard.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -17,12 +18,13 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 /* babel-plugin-inline-import '../shaders/billboard_frag.glsl' */
-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 planeFrag = "layout(std140) uniform commonUniforms {\n vec2 u_size;\n float u_raisingHeight;\n float u_rotation;\n float u_opacity;\n};\n\nuniform sampler2D u_texture;\n\nin vec2 v_uv;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));\n  outputColor.a *= u_opacity;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/billboard_vert.glsl' */
-var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform float u_raisingHeight: 0.0;\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   gl_Position = project_common_position_to_clipspace_v2(vec4(x , y, z , 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
+var planeVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 11) in vec3 a_Extrude;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n vec2 u_size;\n float u_raisingHeight;\n float u_rotation;\n float u_opacity;\n};\n\nout vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\nvoid main() {\n   vec3 extrude = a_Extrude;\n   v_uv = a_Uv;\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(rotate_matrix(vec2(extrude.x * u_size.x, 0.0),u_rotation));\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   gl_Position = project_common_position_to_clipspace_v2(vec4(x , y, z , 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
 var BillBoardModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(BillBoardModel, _BaseModel);
   var _super = _createSuper(BillBoardModel);
@@ -50,6 +52,14 @@ var BillBoardModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _createClass2.default)(BillBoardModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref2 = this.layer.getLayerConfig(),
         opacity = _ref2.opacity,
         _ref2$width = _ref2.width,
@@ -72,15 +82,16 @@ var BillBoardModel = exports.default = /*#__PURE__*/function (_BaseModel) {
       }
       // 控制图标的旋转角度（绕 Z 轴旋转）
       this.radian = rotateFlag * Math.PI * (this.mapService.getRotation() % 360) / 180;
-      return {
+      var commonOptions = {
+        u_size: [width, height],
         u_raisingHeight: Number(raisingHeight),
-        u_RotateMatrix: new Float32Array([
-        // z
-        Math.cos(this.radian), Math.sin(this.radian), -Math.sin(this.radian), Math.cos(this.radian)]),
+        u_rotation: this.radian,
         u_opacity: opacity || 1,
-        u_texture: this.texture,
-        u_size: [width, height]
+        u_texture: this.texture
       };
+      this.textures = [this.texture];
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "clearModels",
@@ -105,21 +116,23 @@ var BillBoardModel = exports.default = /*#__PURE__*/function (_BaseModel) {
               if (drawCanvas) {
                 this.updateTexture(drawCanvas);
               }
-              _context.next = 6;
+              this.initUniformsBuffer();
+              _context.next = 7;
               return this.layer.buildLayerModel({
                 moduleName: 'geometryBillboard',
                 vertexShader: planeVert,
                 fragmentShader: planeFrag,
                 triangulation: this.planeGeometryTriangulation,
+                inject: this.getInject(),
                 primitive: _l7Core.gl.TRIANGLES,
                 depth: {
                   enable: true
                 }
               });
-            case 6:
+            case 7:
               model = _context.sent;
               return _context.abrupt("return", [model]);
-            case 8:
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -182,6 +195,7 @@ var BillBoardModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Extrude',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.EXTRUDE,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
@@ -200,6 +214,7 @@ var BillBoardModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],