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

package/es/wind/models/wind.js

@@ -7,7 +7,7 @@ import { RasterImageTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/wind_frag.glsl' */
 const WindFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nvarying vec2 v_texCoord;\nvoid main() {\n  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n  gl_FragColor = color;\n  gl_FragColor.a *= u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/wind_vert.glsl' */
-const WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n  v_texCoord = a_Uv;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));\n}\n";
+const WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 import { Wind } from "./windRender";
 const defaultRampColors = {
   0.0: '#3288bd',
@@ -32,12 +32,6 @@ export default class WindModel extends BaseModel {
     _defineProperty(this, "frequency", new FrequencyController(7.2));
     _defineProperty(this, "cacheZoom", void 0);
   }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      UV: 9
-    });
-  }
   render(options) {
     this.drawColorMode(options);
     // Tip: 控制风场的平均更新频率
@@ -114,7 +108,6 @@ export default class WindModel extends BaseModel {
         moduleName: 'wind',
         vertexShader: WindVert,
         fragmentShader: WindFrag,
-        defines: _this.getDefines(),
         triangulation: RasterImageTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -153,7 +146,6 @@ export default class WindModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: this.attributeLocation.UV,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.DYNAMIC_DRAW,

package/es/wind/shaders/wind_vert.glsl

@@ -1,14 +1,13 @@
 precision highp float;
 uniform mat4 u_ModelMatrix;
 
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
-
+attribute vec3 a_Position;
+attribute vec2 a_Uv;
 varying vec2 v_texCoord;
 #pragma include "projection"
 void main() {
-  v_texCoord = a_Uv;
-  vec4 project_pos = project_position(vec4(a_Position, 1.0));
+   v_texCoord = a_Uv;
+   vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
-  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
+    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
 }

package/lib/citybuliding/models/build.d.ts

@@ -1,22 +1,6 @@
 import type { IModel } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class CityBuildModel 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;
-        SIZE: number;
-        NORMAL: number;
-        UV: number;
-    };
     private cityCenter;
     private cityMinSize;
     protected getCommonUniformsInfo(): {

package/lib/citybuliding/models/build.js

@@ -10,25 +10,18 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 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/build_frag.glsl' */
-const buildFrag = "precision highp float;\nlayout(std140) uniform commonUniforms {\n  vec4 u_baseColor: [ 1.0, 0, 0, 1.0 ];\n  vec4 u_brightColor: [ 1.0, 0, 0, 1.0 ];\n  vec4 u_windowColor: [ 1.0, 0, 0, 1.0 ];\n  vec4 u_circleSweepColor;\n  vec2 u_cityCenter;\n  float u_circleSweep;\n  float u_cityMinSize;\n  float u_circleSweepSpeed;\n  float u_opacity: 1.0;\n  float u_near: 0;\n  float u_far: 1;\n  float u_time;\n};\nin vec4 v_Color;\nin vec2 v_texCoord;\nin float v_worldDis;\nout vec4 outputColor;\n\n#pragma include \"picking\"\n#pragma include \"scene_uniforms\"\n\nvec3 getWindowColor(float n, float hot, vec3 brightColor, vec3 darkColor) {\n    float s = step(hot, n);\n    vec3 color = mix(brightColor,vec3(0.9,0.9,1.0),n);\n\n    return mix(darkColor, color, s);\n}\nfloat random (vec2 st) {\n    return fract(sin(dot(st.xy, vec2(12.9898,78.233)))* 43758.5453123);\n}\n\nfloat LinearizeDepth()\n{\n    float z = gl_FragCoord.z * 2.0 - 1.0;\n    return (2.0 * u_near * u_far) / (u_far + u_near - z * (u_far - u_near));\n}\n\nvec3 fog(vec3 color, vec3 fogColor, float depth){\n    float fogFactor=clamp(depth,0.0,1.0);\n    vec3 output_color=mix(fogColor,color,fogFactor);\n    return output_color;\n}\n\nfloat sdRect(vec2 p, vec2 sz) {\n  vec2 d = abs(p) - sz;\n  float outside = length(max(d, 0.));\n  float inside = min(max(d.x, d.y), 0.);\n  return outside + inside;\n}\n\nvoid main() {\n  outputColor = v_Color;\n  vec3 baseColor = u_baseColor.xyz;\n  vec3 brightColor = u_brightColor.xyz;\n  vec3 windowColor = u_windowColor.xyz;\n  float targetColId = 5.;\n  float depth = 1.0 - LinearizeDepth() / u_far * u_Zoom;\n  vec3 fogColor = vec3(23.0/255.0,31.0/255.0,51.0/255.0);\n  if(v_texCoord.x < 0.) { //\u9876\u90E8\u989C\u8272\n       vec3 foggedColor = fog(baseColor.xyz + vec3(0.12*0.9,0.2*0.9,0.3*0.9),fogColor,depth);\n       outputColor = vec4( foggedColor, v_Color.w);\n  }else { // \u4FA7\u9762\u989C\u8272\n        vec2 st = v_texCoord;\n        vec2  UvScale = v_texCoord;\n        float tStep = min(0.08,max(0.05* (18.0-u_Zoom),0.02));\n        float tStart = 0.25 * tStep;\n        float tEnd = 0.75 * tStep;\n        float u = mod(UvScale.x, tStep);\n        float v = mod(UvScale.y, tStep);\n        float ux = floor(UvScale.x/tStep);\n        float uy = floor(UvScale.y/tStep);\n        float n = random(vec2(ux,uy));\n        float lightP = u_time;\n        float head = 1.0- step(0.005,st.y);\n        /*step3*/\n        // \u5C06\u7A97\u6237\u989C\u8272\u548C\u5899\u9762\u989C\u8272\u533A\u522B\u5F00\u6765\n        float sU = step(tStart, u) - step(tEnd, u);\n        float sV = step(tStart, v) - step(tEnd, v);\n        vec2 windowSize = vec2(abs(tEnd-tStart),abs(tEnd-tStart));\n        float dist = sdRect(vec2(u,v), windowSize);\n        float s = sU * sV;\n\n        float curColId = floor(UvScale.x / tStep);\n        float sCol = step(targetColId - 0.2, curColId) - step(targetColId + 0.2, curColId);\n\n        float mLightP = mod(lightP, 2.);\n        float sRow = step(mLightP - 0.2, st.y) - step(mLightP, st.y);\n        if(ux == targetColId){\n            n =0.;\n        }\n        float timeP = min(0.75, abs ( sin(u_time/3.0) ) );\n        float hot = smoothstep(1.0,0.0,timeP);\n        vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), s);\n        //vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), 1.0);\n        float sFinal = s * sCol * sRow;\n        color += mix(baseColor, brightColor, sFinal*n);\n        if (st.y<0.01){\n        color = baseColor;\n         }\n        if(head ==1.0) { // \u9876\u90E8\u4EAE\u7EBF\n            color = brightColor;\n        }\n        color = color * v_Color.rgb;\n\n        vec3 foggedColor = fog(color,fogColor,depth);\n\n        outputColor = vec4(foggedColor,1.0);\n  }\n\n\n  if(u_circleSweep > 0.0 && v_worldDis < u_cityMinSize) {\n    float r = fract(((v_worldDis/u_cityMinSize) - u_time * u_circleSweepSpeed) * 2.0);\n    outputColor.rgb += r * r * u_circleSweepColor.rgb;\n  }\n\n  outputColor.a *= u_opacity;\n  outputColor = filterColor(outputColor);\n}\n";
+const buildFrag = "precision highp float;\nlayout(std140) uniform commonUniforms {\n  vec4 u_baseColor : [ 1.0, 0, 0, 1.0 ];\n  vec4 u_brightColor : [ 1.0, 0, 0, 1.0 ];\n  vec4 u_windowColor : [ 1.0, 0, 0, 1.0 ];\n  vec4 u_circleSweepColor;\n  vec2 u_cityCenter;\n  float u_circleSweep;\n  float u_cityMinSize;\n  float u_circleSweepSpeed;\n  float u_opacity: 1.0;\n  float u_near : 0;\n  float u_far : 1;\n  float u_time;\n};\nin vec4 v_Color;\nin vec2 v_texCoord;\nin float v_worldDis;\nout vec4 outputColor;\n\n#pragma include \"picking\"\n#pragma include \"scene_uniforms\"\n\nvec3 getWindowColor(float n, float hot, vec3 brightColor, vec3 darkColor) {\n    float s = step(hot, n);\n    vec3 color = mix(brightColor,vec3(0.9,0.9,1.0),n);\n\n    return mix(darkColor, color, s);\n}\nfloat random (vec2 st) {\n    return fract(sin(dot(st.xy, vec2(12.9898,78.233)))* 43758.5453123);\n}\n\nfloat LinearizeDepth()\n{\n    float z = gl_FragCoord.z * 2.0 - 1.0;\n    return (2.0 * u_near * u_far) / (u_far + u_near - z * (u_far - u_near));\n}\n\nvec3 fog(vec3 color, vec3 fogColor, float depth){\n    float fogFactor=clamp(depth,0.0,1.0);\n    vec3 output_color=mix(fogColor,color,fogFactor);\n    return output_color;\n}\n\nfloat sdRect(vec2 p, vec2 sz) {\n  vec2 d = abs(p) - sz;\n  float outside = length(max(d, 0.));\n  float inside = min(max(d.x, d.y), 0.);\n  return outside + inside;\n}\n\nvoid main() {\n  outputColor = v_Color;\n  vec3 baseColor = u_baseColor.xyz;\n  vec3 brightColor = u_brightColor.xyz;\n  vec3 windowColor = u_windowColor.xyz;\n  float targetColId = 5.;\n  float depth = 1.0 - LinearizeDepth() / u_far * u_Zoom;\n  vec3 fogColor = vec3(23.0/255.0,31.0/255.0,51.0/255.0);\n  if(v_texCoord.x < 0.) { //\u9876\u90E8\u989C\u8272\n       vec3 foggedColor = fog(baseColor.xyz + vec3(0.12*0.9,0.2*0.9,0.3*0.9),fogColor,depth);\n       outputColor = vec4( foggedColor, v_Color.w);\n  }else { // \u4FA7\u9762\u989C\u8272\n        vec2 st = v_texCoord;\n        vec2  UvScale = v_texCoord;\n        float tStep = min(0.08,max(0.05* (18.0-u_Zoom),0.02));\n        float tStart = 0.25 * tStep;\n        float tEnd = 0.75 * tStep;\n        float u = mod(UvScale.x, tStep);\n        float v = mod(UvScale.y, tStep);\n        float ux = floor(UvScale.x/tStep);\n        float uy = floor(UvScale.y/tStep);\n        float n = random(vec2(ux,uy));\n        float lightP = u_time;\n        float head = 1.0- step(0.005,st.y);\n        /*step3*/\n        // \u5C06\u7A97\u6237\u989C\u8272\u548C\u5899\u9762\u989C\u8272\u533A\u522B\u5F00\u6765\n        float sU = step(tStart, u) - step(tEnd, u);\n        float sV = step(tStart, v) - step(tEnd, v);\n        vec2 windowSize = vec2(abs(tEnd-tStart),abs(tEnd-tStart));\n        float dist = sdRect(vec2(u,v), windowSize);\n        float s = sU * sV;\n\n        float curColId = floor(UvScale.x / tStep);\n        float sCol = step(targetColId - 0.2, curColId) - step(targetColId + 0.2, curColId);\n\n        float mLightP = mod(lightP, 2.);\n        float sRow = step(mLightP - 0.2, st.y) - step(mLightP, st.y);\n        if(ux == targetColId){\n            n =0.;\n        }\n        float timeP = min(0.75, abs ( sin(u_time/3.0) ) );\n        float hot = smoothstep(1.0,0.0,timeP);\n        vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), s);\n        //vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), 1.0);\n        float sFinal = s * sCol * sRow;\n        color += mix(baseColor, brightColor, sFinal*n);\n        if (st.y<0.01){\n        color = baseColor;\n         }\n        if(head ==1.0) { // \u9876\u90E8\u4EAE\u7EBF\n            color = brightColor;\n        }\n        color = color * v_Color.rgb;\n\n        vec3 foggedColor = fog(color,fogColor,depth);\n\n        outputColor = vec4(foggedColor,1.0);\n  }\n\n\n  if(u_circleSweep > 0.0 && v_worldDis < u_cityMinSize) {\n    float r = fract(((v_worldDis/u_cityMinSize) - u_time * u_circleSweepSpeed) * 2.0);\n    outputColor.rgb += r * r * u_circleSweepColor.rgb;\n  }\n   \n  outputColor.a *= u_opacity;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/build_vert.glsl' */
-const buildVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nout vec2 v_texCoord;\nout vec4 v_Color;\nout float v_worldDis;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_baseColor : [ 1.0, 0, 0, 1.0 ];\n  vec4 u_brightColor : [ 1.0, 0, 0, 1.0 ];\n  vec4 u_windowColor : [ 1.0, 0, 0, 1.0 ];\n  vec4 u_circleSweepColor;\n  vec2 u_cityCenter;\n  float u_circleSweep;\n  float u_cityMinSize;\n  float u_circleSweepSpeed;\n  float u_opacity: 1.0;\n  float u_near : 0;\n  float u_far : 1;\n  float u_time;\n};\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n   v_texCoord = a_Uv;\n\n  if(u_circleSweep > 0.0) {\n     vec2 lnglatscale = vec2(0.0);\n    lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);\n    v_worldDis = length(a_Position.xy + lnglatscale - u_cityCenter);\n  }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  float lightWeight = calc_lighting(pos);\n  // v_Color = a_Color;\n  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  setPickingColor(a_PickingColor);\n}\n";
+const buildVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\nlayout(location = 13) in vec3 a_Normal;\nlayout(location = 14) in vec2 a_Uv;\n\nout vec2 v_texCoord;\nout vec4 v_Color;\nout float v_worldDis;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_baseColor : [ 1.0, 0, 0, 1.0 ];\n  vec4 u_brightColor : [ 1.0, 0, 0, 1.0 ];\n  vec4 u_windowColor : [ 1.0, 0, 0, 1.0 ];\n  vec4 u_circleSweepColor;\n  vec2 u_cityCenter;\n  float u_circleSweep;\n  float u_cityMinSize;\n  float u_circleSweepSpeed;\n  float u_opacity: 1.0;\n  float u_near : 0;\n  float u_far : 1;\n  float u_time;\n};\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n   v_texCoord = a_Uv;\n\n  if(u_circleSweep > 0.0) {\n     vec2 lnglatscale = vec2(0.0);\n    if(u_CoordinateSystem != COORDINATE_SYSTEM_P20_2) {\n      lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);\n    }\n    v_worldDis = length(a_Position.xy + lnglatscale - u_cityCenter);\n  }\n \n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  float lightWeight = calc_lighting(pos);\n  // v_Color = a_Color;\n  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  setPickingColor(a_PickingColor);\n}\n";
 class CityBuildModel extends _BaseModel.default {
   constructor(...args) {
     super(...args);
     (0, _defineProperty2.default)(this, "cityCenter", void 0);
     (0, _defineProperty2.default)(this, "cityMinSize", void 0);
   }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9,
-      NORMAL: 10,
-      UV: 11
-    });
-  }
   getCommonUniformsInfo() {
     const {
       opacity = 1,
@@ -64,10 +57,20 @@ class CityBuildModel extends _BaseModel.default {
   calCityGeo() {
     // @ts-ignore
     const [minLng, minLat, maxLng, maxLat] = this.layer.getSource().extent;
-    const w = maxLng - minLng;
-    const h = maxLat - minLat;
-    this.cityCenter = [(maxLng + minLng) / 2, (maxLat + minLat) / 2];
-    this.cityMinSize = Math.sqrt(Math.pow(w, 2) + Math.pow(h, 2)) / 4;
+    if (this.mapService.version === 'GAODE2.x') {
+      // @ts-ignore
+      this.cityCenter = this.mapService.lngLatToCoord([(maxLng + minLng) / 2, (maxLat + minLat) / 2]);
+      // @ts-ignore
+      const l1 = this.mapService.lngLatToCoord([maxLng, maxLat]);
+      // @ts-ignore
+      const l2 = this.mapService.lngLatToCoord([minLng, minLat]);
+      this.cityMinSize = Math.sqrt(Math.pow(l1[0] - l2[0], 2) + Math.pow(l1[1] - l2[1], 2)) / 4;
+    } else {
+      const w = maxLng - minLng;
+      const h = maxLat - minLat;
+      this.cityCenter = [(maxLng + minLng) / 2, (maxLat + minLat) / 2];
+      this.cityMinSize = Math.sqrt(Math.pow(w, 2) + Math.pow(h, 2)) / 4;
+    }
   }
   initModels() {
     var _this = this;
@@ -89,7 +92,6 @@ class CityBuildModel extends _BaseModel.default {
         depth: {
           enable: true
         },
-        defines: _this2.getDefines(),
         inject: _this2.getInject(),
         cull: {
           enable: true,
@@ -106,7 +108,7 @@ class CityBuildModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: this.attributeLocation.NORMAL,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: _l7Core.gl.STATIC_DRAW,
@@ -124,7 +126,7 @@ class CityBuildModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Size',
-        shaderLocation: this.attributeLocation.SIZE,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -145,7 +147,7 @@ class CityBuildModel 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/citybuliding/shaders/build_frag.glsl

@@ -1,16 +1,16 @@
 precision highp float;
 layout(std140) uniform commonUniforms {
-  vec4 u_baseColor: [ 1.0, 0, 0, 1.0 ];
-  vec4 u_brightColor: [ 1.0, 0, 0, 1.0 ];
-  vec4 u_windowColor: [ 1.0, 0, 0, 1.0 ];
+  vec4 u_baseColor : [ 1.0, 0, 0, 1.0 ];
+  vec4 u_brightColor : [ 1.0, 0, 0, 1.0 ];
+  vec4 u_windowColor : [ 1.0, 0, 0, 1.0 ];
   vec4 u_circleSweepColor;
   vec2 u_cityCenter;
   float u_circleSweep;
   float u_cityMinSize;
   float u_circleSweepSpeed;
   float u_opacity: 1.0;
-  float u_near: 0;
-  float u_far: 1;
+  float u_near : 0;
+  float u_far : 1;
   float u_time;
 };
 in vec4 v_Color;
@@ -114,7 +114,7 @@ void main() {
     float r = fract(((v_worldDis/u_cityMinSize) - u_time * u_circleSweepSpeed) * 2.0);
     outputColor.rgb += r * r * u_circleSweepColor.rgb;
   }
-
+   
   outputColor.a *= u_opacity;
   outputColor = filterColor(outputColor);
 }

package/lib/citybuliding/shaders/build_vert.glsl

@@ -4,11 +4,11 @@ precision highp float;
 #define diffuseRatio 0.3
 #define specularRatio 0.2
 
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
-layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
-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) in vec4 a_Color;
+layout(location = 9) in float a_Size;
+layout(location = 13) in vec3 a_Normal;
+layout(location = 14) in vec2 a_Uv;
 
 out vec2 v_texCoord;
 out vec4 v_Color;
@@ -41,11 +41,17 @@ void main() {
 
   if(u_circleSweep > 0.0) {
      vec2 lnglatscale = vec2(0.0);
-    lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);
+    if(u_CoordinateSystem != COORDINATE_SYSTEM_P20_2) {
+      lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);
+    }
     v_worldDis = length(a_Position.xy + lnglatscale - u_cityCenter);
   }
-
-  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
+ 
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
+  } else {
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
+  }
 
   float lightWeight = calc_lighting(pos);
   // v_Color = a_Color;

package/lib/core/BaseLayer.js

@@ -19,7 +19,7 @@ var _multiPassRender = require("../utils/multiPassRender");
 var _LayerPickService = _interopRequireDefault(require("./LayerPickService"));
 var _TextureService = _interopRequireDefault(require("./TextureService"));
 const _excluded = ["passes"],
-  _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "defines", "inject", "triangulation", "styleOption", "pickingEnabled"]; // @ts-ignore
+  _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "inject", "triangulation", "styleOption", "pickingEnabled"]; // @ts-ignore
 const {
   isEqual,
   isFunction,
@@ -64,8 +64,7 @@ class BaseLayer extends _eventemitter.EventEmitter {
     return this.container.interactionService;
   }
   get mapService() {
-    var _this$container;
-    return (_this$container = this.container) === null || _this$container === void 0 ? void 0 : _this$container.mapService;
+    return this.container.mapService;
   }
   get normalPassFactory() {
     return this.container.normalPassFactory;
@@ -612,9 +611,6 @@ class BaseLayer extends _eventemitter.EventEmitter {
       if (_this2.multiPassRenderer && _this2.multiPassRenderer.getRenderFlag()) {
         // multi render 开始执行 multiPassRender 的渲染流程
         yield _this2.multiPassRenderer.render();
-      } else if (_this2.multiPassRenderer) {
-        // renderPass 触发的渲染
-        _this2.renderModels();
       } else {
         _this2.renderModels();
       }
@@ -928,8 +924,12 @@ class BaseLayer extends _eventemitter.EventEmitter {
       type
     }) => {
       if (this.coordCenter === undefined) {
+        var _this$mapService;
         const layerCenter = this.layerSource.center;
         this.coordCenter = layerCenter;
+        if ((_this$mapService = this.mapService) !== null && _this$mapService !== void 0 && _this$mapService.setCoordCenter) {
+          this.mapService.setCoordCenter(layerCenter);
+        }
       }
       if (type === 'update') {
         if (this.tileLayer) {
@@ -1023,7 +1023,6 @@ class BaseLayer extends _eventemitter.EventEmitter {
           moduleName,
           vertexShader,
           fragmentShader,
-          defines,
           inject,
           triangulation,
           styleOption,
@@ -1033,7 +1032,6 @@ class BaseLayer extends _eventemitter.EventEmitter {
       _this3.shaderModuleService.registerModule(moduleName, {
         vs: vertexShader,
         fs: fragmentShader,
-        defines,
         inject
       });
       const {
@@ -1050,9 +1048,7 @@ class BaseLayer extends _eventemitter.EventEmitter {
           elements,
           count
         } = _this3.styleAttributeService.createAttributesAndIndices(_this3.encodedData, triangulation, styleOption, _this3);
-        const uniformBuffers = [..._this3.layerModel.uniformBuffers, ..._this3.rendererService.uniformBuffers,
-        // TODO: 目前未使用
-        _this3.getLayerUniformBuffer()];
+        const uniformBuffers = [..._this3.layerModel.uniformBuffers, ..._this3.rendererService.uniformBuffers, _this3.getLayerUniformBuffer()];
         if (pickingEnabled) {
           uniformBuffers.push(_this3.getPickingUniformBuffer());
         }
@@ -1237,8 +1233,8 @@ class BaseLayer extends _eventemitter.EventEmitter {
       _this5.uniformBuffers = [];
       // Layer Uniform
       const layerUniforms = _this5.rendererService.createBuffer({
-        // TODO: 不再需要，之前用于 amap2 u_Mvp
         data: new Float32Array(16 + 4).fill(0),
+        // u_Mvp
         isUBO: true
       });
       _this5.uniformBuffers.push(layerUniforms);

package/lib/core/BaseModel.d.ts

@@ -1,5 +1,4 @@
-import type { IAnimateOption, IAttribute, IBlendOptions, IBuffer, ICameraService, IElements, IFontService, IGlobalConfigService, IIconService, ILayer, ILayerModel, ILayerService, IMapService, IModel, IModelUniform, IPickingService, IRenderOptions, IRendererService, IShaderModuleService, IStencilOptions, IStyleAttributeService, ITexture2D, ITexture2DInitializationOptions, ShaderDefine, ShaderInject, Triangulation } from '@antv/l7-core';
-import { COMMON_ATTRIBUTE_LOCATION } from './CommonStyleAttribute';
+import type { IAnimateOption, IAttribute, IBlendOptions, IBuffer, ICameraService, IElements, IFontService, IGlobalConfigService, IIconService, IInject, ILayer, ILayerModel, ILayerService, IMapService, IModel, IModelUniform, IPickingService, IRendererService, IRenderOptions, IShaderModuleService, IStencilOptions, IStyleAttributeService, ITexture2D, ITexture2DInitializationOptions, Triangulation } from '@antv/l7-core';
 export type styleSingle = number | string | [string, (single: any) => number] | [string, [number, number]];
 export type styleOffset = string | [number, number] | [string, (single: any) => number];
 export type styleColor = string | [string, (single: any) => string] | [string, [string, string]];
@@ -12,15 +11,10 @@ export interface ICellProperty {
     attr: string;
     count: number;
 }
-type AttributeLayoutLocationType = typeof COMMON_ATTRIBUTE_LOCATION & Record<string, number>;
 export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerModel {
     triangulation: Triangulation;
     uniformBuffers: IBuffer[];
     textures: ITexture2D[];
-    /**
-     * Attribute Layout Location in Shader
-     */
-    protected get attributeLocation(): AttributeLayoutLocationType;
     createTexture2D: (options: ITexture2DInitializationOptions) => ITexture2D;
     preStyleAttribute: Record<string, any>;
     protected encodeStyleAttribute: Record<string, boolean>;
@@ -61,17 +55,11 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     protected registerBuiltinAttributes(): void;
     protected animateOption2Array(option: IAnimateOption): number[];
     protected startModelAnimate(): void;
-    protected getInject(): ShaderInject;
-    protected getDefines(): Record<string, ShaderDefine>;
+    protected getInject(): IInject;
     protected getStyleAttribute(): {
         [key: string]: any;
     };
     protected registerStyleAttribute(): void;
-    /**
-     * 注册 Position 属性 64 位地位部分，当经纬度数据开启双精度浮点数使用，
-     * 避免大于 20层级以上出现数据偏移
-     */
-    protected registerPosition64LowAttribute(enable64bitPosition?: boolean): void;
     updateEncodeAttribute(type: string, flag: boolean): void;
     initUniformsBuffer(): void;
     protected getUniformsBufferInfo(uniformsOption: {
@@ -92,4 +80,3 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     };
     updateStyleUnifoms(): void;
 }
-export {};

package/lib/core/BaseModel.js

@@ -15,20 +15,17 @@ var _stencil = require("../utils/stencil");
 var _CommonStyleAttribute = require("./CommonStyleAttribute");
 var _constant = require("./constant");
 var _utils = require("./utils");
-// 属性索引宏定义前缀，使用命名空间避免 define 名称重复情况
-const DEFINE_ATTRIBUTE_LOCATION_PREFIX = 'ATTRIBUTE_LOCATION_';
+const shaderLocationMap = {
+  opacity: _CommonStyleAttribute.ShaderLocation.OPACITY,
+  stroke: _CommonStyleAttribute.ShaderLocation.STROKE,
+  offsets: _CommonStyleAttribute.ShaderLocation.OFFSETS,
+  rotation: _CommonStyleAttribute.ShaderLocation.ROTATION,
+  extrusionBase: _CommonStyleAttribute.ShaderLocation.EXTRUSION_BASE,
+  thetaOffset: 15
+};
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 class BaseModel {
-  /**
-   * Attribute Layout Location in Shader
-   */
-  get attributeLocation() {
-    return (0, _objectSpread2.default)({}, _CommonStyleAttribute.COMMON_ATTRIBUTE_LOCATION);
-  }
-
-  // style texture data mapping
-
   // 不支持数据映射的buffer
 
   // style texture data mapping
@@ -37,6 +34,7 @@ class BaseModel {
     (0, _defineProperty2.default)(this, "triangulation", void 0);
     (0, _defineProperty2.default)(this, "uniformBuffers", []);
     (0, _defineProperty2.default)(this, "textures", []);
+    // style texture data mapping
     (0, _defineProperty2.default)(this, "createTexture2D", void 0);
     (0, _defineProperty2.default)(this, "preStyleAttribute", {});
     (0, _defineProperty2.default)(this, "encodeStyleAttribute", {});
@@ -187,18 +185,55 @@ class BaseModel {
       this.layer.setAnimateStartTime();
     }
   }
+
+  // 动态注入参与数据映射的uniform
   getInject() {
-    const shaderInject = getDynamicStyleInject(this.layer.enableShaderEncodeStyles, this.layer.encodeStyleAttribute);
-    return shaderInject;
-  }
-  getDefines() {
-    // define atribute Layout Location
-    const atributeLocationDefines = Object.keys(this.attributeLocation).reduce((result, key) => {
-      const normalizedKey = DEFINE_ATTRIBUTE_LOCATION_PREFIX + key;
-      result[normalizedKey] = this.attributeLocation[key];
-      return result;
-    }, {});
-    return (0, _objectSpread2.default)({}, atributeLocationDefines);
+    const encodeStyleAttribute = this.layer.encodeStyleAttribute;
+    let str = '';
+    // a_Position = 0
+    // a_Color = 1
+    // a_PickingColor = 2
+
+    const uniforms = [];
+    // 支持数据映射的类型
+    this.layer.enableShaderEncodeStyles.forEach(key => {
+      if (encodeStyleAttribute[key]) {
+        // 配置了数据映射的类型
+        str += `#define USE_ATTRIBUTE_${key.toUpperCase()} 0.0; \n\n`;
+      } else {
+        uniforms.push(`  ${_constant.DefaultUniformStyleType[key]} u_${key};`);
+      }
+      let location = shaderLocationMap[key];
+      if (!location && key === 'THETA_OFFSET') {
+        location = 15;
+      }
+      str += `
+          #ifdef USE_ATTRIBUTE_${key.toUpperCase()}
+          layout(location = ${shaderLocationMap[key]}) in ${_constant.DefaultUniformStyleType[key]} a_${key.charAt(0).toUpperCase() + key.slice(1)};
+        #endif\n
+        `;
+    });
+    const attributeUniforms = uniforms.length ? `
+layout(std140) uniform AttributeUniforms {
+${uniforms.join('\n')}
+};
+    ` : '';
+    str += attributeUniforms;
+    let innerStr = '';
+    this.layer.enableShaderEncodeStyles.forEach(key => {
+      innerStr += `\n
+    #ifdef USE_ATTRIBUTE_${key.toUpperCase()}
+      ${_constant.DefaultUniformStyleType[key]} ${key}  = a_${key.charAt(0).toUpperCase() + key.slice(1)};
+    #else
+      ${_constant.DefaultUniformStyleType[key]} ${key} = u_${key};
+    #endif\n
+    `;
+    });
+    return {
+      'vs:#decl': str,
+      'fs:#decl': attributeUniforms,
+      'vs:#main-start': innerStr
+    };
   }
 
   // 获取数据映射样式
@@ -219,36 +254,14 @@ class BaseModel {
     });
     return options;
   }
-
   // 注册数据映射样式
   registerStyleAttribute() {
     Object.keys(this.layer.encodeStyleAttribute).forEach(key => {
       const options = (0, _CommonStyleAttribute.getCommonStyleAttributeOptions)(key);
       if (options) {
         this.styleAttributeService.registerStyleAttribute(options);
-      }
-    });
-  }
-
-  /**
-   * 注册 Position 属性 64 位地位部分，当经纬度数据开启双精度浮点数使用，
-   * 避免大于 20层级以上出现数据偏移
-   */
-  registerPosition64LowAttribute(enable64bitPosition = true) {
-    // save low part for enabled double precision POSITION attribute
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'position64Low',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Position64Low',
-        shaderLocation: this.attributeLocation.POSITION_64LOW,
-        buffer: {
-          data: [],
-          type: _l7Core.gl.FLOAT
-        },
-        size: 2,
-        update: (feature, featureIdx, vertex) => {
-          return enable64bitPosition ? [(0, _l7Utils.fp64LowPart)(vertex[0]), (0, _l7Utils.fp64LowPart)(vertex[1])] : [0, 0];
+        if (options.descriptor) {
+          options.descriptor.shaderLocation = shaderLocationMap[key];
         }
       }
     });
@@ -325,49 +338,4 @@ class BaseModel {
     });
   }
 }
-
-/**
- * 获取动态注入参与数据映射 uniform/attribute
- */
-exports.default = BaseModel;
-function getDynamicStyleInject(shaderEncodeStyles, styleAttribute) {
-  const uniforms = [];
-  let vsDeclInjection = '';
-
-  // 支持数据映射的类型
-  shaderEncodeStyles.forEach(key => {
-    const upperCaseKey = key.replace(/([a-z])([A-Z])/g, '$1_$2').toUpperCase();
-    const shaderDefineName = DEFINE_ATTRIBUTE_LOCATION_PREFIX + upperCaseKey;
-    if (styleAttribute[key]) {
-      // 配置了数据映射的类型
-      vsDeclInjection += `#define USE_ATTRIBUTE_${upperCaseKey} 0.0 \n`;
-    } else {
-      uniforms.push(`  ${_constant.DefaultUniformStyleType[key]} u_${key};`);
-    }
-    vsDeclInjection += `
-#ifdef USE_ATTRIBUTE_${upperCaseKey}
-layout(location = ${shaderDefineName}) in ${_constant.DefaultUniformStyleType[key]} a_${key.charAt(0).toUpperCase() + key.slice(1)};
-#endif \n`;
-  });
-  const fsDeclInjection = uniforms.length ? `
-layout(std140) uniform AttributeUniforms {
-  ${uniforms.join('\n')}
-};\n` : '';
-  vsDeclInjection += fsDeclInjection;
-  let vsMainInjection = '';
-  shaderEncodeStyles.forEach(key => {
-    const upperCaseKey = key.replace(/([a-z])([A-Z])/g, '$1_$2').toUpperCase();
-    vsMainInjection += `
-  #ifdef USE_ATTRIBUTE_${upperCaseKey}
-    ${_constant.DefaultUniformStyleType[key]} ${key} = a_${key.charAt(0).toUpperCase() + key.slice(1)};
-  #else
-    ${_constant.DefaultUniformStyleType[key]} ${key} = u_${key};
-  #endif
-  `;
-  });
-  return {
-    'vs:#decl': vsDeclInjection,
-    'fs:#decl': fsDeclInjection,
-    'vs:#main-start': vsMainInjection
-  };
-}
+exports.default = BaseModel;

package/lib/core/CommonStyleAttribute.d.ts

@@ -1,16 +1,20 @@
 import type { IStyleAttribute } from '@antv/l7-core';
-/**
- * Attribute Layout Location in Shader
- */
-export declare const COMMON_ATTRIBUTE_LOCATION: {
-    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;
-};
+export declare enum ShaderLocation {
+    POSITION = 0,
+    COLOR = 1,
+    VERTEX_ID = 2,
+    PICKING_COLOR = 3,
+    STROKE = 4,
+    OPACITY = 5,
+    OFFSETS = 6,
+    ROTATION = 7,
+    EXTRUSION_BASE = 8,
+    SIZE = 9,
+    SHAPE = 10,
+    EXTRUDE = 11,
+    MAX = 12,
+    NORMAL = 13,
+    UV = 14,
+    LINEAR = 15
+}
 export declare function getCommonStyleAttributeOptions(name: string): Partial<IStyleAttribute> | undefined;