@antv/l7-layers 2.25.5 → 2.25.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.25.5",
+  "version": "2.25.7",
   "description": "L7's collection of built-in layers",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -26,15 +26,15 @@
     "earcut": "^2.2.1",
     "eventemitter3": "^4.0.0",
     "gl-matrix": "^3.1.0",
-    "@antv/l7-core": "2.25.5",
-    "@antv/l7-maps": "2.25.5",
-    "@antv/l7-source": "2.25.5",
-    "@antv/l7-utils": "2.25.5"
+    "@antv/l7-maps": "2.25.7",
+    "@antv/l7-core": "2.25.7",
+    "@antv/l7-utils": "2.25.7",
+    "@antv/l7-source": "2.25.7"
   },
   "devDependencies": {
     "@types/earcut": "^2.1.0",
     "@types/gl-matrix": "^2.4.5",
-    "@antv/l7-test-utils": "^2.25.5"
+    "@antv/l7-test-utils": "^2.25.7"
   },
   "publishConfig": {
     "access": "public",

package/es/canvas/index.d.ts

@@ -1,18 +0,0 @@
-import BaseLayer from '../core/BaseLayer';
-import type { ICanvasLayerOptions } from '../core/interface';
-import type { CanvasModelType } from './models';
-import { CanvasModel } from './models';
-export default class CanvasLayer extends BaseLayer<ICanvasLayerOptions> {
-    type: string;
-    layerModel: CanvasModel;
-    protected getDefaultConfig(): Partial<ICanvasLayerOptions>;
-    buildModels(): Promise<void>;
-    getModelType(): CanvasModelType;
-    draw(draw: ICanvasLayerOptions['draw']): this;
-    getLayerConfig(): any;
-    render(): this;
-    getCanvas(): HTMLCanvasElement | null;
-    show(): this;
-    hide(): this;
-    destroy(): void;
-}

package/es/canvas/index.js

@@ -1,70 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-// import type { ILayerConfig } from '@antv/l7-core';
-import BaseLayer from "../core/BaseLayer";
-import { CanvasModel } from "./models";
-export default class CanvasLayer extends BaseLayer {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "type", 'CanvasLayer');
-  }
-  getDefaultConfig() {
-    return {
-      zIndex: 3,
-      contextType: 'canvas2d',
-      trigger: 'change'
-    };
-  }
-  buildModels() {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      _this.layerModel = new CanvasModel(_this);
-      yield _this.initLayerModels();
-    })();
-  }
-  getModelType() {
-    return this.getLayerConfig().contextType || 'canvas2d';
-  }
-  draw(draw) {
-    this.updateLayerConfig({
-      draw
-    });
-    this.render();
-    return this;
-  }
-  getLayerConfig() {
-    const config = _objectSpread(_objectSpread({}, this.getDefaultConfig()), super.getLayerConfig());
-    if (config.zIndex < 3) {
-      config.zIndex = 3;
-    }
-    return config;
-  }
-  render() {
-    var _this$layerModel;
-    (_this$layerModel = this.layerModel) === null || _this$layerModel === void 0 || _this$layerModel.renderCanvas();
-    return this;
-  }
-  getCanvas() {
-    var _this$layerModel2;
-    return (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.canvas;
-  }
-  show() {
-    const canvas = this.getCanvas();
-    if (canvas) {
-      canvas.style.display = 'unset';
-    }
-    return this;
-  }
-  hide() {
-    const canvas = this.getCanvas();
-    if (canvas) {
-      canvas.style.display = 'none';
-    }
-    return this;
-  }
-  destroy() {
-    this.layerModel.removeCanvas();
-    super.destroy();
-  }
-}

package/es/canvas/models/canvas.d.ts

@@ -1,23 +0,0 @@
-import BaseModel from '../../core/BaseModel';
-import { type ICanvasLayerOptions } from '../../core/interface';
-export declare class CanvasModel extends BaseModel {
-    canvas: HTMLCanvasElement | null;
-    ctx: any;
-    ctxType: string;
-    viewportSize: [number, number];
-    get layerConfig(): ICanvasLayerOptions;
-    initModels(): Promise<never[]>;
-    initCanvas: () => void;
-    resetViewportSize: () => void;
-    resetCanvasSize: () => void;
-    renderCanvas: () => void;
-    removeCanvas: () => void;
-    onMapResize: () => void;
-    bindListeners(): void;
-    unbindListeners(): void;
-    lngLatToContainer: (lngLat: [number, number]) => {
-        x: number;
-        y: number;
-    };
-    registerBuiltinAttributes(): void;
-}

package/es/canvas/models/canvas.js

@@ -1,141 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import BaseModel from "../../core/BaseModel";
-import { CanvasUpdateType } from "../../core/interface";
-import { CanvasContextTypeMap } from "./constants";
-export class CanvasModel extends BaseModel {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "canvas", null);
-    _defineProperty(this, "ctx", void 0);
-    _defineProperty(this, "ctxType", void 0);
-    _defineProperty(this, "viewportSize", void 0);
-    _defineProperty(this, "initCanvas", () => {
-      var _this$mapService$getC, _this$mapService$getC2, _this$mapService, _this$mapService$getM, _this$mapService2;
-      const {
-        zIndex,
-        getContext
-      } = this.layerConfig;
-      const canvas = document.createElement('canvas');
-      const modelType = this.layer.getModelType();
-      this.canvas = canvas;
-      canvas.classList.add('l7-canvas-layer');
-      canvas.style.position = 'absolute';
-      canvas.style.top = '0';
-      canvas.style.left = '0';
-      canvas.style.zIndex = String(zIndex);
-      this.resetCanvasSize();
-      const container = (_this$mapService$getC = (_this$mapService$getC2 = (_this$mapService = this.mapService).getCanvasOverlays) === null || _this$mapService$getC2 === void 0 ? void 0 : _this$mapService$getC2.call(_this$mapService)) !== null && _this$mapService$getC !== void 0 ? _this$mapService$getC : (_this$mapService$getM = (_this$mapService2 = this.mapService).getMapCanvasContainer) === null || _this$mapService$getM === void 0 ? void 0 : _this$mapService$getM.call(_this$mapService2);
-      container === null || container === void 0 || container.appendChild(canvas);
-      this.ctx = getContext ? getContext(canvas) : canvas.getContext(CanvasContextTypeMap[modelType]);
-      if (!this.ctx) {
-        console.error('Failed to get rendering context for canvas');
-      }
-      this.bindListeners();
-    });
-    _defineProperty(this, "resetViewportSize", () => {
-      const {
-        width: viewWidth,
-        height: viewHeight
-      } = this.rendererService.getViewportSize();
-      this.viewportSize = [viewWidth, viewHeight];
-    });
-    _defineProperty(this, "resetCanvasSize", () => {
-      const canvas = this.canvas;
-      if (!canvas) {
-        return;
-      }
-      this.resetViewportSize();
-      const [width, height] = this.mapService.getSize();
-      const [viewWidth, viewHeight] = this.viewportSize;
-      canvas.width = viewWidth;
-      canvas.height = viewHeight;
-      canvas.style.width = width + 'px';
-      canvas.style.height = height + 'px';
-    });
-    _defineProperty(this, "renderCanvas", () => {
-      var _ref;
-      if (!this.canvas) {
-        this.initCanvas();
-      }
-      const {
-        draw,
-        drawingOnCanvas
-      } = this.layerConfig;
-      const [width, height] = this.viewportSize;
-      const bounds = this.mapService.getBounds();
-      (_ref = draw !== null && draw !== void 0 ? draw : drawingOnCanvas) === null || _ref === void 0 || _ref({
-        canvas: this.canvas,
-        ctx: this.ctx,
-        container: {
-          width,
-          height,
-          bounds
-        },
-        size: [width, height],
-        utils: {
-          lngLatToContainer: this.lngLatToContainer
-        },
-        mapService: this.mapService
-      });
-    });
-    _defineProperty(this, "removeCanvas", () => {
-      if (this.canvas) {
-        var _this$canvas$parentEl;
-        (_this$canvas$parentEl = this.canvas.parentElement) === null || _this$canvas$parentEl === void 0 || _this$canvas$parentEl.removeChild(this.canvas);
-        this.canvas = null;
-      }
-      this.unbindListeners();
-    });
-    _defineProperty(this, "onMapResize", () => {
-      requestAnimationFrame(() => {
-        this.resetCanvasSize();
-        this.renderCanvas();
-      });
-    });
-    _defineProperty(this, "lngLatToContainer", lngLat => {
-      const {
-        x,
-        y
-      } = this.mapService.lngLatToContainer(lngLat);
-      return {
-        x: x * window.devicePixelRatio,
-        y: y * window.devicePixelRatio
-      };
-    });
-  }
-  get layerConfig() {
-    return this.layer.getLayerConfig();
-  }
-  initModels() {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      _this.renderCanvas();
-      return [];
-    })();
-  }
-  bindListeners() {
-    this.mapService.on('resize', this.onMapResize);
-    const {
-      trigger,
-      update
-    } = this.layerConfig;
-    if (update === CanvasUpdateType.ALWAYS || trigger === 'change') {
-      this.mapService.on('mapchange', this.renderCanvas);
-    } else {
-      this.mapService.on('zoomstart', this.removeCanvas);
-      this.mapService.on('zoomend', this.renderCanvas);
-      this.mapService.on('movestart', this.removeCanvas);
-      this.mapService.on('moveend', this.renderCanvas);
-    }
-  }
-  unbindListeners() {
-    this.mapService.off('resize', this.onMapResize);
-    this.mapService.off('mapchange', this.renderCanvas);
-    this.mapService.off('zoomstart', this.removeCanvas);
-    this.mapService.off('zoomend', this.renderCanvas);
-    this.mapService.off('movestart', this.removeCanvas);
-    this.mapService.off('moveend', this.renderCanvas);
-  }
-  registerBuiltinAttributes() {}
-}

package/es/canvas/models/constants.d.ts

@@ -1,2 +0,0 @@
-export type CanvasModelType = 'canvas2d' | 'webgl' | 'webgl2' | 'webgpu';
-export declare const CanvasContextTypeMap: Record<CanvasModelType, string>;

package/es/canvas/models/constants.js

@@ -1,6 +0,0 @@
-export const CanvasContextTypeMap = {
-  canvas2d: '2d',
-  webgl: 'webgl',
-  webgl2: 'webgl2',
-  webgpu: 'webgpu'
-};

package/es/canvas/models/index.d.ts

@@ -1,2 +0,0 @@
-export * from './canvas';
-export * from './constants';

package/es/canvas/models/index.js

@@ -1,2 +0,0 @@
-export * from "./canvas";
-export * from "./constants";

package/es/citybuilding/building.d.ts

@@ -1,7 +0,0 @@
-import BaseLayer from '../core/BaseLayer';
-export default class CityBuildingLayer extends BaseLayer {
-    type: string;
-    buildModels(): Promise<void>;
-    setLight(t: number): void;
-    getModelType(): string;
-}

package/es/citybuilding/building.js

@@ -1,25 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import BaseLayer from "../core/BaseLayer";
-import CityBuildModel from "./models/build";
-export default class CityBuildingLayer extends BaseLayer {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "type", 'CityBuildingLayer');
-  }
-  buildModels() {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      _this.layerModel = new CityBuildModel(_this);
-      yield _this.initLayerModels();
-    })();
-  }
-  setLight(t) {
-    this.updateLayerConfig({
-      time: t
-    });
-  }
-  getModelType() {
-    return 'citybuilding';
-  }
-}

package/es/citybuilding/models/build.d.ts

@@ -1,33 +0,0 @@
-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(): {
-        uniformsArray: number[];
-        uniformsLength: number;
-        uniformsOption: {
-            [key: string]: any;
-        };
-    };
-    calCityGeo(): void;
-    initModels(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
-    protected registerBuiltinAttributes(): void;
-}

package/es/citybuilding/models/build.js

@@ -1,160 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { AttributeType, gl } from '@antv/l7-core';
-import { rgb2arr } from '@antv/l7-utils';
-import BaseModel from "../../core/BaseModel";
-import { PolygonExtrudeTriangulation } from "../../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  float u_padding1;\n  float u_padding2;\n  float u_padding3;\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  float u_padding1;\n  float u_padding2;\n  float u_padding3;\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";
-export default class CityBuildModel extends BaseModel {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "cityCenter", void 0);
-    _defineProperty(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,
-      baseColor = 'rgb(16,16,16)',
-      brightColor = 'rgb(255,176,38)',
-      windowColor = 'rgb(30,60,89)',
-      time = 0,
-      sweep = {
-        enable: false,
-        sweepRadius: 1,
-        sweepColor: 'rgb(255, 255, 255)',
-        sweepSpeed: 0.4,
-        sweepCenter: this.cityCenter
-      }
-    } = this.layer.getLayerConfig();
-    const commonOptions = {
-      u_baseColor: rgb2arr(baseColor),
-      u_brightColor: rgb2arr(brightColor),
-      u_windowColor: rgb2arr(windowColor),
-      u_circleSweepColor: [...rgb2arr(sweep.sweepColor).slice(0, 3), 1.0],
-      u_cityCenter: sweep.sweepCenter || this.cityCenter,
-      u_circleSweep: sweep.enable ? 1.0 : 0.0,
-      u_cityMinSize: this.cityMinSize * sweep.sweepRadius,
-      u_circleSweepSpeed: sweep.sweepSpeed,
-      u_opacity: opacity,
-      u_near: 0,
-      u_far: 1,
-      u_time: this.layer.getLayerAnimateTime() || time,
-      u_padding1: 0,
-      u_padding2: 0,
-      u_padding3: 0
-    };
-    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-    return commonBufferInfo;
-  }
-  calCityGeo() {
-    // 当启用 enableRelativeCoordinates 时，使用 originalExtent（原始绝对坐标范围）
-    const originalExtent = this.layer.getOriginalExtent();
-    const extent = originalExtent[0] !== 0 || originalExtent[2] !== 0 ? originalExtent : this.layer.getSource().extent;
-    const [minLng, minLat, maxLng, maxLat] = 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;
-  }
-  initModels() {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      _this.calCityGeo();
-      _this.initUniformsBuffer();
-      _this.startModelAnimate();
-      return _this.buildModels();
-    })();
-  }
-  buildModels() {
-    var _this2 = this;
-    return _asyncToGenerator(function* () {
-      const model = yield _this2.layer.buildLayerModel({
-        moduleName: 'cityBuilding',
-        vertexShader: buildVert,
-        fragmentShader: buildFrag,
-        triangulation: PolygonExtrudeTriangulation,
-        depth: {
-          enable: true
-        },
-        defines: _this2.getDefines(),
-        inject: _this2.getInject(),
-        cull: {
-          enable: true,
-          face: gl.BACK
-        }
-      });
-      return [model];
-    })();
-  }
-  registerBuiltinAttributes() {
-    // point layer size;
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'normal',
-      type: AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Normal',
-        shaderLocation: this.attributeLocation.NORMAL,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: gl.STATIC_DRAW,
-          data: [],
-          type: gl.FLOAT
-        },
-        size: 3,
-        update: (feature, featureIdx, vertex, attributeIdx, normal) => {
-          return normal;
-        }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'size',
-      type: AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Size',
-        shaderLocation: this.attributeLocation.SIZE,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: gl.DYNAMIC_DRAW,
-          data: [],
-          type: gl.FLOAT
-        },
-        size: 1,
-        update: feature => {
-          const {
-            size = 10
-          } = feature;
-          return Array.isArray(size) ? [size[0]] : [size];
-        }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'uv',
-      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,
-          data: [],
-          type: gl.FLOAT
-        },
-        size: 2,
-        update: (feature, featureIdx, vertex) => {
-          return [vertex[3], vertex[4]];
-        }
-      }
-    });
-  }
-}

package/es/citybuilding/shaders/build_frag.glsl

@@ -1,123 +0,0 @@
-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_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_time;
-  float u_padding1;
-  float u_padding2;
-  float u_padding3;
-};
-in vec4 v_Color;
-in vec2 v_texCoord;
-in float v_worldDis;
-out vec4 outputColor;
-
-#pragma include "picking"
-#pragma include "scene_uniforms"
-
-vec3 getWindowColor(float n, float hot, vec3 brightColor, vec3 darkColor) {
-    float s = step(hot, n);
-    vec3 color = mix(brightColor,vec3(0.9,0.9,1.0),n);
-
-    return mix(darkColor, color, s);
-}
-float random (vec2 st) {
-    return fract(sin(dot(st.xy, vec2(12.9898,78.233)))* 43758.5453123);
-}
-
-float LinearizeDepth()
-{
-    float z = gl_FragCoord.z * 2.0 - 1.0;
-    return (2.0 * u_near * u_far) / (u_far + u_near - z * (u_far - u_near));
-}
-
-vec3 fog(vec3 color, vec3 fogColor, float depth){
-    float fogFactor=clamp(depth,0.0,1.0);
-    vec3 output_color=mix(fogColor,color,fogFactor);
-    return output_color;
-}
-
-float sdRect(vec2 p, vec2 sz) {
-  vec2 d = abs(p) - sz;
-  float outside = length(max(d, 0.));
-  float inside = min(max(d.x, d.y), 0.);
-  return outside + inside;
-}
-
-void main() {
-  outputColor = v_Color;
-  vec3 baseColor = u_baseColor.xyz;
-  vec3 brightColor = u_brightColor.xyz;
-  vec3 windowColor = u_windowColor.xyz;
-  float targetColId = 5.;
-  float depth = 1.0 - LinearizeDepth() / u_far * u_Zoom;
-  vec3 fogColor = vec3(23.0/255.0,31.0/255.0,51.0/255.0);
-  if(v_texCoord.x < 0.) { //顶部颜色
-       vec3 foggedColor = fog(baseColor.xyz + vec3(0.12*0.9,0.2*0.9,0.3*0.9),fogColor,depth);
-       outputColor = vec4( foggedColor, v_Color.w);
-  }else { // 侧面颜色
-        vec2 st = v_texCoord;
-        vec2  UvScale = v_texCoord;
-        float tStep = min(0.08,max(0.05* (18.0-u_Zoom),0.02));
-        float tStart = 0.25 * tStep;
-        float tEnd = 0.75 * tStep;
-        float u = mod(UvScale.x, tStep);
-        float v = mod(UvScale.y, tStep);
-        float ux = floor(UvScale.x/tStep);
-        float uy = floor(UvScale.y/tStep);
-        float n = random(vec2(ux,uy));
-        float lightP = u_time;
-        float head = 1.0- step(0.005,st.y);
-        /*step3*/
-        // 将窗户颜色和墙面颜色区别开来
-        float sU = step(tStart, u) - step(tEnd, u);
-        float sV = step(tStart, v) - step(tEnd, v);
-        vec2 windowSize = vec2(abs(tEnd-tStart),abs(tEnd-tStart));
-        float dist = sdRect(vec2(u,v), windowSize);
-        float s = sU * sV;
-
-        float curColId = floor(UvScale.x / tStep);
-        float sCol = step(targetColId - 0.2, curColId) - step(targetColId + 0.2, curColId);
-
-        float mLightP = mod(lightP, 2.);
-        float sRow = step(mLightP - 0.2, st.y) - step(mLightP, st.y);
-        if(ux == targetColId){
-            n =0.;
-        }
-        float timeP = min(0.75, abs ( sin(u_time/3.0) ) );
-        float hot = smoothstep(1.0,0.0,timeP);
-        vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), s);
-        //vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), 1.0);
-        float sFinal = s * sCol * sRow;
-        color += mix(baseColor, brightColor, sFinal*n);
-        if (st.y<0.01){
-        color = baseColor;
-         }
-        if(head ==1.0) { // 顶部亮线
-            color = brightColor;
-        }
-        color = color * v_Color.rgb;
-
-        vec3 foggedColor = fog(color,fogColor,depth);
-
-        outputColor = vec4(foggedColor,1.0);
-  }
-
-
-  if(u_circleSweep > 0.0 && v_worldDis < u_cityMinSize) {
-    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);
-}