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

package/es/utils/extrude_polyline.js

@@ -91,98 +91,6 @@ export default class ExtrudePolyline {
     complex.startIndex = complex.positions.length / 6;
     return complex;
   }
-  simpleExtrude_gaode2(points, originPoints) {
-    const complex = this.complex;
-    if (points.length <= 1) {
-      return complex;
-    }
-    this.lastFlip = -1;
-    this.started = false;
-    this.normal = null;
-    this.totalDistance = 0;
-    // 去除数组里重复的点
-    // points = getArrayUnique(points);
-    const total = points.length;
-    let count = complex.startIndex;
-    for (let i = 1; i < total; i++) {
-      var _originPoints$, _originPoints$i$, _originPoints$2;
-      const last = points[i - 1];
-      last.push((_originPoints$ = originPoints[i - 1][2]) !== null && _originPoints$ !== void 0 ? _originPoints$ : 0);
-      // @ts-ignore
-      const originLast = originPoints[i - 1];
-      const cur = points[i];
-      cur.push((_originPoints$i$ = originPoints[i][2]) !== null && _originPoints$i$ !== void 0 ? _originPoints$i$ : 0);
-      // @ts-ignore
-      const originCur = originPoints[i];
-      const next = i < points.length - 1 ? [...points[i + 1], (_originPoints$2 = originPoints[i + 1][2]) !== null && _originPoints$2 !== void 0 ? _originPoints$2 : 0] : null;
-      const originNext = i < originPoints.length - 1 ? originPoints[i + 1] : null;
-      const amt = this.simpleSegment(complex, count,
-      // @ts-ignore
-      last,
-      // @ts-ignore
-      cur,
-      // @ts-ignore
-      next,
-      // @ts-ignore
-      originLast, originCur,
-      // @ts-ignore
-      originNext);
-      count += amt;
-    }
-    if (this.dash) {
-      for (let i = 0; i < complex.positions.length / 6; i++) {
-        complex.positions[i * 6 + 5] = this.totalDistance;
-      }
-    }
-    complex.startIndex = complex.positions.length / 6;
-    return complex;
-  }
-  extrude_gaode2(points, originPoints) {
-    const complex = this.complex;
-    if (points.length <= 1) {
-      return complex;
-    }
-    this.lastFlip = -1;
-    this.started = false;
-    this.normal = null;
-    this.totalDistance = 0;
-    // 去除数组里重复的点
-    // points = getArrayUnique(points);
-    const total = points.length;
-    let count = complex.startIndex;
-    for (let i = 1; i < total; i++) {
-      var _originPoints$3, _originPoints$i$2, _originPoints$4;
-      const last = points[i - 1];
-      last.push((_originPoints$3 = originPoints[i - 1][2]) !== null && _originPoints$3 !== void 0 ? _originPoints$3 : 0);
-      // @ts-ignore
-      const originLast = originPoints[i - 1];
-      const cur = points[i];
-      cur.push((_originPoints$i$2 = originPoints[i][2]) !== null && _originPoints$i$2 !== void 0 ? _originPoints$i$2 : 0);
-      // @ts-ignore
-      const originCur = originPoints[i];
-      const next = i < points.length - 1 ? [...points[i + 1], (_originPoints$4 = originPoints[i + 1][2]) !== null && _originPoints$4 !== void 0 ? _originPoints$4 : 0] : null;
-      const originNext = i < originPoints.length - 1 ? originPoints[i + 1] : null;
-      const amt = this.segment_gaode2(complex, count,
-      // @ts-ignore
-      last,
-      // @ts-ignore
-      cur,
-      // @ts-ignore
-      next,
-      // @ts-ignore
-      originLast, originCur,
-      // @ts-ignore
-      originNext);
-      count += amt;
-    }
-    if (this.dash) {
-      for (let i = 0; i < complex.positions.length / 6; i++) {
-        complex.positions[i * 6 + 5] = this.totalDistance;
-      }
-    }
-    complex.startIndex = complex.positions.length / 6;
-    return complex;
-  }
   extrude(points) {
     const complex = this.complex;
     if (points.length <= 1) {
@@ -265,131 +173,6 @@ export default class ExtrudePolyline {
     }
     return count;
   }
-  segment_gaode2(complex, index, last, cur, next, originLast, originCur,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  originNext) {
-    let count = 0;
-    const indices = complex.indices;
-    const positions = complex.positions;
-    const normals = complex.normals;
-    const capSquare = this.cap === 'square';
-    const joinBevel = this.join === 'bevel';
-    const flatCur = aProjectFlat([originCur[0], originCur[1]]);
-    const flatLast = aProjectFlat([originLast[0], originLast[1]]);
-    // @ts-ignore
-    direction(lineA, cur, last);
-    let segmentDistance = 0;
-    if (this.dash) {
-      // @ts-ignore
-      segmentDistance = this.lineSegmentDistance(flatCur, flatLast);
-      this.totalDistance += segmentDistance;
-    }
-    if (!this.normal) {
-      this.normal = vec2.create();
-      computeNormal(this.normal, lineA);
-    }
-    if (!this.started) {
-      this.started = true;
-
-      // if the end cap is type square, we can just push the verts out a bit
-      if (capSquare) {
-        // vec2.scaleAndAdd(capEnd, last, lineA, -this.thickness);
-        const out1 = vec2.create();
-        const out2 = vec2.create();
-        vec2.add(out1, this.normal, lineA);
-        vec2.add(out2, this.normal, lineA);
-        normals.push(out2[0], out2[1], 0);
-        normals.push(out1[0], out1[1], 0);
-        positions.push(last[0], last[1], last[2] | 0, this.totalDistance - segmentDistance, -this.thickness, last[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        positions.push(last[0], last[1], last[2] | 0, this.totalDistance - segmentDistance, this.thickness, last[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        this.currentIndex++;
-      } else {
-        this.extrusions(positions, normals, last, this.normal, this.thickness, this.totalDistance - segmentDistance);
-      }
-    }
-    indices.push(index + 0, index + 1, index + 2);
-    if (!next) {
-      computeNormal(this.normal, lineA);
-      if (capSquare) {
-        const out1 = vec2.create();
-        const out2 = vec2.create();
-        vec2.sub(out2, lineA, this.normal);
-        vec2.add(out1, lineA, this.normal);
-        normals.push(out2[0], out2[1], 0);
-        normals.push(out1[0], out1[1], 0);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, this.thickness, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, this.thickness, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        this.currentIndex++;
-      } else {
-        this.extrusions(positions, normals, cur, this.normal, this.thickness, this.totalDistance);
-      }
-      indices.push(...(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
-      count += 2;
-    } else {
-      // @ts-ignore
-      if (isPointEqual(cur, next)) {
-        vec2.add(
-        // @ts-ignore
-        next,
-        // @ts-ignore
-        cur, vec2.normalize(
-        // @ts-ignore
-        next,
-        // @ts-ignore
-        vec2.subtract(next, cur, last)));
-      }
-      // @ts-ignore
-      direction(lineB, next, cur);
-      // stores tangent & miter
-
-      const [miterLen, miter] = computeMiter(tangent, vec2.create(), lineA, lineB, this.thickness);
-      // normal(tmp, lineA)
-
-      // get orientation
-      let flip = vec2.dot(tangent, this.normal) < 0 ? -1 : 1;
-      let bevel = joinBevel;
-      if (!bevel && this.join === 'miter') {
-        const limit = miterLen;
-        if (limit > this.miterLimit) {
-          bevel = true;
-        }
-      }
-      if (bevel) {
-        normals.push(this.normal[0], this.normal[1], 0);
-        normals.push(miter[0], miter[1], 0);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, -this.thickness * flip, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, this.thickness * flip, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        this.currentIndex++;
-        indices.push(...(this.lastFlip !== -flip ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
-
-        // now add the bevel triangle
-        indices.push(index + 2, index + 3, index + 4);
-        computeNormal(tmp, lineB);
-        vec2.copy(this.normal, tmp); // store normal for next round
-        normals.push(this.normal[0], this.normal[1], 0);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, -this.thickness * flip, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        this.currentIndex++;
-        count += 3;
-      } else {
-        this.extrusions(positions, normals, cur, miter, miterLen, this.totalDistance);
-        indices.push(...(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
-        flip = -1;
-
-        // the miter is now the normal for our next join
-        vec2.copy(this.normal, miter);
-        count += 2;
-      }
-      this.lastFlip = flip;
-    }
-    return count;
-  }
   segment(complex, index, last, cur, next) {
     let count = 0;
     const indices = complex.indices;

package/es/wind/models/wind.d.ts

@@ -1,6 +1,20 @@
 import type { IModel, IModelUniform, IRenderOptions, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class WindModel 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;
+        UV: number;
+    };
     protected texture: ITexture2D;
     private colorModel;
     private wind;

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\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";
+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";
 import { Wind } from "./windRender";
 const defaultRampColors = {
   0.0: '#3288bd',
@@ -32,6 +32,12 @@ 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: 控制风场的平均更新频率
@@ -108,6 +114,7 @@ export default class WindModel extends BaseModel {
         moduleName: 'wind',
         vertexShader: WindVert,
         fragmentShader: WindFrag,
+        defines: _this.getDefines(),
         triangulation: RasterImageTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -146,6 +153,7 @@ 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,13 +1,14 @@
 precision highp float;
 uniform mat4 u_ModelMatrix;
 
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_UV) in 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_v2(vec4(project_pos.xy,0., 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
 }

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

@@ -1,6 +1,22 @@
 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,18 +10,25 @@ 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 = 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";
+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";
 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,
@@ -57,20 +64,10 @@ class CityBuildModel extends _BaseModel.default {
   calCityGeo() {
     // @ts-ignore
     const [minLng, minLat, maxLng, maxLat] = this.layer.getSource().extent;
-    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;
-    }
+    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;
@@ -92,6 +89,7 @@ class CityBuildModel extends _BaseModel.default {
         depth: {
           enable: true
         },
+        defines: _this2.getDefines(),
         inject: _this2.getInject(),
         cull: {
           enable: true,
@@ -108,7 +106,7 @@ class CityBuildModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
+        shaderLocation: this.attributeLocation.NORMAL,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: _l7Core.gl.STATIC_DRAW,
@@ -126,7 +124,7 @@ class CityBuildModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Size',
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        shaderLocation: this.attributeLocation.SIZE,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -147,7 +145,7 @@ class CityBuildModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
+        shaderLocation: this.attributeLocation.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 = 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;
+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;
 
 out vec2 v_texCoord;
 out vec4 v_Color;
@@ -41,17 +41,11 @@ void main() {
 
   if(u_circleSweep > 0.0) {
      vec2 lnglatscale = vec2(0.0);
-    if(u_CoordinateSystem != COORDINATE_SYSTEM_P20_2) {
-      lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);
-    }
+    lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);
     v_worldDis = length(a_Position.xy + lnglatscale - u_cityCenter);
   }
- 
-  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));
-  }
+
+  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.d.ts

@@ -237,7 +237,6 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     protected getDefaultConfig(): {};
     protected sourceEvent: () => void;
     protected initLayerModels(): Promise<void>;
-    getLayerUniformBuffer(): IBuffer;
     getPickingUniformBuffer(): IBuffer;
     protected reRender(): void;
     protected splitValuesAndCallbackInAttribute(valuesOrCallback?: unknown[]): {

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", "inject", "triangulation", "styleOption", "pickingEnabled"]; // @ts-ignore
+  _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "defines", "inject", "triangulation", "styleOption", "pickingEnabled"]; // @ts-ignore
 const {
   isEqual,
   isFunction,
@@ -64,7 +64,8 @@ class BaseLayer extends _eventemitter.EventEmitter {
     return this.container.interactionService;
   }
   get mapService() {
-    return this.container.mapService;
+    var _this$container;
+    return (_this$container = this.container) === null || _this$container === void 0 ? void 0 : _this$container.mapService;
   }
   get normalPassFactory() {
     return this.container.normalPassFactory;
@@ -924,12 +925,8 @@ 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,6 +1020,7 @@ class BaseLayer extends _eventemitter.EventEmitter {
           moduleName,
           vertexShader,
           fragmentShader,
+          defines,
           inject,
           triangulation,
           styleOption,
@@ -1032,6 +1030,7 @@ class BaseLayer extends _eventemitter.EventEmitter {
       _this3.shaderModuleService.registerModule(moduleName, {
         vs: vertexShader,
         fs: fragmentShader,
+        defines,
         inject
       });
       const {
@@ -1048,7 +1047,7 @@ class BaseLayer extends _eventemitter.EventEmitter {
           elements,
           count
         } = _this3.styleAttributeService.createAttributesAndIndices(_this3.encodedData, triangulation, styleOption, _this3);
-        const uniformBuffers = [..._this3.layerModel.uniformBuffers, ..._this3.rendererService.uniformBuffers, _this3.getLayerUniformBuffer()];
+        const uniformBuffers = [..._this3.layerModel.uniformBuffers, ..._this3.rendererService.uniformBuffers];
         if (pickingEnabled) {
           uniformBuffers.push(_this3.getPickingUniformBuffer());
         }
@@ -1231,28 +1230,19 @@ class BaseLayer extends _eventemitter.EventEmitter {
         buffer.destroy();
       });
       _this5.uniformBuffers = [];
-      // Layer Uniform
-      const layerUniforms = _this5.rendererService.createBuffer({
-        data: new Float32Array(16 + 4).fill(0),
-        // u_Mvp
-        isUBO: true
-      });
-      _this5.uniformBuffers.push(layerUniforms);
 
       // Picking Uniform
       const pickingUniforms = _this5.rendererService.createBuffer({
         data: new Float32Array(20).fill(0),
-        isUBO: true
+        isUBO: true,
+        label: 'pickingUniforms'
       });
       _this5.uniformBuffers.push(pickingUniforms);
       _this5.models = yield _this5.layerModel.initModels();
     })();
   }
-  getLayerUniformBuffer() {
-    return this.uniformBuffers[0];
-  }
   getPickingUniformBuffer() {
-    return this.uniformBuffers[1];
+    return this.uniformBuffers[0];
   }
   reRender() {
     if (this.inited) {

package/lib/core/BaseModel.d.ts

@@ -1,4 +1,5 @@
-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';
+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';
 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]];
@@ -11,10 +12,15 @@ 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>;
@@ -55,11 +61,17 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     protected registerBuiltinAttributes(): void;
     protected animateOption2Array(option: IAnimateOption): number[];
     protected startModelAnimate(): void;
-    protected getInject(): IInject;
+    protected getInject(): ShaderInject;
+    protected getDefines(): Record<string, ShaderDefine>;
     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: {
@@ -80,3 +92,4 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     };
     updateStyleUnifoms(): void;
 }
+export {};