ol 7.3.0 → 7.3.1-dev

package/renderer/webgl/PointsLayer.js

@@ -135,8 +135,6 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
       postProcesses: options.postProcesses,
     });
 
-    this.ready = false;
-
     this.sourceRevision_ = -1;
 
     this.verticesBuffer_ = new WebGLArrayBuffer(ARRAY_BUFFER, DYNAMIC_DRAW);
@@ -290,7 +288,7 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
      * @type {number}
      * @private
      */
-    this.generateBuffersRun_ = 0;
+    this.lastSentId = 0;
 
     /**
      * @private
@@ -329,7 +327,7 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
             this.renderInstructions_ = new Float32Array(
               event.data.renderInstructions
             );
-            if (received.generateBuffersRun === this.generateBuffersRun_) {
+            if (received.id === this.lastSentId) {
               this.ready = true;
             }
           }
@@ -638,14 +636,13 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
 
     /** @type {import('../../render/webgl/constants.js').WebGLWorkerGenerateBuffersMessage} */
     const message = {
-      id: 0,
+      id: ++this.lastSentId,
       type: WebGLWorkerMessageType.GENERATE_POINT_BUFFERS,
       renderInstructions: this.renderInstructions_.buffer,
-      customAttributesCount: this.customAttributes.length,
+      customAttributesSize: this.customAttributes.length,
     };
     // additional properties will be sent back as-is by the worker
     message['projectionTransform'] = projectionTransform;
-    message['generateBuffersRun'] = ++this.generateBuffersRun_;
     this.ready = false;
     this.worker_.postMessage(message, [this.renderInstructions_.buffer]);
     this.renderInstructions_ = null;
@@ -656,7 +653,7 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
         id: 0,
         type: WebGLWorkerMessageType.GENERATE_POINT_BUFFERS,
         renderInstructions: this.hitRenderInstructions_.buffer,
-        customAttributesCount: 5 + this.customAttributes.length,
+        customAttributesSize: 5 + this.customAttributes.length,
       };
       hitMessage['projectionTransform'] = projectionTransform;
       hitMessage['hitDetection'] = true;

package/renderer/webgl/TileLayer.d.ts

@@ -1,17 +1,20 @@
-export namespace Uniforms {
-    const TILE_TEXTURE_ARRAY: string;
-    const TILE_TRANSFORM: string;
-    const TRANSITION_ALPHA: string;
-    const DEPTH: string;
-    const TEXTURE_PIXEL_WIDTH: string;
-    const TEXTURE_PIXEL_HEIGHT: string;
-    const TEXTURE_RESOLUTION: string;
-    const TEXTURE_ORIGIN_X: string;
-    const TEXTURE_ORIGIN_Y: string;
-    const RENDER_EXTENT: string;
-    const RESOLUTION: string;
-    const ZOOM: string;
-}
+export const Uniforms: {
+    TILE_TEXTURE_ARRAY: string;
+    TEXTURE_PIXEL_WIDTH: string;
+    TEXTURE_PIXEL_HEIGHT: string;
+    TEXTURE_RESOLUTION: string;
+    TEXTURE_ORIGIN_X: string;
+    TEXTURE_ORIGIN_Y: string;
+    TILE_TRANSFORM: string;
+    TRANSITION_ALPHA: string;
+    DEPTH: string;
+    RENDER_EXTENT: string;
+    RESOLUTION: string;
+    ZOOM: string;
+    GLOBAL_ALPHA: string;
+    PROJECTION_MATRIX: string;
+    SCREEN_TO_WORLD_MATRIX: string;
+};
 export namespace Attributes {
     const TEXTURE_COORD: string;
 }
@@ -42,6 +45,8 @@ export type Options = {
     cacheSize?: number | undefined;
 };
 export type LayerType = import("../../layer/WebGLTile.js").default;
+export type TileTextureType = import("../../webgl/TileTexture.js").TileType;
+export type TileTextureRepresentation = import("../../webgl/TileTexture.js").default;
 /**
  * @typedef {Object} Options
  * @property {string} vertexShader Vertex shader source.
@@ -54,49 +59,24 @@ export type LayerType = import("../../layer/WebGLTile.js").default;
 /**
  * @typedef {import("../../layer/WebGLTile.js").default} LayerType
  */
+/**
+ * @typedef {import("../../webgl/TileTexture.js").TileType} TileTextureType
+ */
+/**
+ * @typedef {import("../../webgl/TileTexture.js").default} TileTextureRepresentation
+ */
 /**
  * @classdesc
  * WebGL renderer for tile layers.
- * @extends {WebGLLayerRenderer<LayerType>}
+ * @extends {WebGLBaseTileLayerRenderer<LayerType, TileTextureType, TileTextureRepresentation>}
  * @api
  */
-declare class WebGLTileLayerRenderer extends WebGLLayerRenderer<import("../../layer/WebGLTile.js").default> {
+declare class WebGLTileLayerRenderer extends WebGLBaseTileLayerRenderer<import("../../layer/WebGLTile.js").default, import("../../webgl/TileTexture.js").TileType, TileTexture> {
     /**
      * @param {LayerType} tileLayer Tile layer.
      * @param {Options} options Options.
      */
     constructor(tileLayer: LayerType, options: Options);
-    /**
-     * The last call to `renderFrame` was completed with all tiles loaded
-     * @type {boolean}
-     */
-    renderComplete: boolean;
-    /**
-     * This transform converts texture coordinates to screen coordinates.
-     * @type {import("../../transform.js").Transform}
-     * @private
-     */
-    private tileTransform_;
-    /**
-     * @type {Array<number>}
-     * @private
-     */
-    private tempMat4_;
-    /**
-     * @type {import("../../TileRange.js").default}
-     * @private
-     */
-    private tempTileRange_;
-    /**
-     * @type {import("../../tilecoord.js").TileCoord}
-     * @private
-     */
-    private tempTileCoord_;
-    /**
-     * @type {import("../../size.js").Size}
-     * @private
-     */
-    private tempSize_;
     /**
      * @type {WebGLProgram}
      * @private
@@ -128,71 +108,24 @@ declare class WebGLTileLayerRenderer extends WebGLLayerRenderer<import("../../la
      * @private
      */
     private indices_;
-    /**
-     * @type {import("../../structs/LRUCache.js").default<import("../../webgl/TileTexture.js").default>}
-     * @private
-     */
-    private tileTextureCache_;
     /**
      * @type {Array<import("../../webgl/PaletteTexture.js").default>}
      * @private
      */
     private paletteTextures_;
-    /**
-     * @private
-     * @type {import("../../Map.js").FrameState|null}
-     */
-    private frameState_;
-    /**
-     * @private
-     * @type {import("../../proj/Projection.js").default}
-     */
-    private projection_;
     /**
      * @param {Options} options Options.
      */
     reset(options: Options): void;
-    /**
-     * @param {import("../../webgl/TileTexture").TileType} tile Tile.
-     * @return {boolean} Tile is drawable.
-     * @private
-     */
-    private isDrawableTile_;
-    /**
-     * @param {import("../../Map.js").FrameState} frameState Frame state.
-     * @param {import("../../extent.js").Extent} extent The extent to be rendered.
-     * @param {number} initialZ The zoom level.
-     * @param {Object<number, Array<TileTexture>>} tileTexturesByZ The zoom level.
-     * @param {number} preload Number of additional levels to load.
-     */
-    enqueueTiles(frameState: import("../../Map.js").FrameState, extent: import("../../extent.js").Extent, initialZ: number, tileTexturesByZ: {
-        [x: number]: Array<TileTexture>;
-    }, preload: number): void;
-    /**
-     * Render the layer.
-     * @param {import("../../Map.js").FrameState} frameState Frame state.
-     * @return {HTMLElement} The rendered element.
-     */
-    renderFrame(frameState: import("../../Map.js").FrameState): HTMLElement;
+    createTileRepresentation(options: any): TileTexture;
+    beforeTilesRender(frameState: any, tilesWithAlpha: any): void;
+    renderTile(tileTexture: any, tileTransform: any, frameState: any, renderExtent: any, tileResolution: any, tileSize: any, tileOrigin: any, tileExtent: any, depth: any, gutter: any, alpha: any): void;
     /**
      * @param {import("../../pixel.js").Pixel} pixel Pixel.
      * @return {Uint8ClampedArray|Uint8Array|Float32Array|DataView} Data at the pixel location.
      */
     getData(pixel: import("../../pixel.js").Pixel): Uint8ClampedArray | Uint8Array | Float32Array | DataView;
-    /**
-     * Look for tiles covering the provided tile coordinate at an alternate
-     * zoom level.  Loaded tiles will be added to the provided tile texture lookup.
-     * @param {import("../../tilegrid/TileGrid.js").default} tileGrid The tile grid.
-     * @param {import("../../tilecoord.js").TileCoord} tileCoord The target tile coordinate.
-     * @param {number} altZ The alternate zoom level.
-     * @param {Object<number, Array<import("../../webgl/TileTexture.js").default>>} tileTexturesByZ Lookup of
-     * tile textures by zoom level.
-     * @return {boolean} The tile coordinate is covered by loaded tiles at the alternate zoom level.
-     * @private
-     */
-    private findAltTiles_;
-    clearCache(): void;
 }
-import WebGLLayerRenderer from "./Layer.js";
-import TileTexture from "../../webgl/TileTexture.js";
+import TileTexture from '../../webgl/TileTexture.js';
+import WebGLBaseTileLayerRenderer from './TileLayerBase.js';
 //# sourceMappingURL=TileLayer.d.ts.map

package/renderer/webgl/TileLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;kBAmIc,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;wBAQP,OAAO,0BAA0B,EAAE,OAAO;AAXvD;;;;;;;;GAQG;AAEH;;GAEG;AAEH;;;;;GAKG;AACH;IACE;;;OAGG;IACH,uBAHW,SAAS,WACT,OAAO,EAyGjB;IAlGC;;;OAGG;IACH,gBAFU,OAAO,CAEU;IAE3B;;;;OAIG;IACH,uBAAuC;IAEvC;;;OAGG;IACH,kBAA6B;IAE7B;;;OAGG;IACH,uBAA+C;IAE/C;;;OAGG;IACH,uBAA8C;IAE9C;;;OAGG;IACH,kBAAuB;IAEvB;;;OAGG;IACH,iBAAa;IAEb;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;;;;;;;;;;;;;;OAgBG;IACH,iBAAuE;IAKvE;;;OAGG;IACH,0BAAgD;IAEhD;;;OAGG;IACH,yBAAqD;IAErD;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,oBAA4B;IAG9B;;OAEG;IACH,eAFW,OAAO,QAgBjB;IAWD;;;;OAIG;IACH,wBASC;IA2BD;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM;YACC,MAAM,GAAE,MAAM,WAAW,CAAC;gBACjC,MAAM,QAwGhB;IAED;;;;OAIG;IACH,wBAHW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CAmStB;IAED;;;OAGG;IACH,eAHW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,CA4F7D;IAED;;;;;;;;;;OAUG;IACH,sBA+BC;IAED,mBAIC;CA6BF"}
+{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":"AAwBA;;;;;;;;;;;;;;;;EAQE;;;;;;;;;kBAmBY,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;wBAQP,OAAO,0BAA0B,EAAE,OAAO;8BAG1C,OAAO,4BAA4B,EAAE,QAAQ;wCAG7C,OAAO,4BAA4B,EAAE,OAAO;AAjBzD;;;;;;;;GAQG;AAEH;;GAEG;AACH;;GAEG;AACH;;GAEG;AAEH;;;;;GAKG;AACH;IACE;;;OAGG;IACH,uBAHW,SAAS,WACT,OAAO,EA8CjB;IAzCC;;;OAGG;IACH,iBAAa;IAEb;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;;;;;;;;;;;;;;OAgBG;IACH,iBAAuE;IAGvE;;;OAGG;IACH,yBAAqD;IAGvD;;OAEG;IACH,eAFW,OAAO,QAcjB;IAUD,oDAEC;IAED,8DAGC;IAED,sMA+FC;IAED;;;OAGG;IACH,eAHW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,CA4F7D;CAgBF;wBAzWuB,4BAA4B;uCAK7C,oBAAoB"}