ol 7.0.0-dev.1658443472213 → 7.0.0-dev.1658477212801

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "7.0.0-dev.1658443472213",
+  "version": "7.0.0-dev.1658477212801",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",
@@ -22,6 +22,7 @@
     "url": "https://opencollective.com/openlayers"
   },
   "dependencies": {
+    "earcut": "^2.2.3",
     "geotiff": "2.0.4",
     "ol-mapbox-style": "^8.0.5",
     "pbf": "3.2.1",

package/render/webgl/BatchRenderer.d.ts

@@ -0,0 +1,92 @@
+export default AbstractBatchRenderer;
+/**
+ * A description of a custom attribute to be passed on to the GPU, with a value different
+ * for each feature.
+ */
+export type CustomAttribute = {
+    /**
+     * Attribute name.
+     */
+    name: string;
+    /**
+     * This callback computes the numerical value of the
+     * attribute for a given feature.
+     */
+    callback: (arg0: import("../../Feature").default) => number;
+};
+/**
+ * @classdesc Abstract class for batch renderers.
+ * Batch renderers are meant to render the geometries contained in a {@link module:ol/render/webgl/GeometryBatch}
+ * instance. They are responsible for generating render instructions and transforming them into WebGL buffers.
+ */
+declare class AbstractBatchRenderer {
+    /**
+     * @param {import("../../webgl/Helper.js").default} helper WebGL helper instance
+     * @param {Worker} worker WebGL worker instance
+     * @param {string} vertexShader Vertex shader
+     * @param {string} fragmentShader Fragment shader
+     * @param {Array<CustomAttribute>} customAttributes List of custom attributes
+     */
+    constructor(helper: import("../../webgl/Helper.js").default, worker: Worker, vertexShader: string, fragmentShader: string, customAttributes: Array<CustomAttribute>);
+    /**
+     * @type {import("../../webgl/Helper.js").default}
+     * @private
+     */
+    private helper_;
+    /**
+     * @type {Worker}
+     * @private
+     */
+    private worker_;
+    /**
+     * @type {WebGLProgram}
+     * @private
+     */
+    private program_;
+    /**
+     * A list of attributes used by the renderer.
+     * @type {Array<import('../../webgl/Helper.js').AttributeDescription>}
+     * @protected
+     */
+    protected attributes: Array<import('../../webgl/Helper.js').AttributeDescription>;
+    /**
+     * @type {Array<CustomAttribute>}
+     * @protected
+     */
+    protected customAttributes: Array<CustomAttribute>;
+    /**
+     * Rebuild rendering instructions and webgl buffers based on the provided frame state
+     * Note: this is a costly operation.
+     * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
+     * @param {import("../../PluggableMap").FrameState} frameState Frame state.
+     * @param {import("../../geom/Geometry.js").Type} geometryType Geometry type
+     * @param {function(): void} callback Function called once the render buffers are updated
+     */
+    rebuild(batch: import("./MixedGeometryBatch.js").GeometryBatch, frameState: import("../../PluggableMap").FrameState, geometryType: import("../../geom/Geometry.js").Type, callback: () => void): void;
+    /**
+     * Render the geometries in the batch. This will also update the current transform used for rendering according to
+     * the invert transform of the webgl buffers
+     * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
+     * @param {import("../../transform.js").Transform} currentTransform Transform
+     * @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
+     * @param {number} offsetX X offset
+     */
+    render(batch: import("./MixedGeometryBatch.js").GeometryBatch, currentTransform: import("../../transform.js").Transform, frameState: import("../../PluggableMap.js").FrameState, offsetX: number): void;
+    /**
+     * Rebuild rendering instructions based on the provided frame state
+     * This is specific to the geometry type and has to be implemented by subclasses.
+     * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
+     * @protected
+     */
+    protected generateRenderInstructions(batch: import("./MixedGeometryBatch.js").GeometryBatch): void;
+    /**
+     * Rebuild internal webgl buffers for rendering based on the current rendering instructions;
+     * This is asynchronous: webgl buffers wil _not_ be updated right away
+     * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
+     * @param {import("../../geom/Geometry.js").Type} geometryType Geometry type
+     * @param {function(): void} callback Function called once the render buffers are updated
+     * @private
+     */
+    private generateBuffers_;
+}
+//# sourceMappingURL=BatchRenderer.d.ts.map

package/render/webgl/BatchRenderer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BatchRenderer.d.ts","sourceRoot":"","sources":["../../src/render/webgl/BatchRenderer.js"],"names":[],"mappings":";;;;;;;;;UAec,MAAM;;;;;qBACG,OAAO,eAAe,EAAE,OAAO,KAAE,MAAM;;AAM9D;;;;GAIG;AACH;IACE;;;;;;OAMG;IACH,oBANW,OAAO,uBAAuB,EAAE,OAAO,UACvC,MAAM,gBACN,MAAM,kBACN,MAAM,oBACN,MAAM,eAAe,CAAC,EAiChC;IA9BC;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,iBAAqE;IAErE;;;;OAIG;IACH,sBAHU,MAAM,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAGjD;IAEpB;;;OAGG;IACH,4BAHU,MAAM,eAAe,CAAC,CAGQ;IAG1C;;;;;;;OAOG;IACH,eALW,OAAO,yBAAyB,EAAE,aAAa,cAC/C,OAAO,oBAAoB,EAAE,UAAU,gBACvC,OAAO,wBAAwB,EAAE,IAAI,kBACzB,IAAI,QAU1B;IAED;;;;;;;OAOG;IACH,cALW,OAAO,yBAAyB,EAAE,aAAa,oBAC/C,OAAO,oBAAoB,EAAE,SAAS,cACtC,OAAO,uBAAuB,EAAE,UAAU,WAC1C,MAAM,QAgBhB;IAED;;;;;OAKG;IACH,4CAHW,OAAO,yBAAyB,EAAE,aAAa,QAKzD;IAED;;;;;;;OAOG;IACH,yBAqEC;CACF"}

package/render/webgl/BatchRenderer.js

@@ -0,0 +1,165 @@
+/**
+ * @module ol/render/webgl/BatchRenderer
+ */
+import { WebGLWorkerMessageType } from './constants.js';
+import { abstract } from '../../util.js';
+import { create as createTransform, makeInverse as makeInverseTransform, multiply as multiplyTransform, translate as translateTransform, } from '../../transform.js';
+/**
+ * @typedef {Object} CustomAttribute A description of a custom attribute to be passed on to the GPU, with a value different
+ * for each feature.
+ * @property {string} name Attribute name.
+ * @property {function(import("../../Feature").default):number} callback This callback computes the numerical value of the
+ * attribute for a given feature.
+ */
+var workerMessageCounter = 0;
+/**
+ * @classdesc Abstract class for batch renderers.
+ * Batch renderers are meant to render the geometries contained in a {@link module:ol/render/webgl/GeometryBatch}
+ * instance. They are responsible for generating render instructions and transforming them into WebGL buffers.
+ */
+var AbstractBatchRenderer = /** @class */ (function () {
+    /**
+     * @param {import("../../webgl/Helper.js").default} helper WebGL helper instance
+     * @param {Worker} worker WebGL worker instance
+     * @param {string} vertexShader Vertex shader
+     * @param {string} fragmentShader Fragment shader
+     * @param {Array<CustomAttribute>} customAttributes List of custom attributes
+     */
+    function AbstractBatchRenderer(helper, worker, vertexShader, fragmentShader, customAttributes) {
+        /**
+         * @type {import("../../webgl/Helper.js").default}
+         * @private
+         */
+        this.helper_ = helper;
+        /**
+         * @type {Worker}
+         * @private
+         */
+        this.worker_ = worker;
+        /**
+         * @type {WebGLProgram}
+         * @private
+         */
+        this.program_ = this.helper_.getProgram(fragmentShader, vertexShader);
+        /**
+         * A list of attributes used by the renderer.
+         * @type {Array<import('../../webgl/Helper.js').AttributeDescription>}
+         * @protected
+         */
+        this.attributes = [];
+        /**
+         * @type {Array<CustomAttribute>}
+         * @protected
+         */
+        this.customAttributes = customAttributes;
+    }
+    /**
+     * Rebuild rendering instructions and webgl buffers based on the provided frame state
+     * Note: this is a costly operation.
+     * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
+     * @param {import("../../PluggableMap").FrameState} frameState Frame state.
+     * @param {import("../../geom/Geometry.js").Type} geometryType Geometry type
+     * @param {function(): void} callback Function called once the render buffers are updated
+     */
+    AbstractBatchRenderer.prototype.rebuild = function (batch, frameState, geometryType, callback) {
+        // store transform for rendering instructions
+        batch.renderInstructionsTransform = this.helper_.makeProjectionTransform(frameState, createTransform());
+        this.generateRenderInstructions(batch);
+        this.generateBuffers_(batch, geometryType, callback);
+    };
+    /**
+     * Render the geometries in the batch. This will also update the current transform used for rendering according to
+     * the invert transform of the webgl buffers
+     * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
+     * @param {import("../../transform.js").Transform} currentTransform Transform
+     * @param {import("../../PluggableMap.js").FrameState} frameState Frame state.
+     * @param {number} offsetX X offset
+     */
+    AbstractBatchRenderer.prototype.render = function (batch, currentTransform, frameState, offsetX) {
+        // multiply the current projection transform with the invert of the one used to fill buffers
+        this.helper_.makeProjectionTransform(frameState, currentTransform);
+        translateTransform(currentTransform, offsetX, 0);
+        multiplyTransform(currentTransform, batch.invertVerticesBufferTransform);
+        // enable program, buffers and attributes
+        this.helper_.useProgram(this.program_, frameState);
+        this.helper_.bindBuffer(batch.verticesBuffer);
+        this.helper_.bindBuffer(batch.indicesBuffer);
+        this.helper_.enableAttributes(this.attributes);
+        var renderCount = batch.indicesBuffer.getSize();
+        this.helper_.drawElements(0, renderCount);
+    };
+    /**
+     * Rebuild rendering instructions based on the provided frame state
+     * This is specific to the geometry type and has to be implemented by subclasses.
+     * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
+     * @protected
+     */
+    AbstractBatchRenderer.prototype.generateRenderInstructions = function (batch) {
+        abstract();
+    };
+    /**
+     * Rebuild internal webgl buffers for rendering based on the current rendering instructions;
+     * This is asynchronous: webgl buffers wil _not_ be updated right away
+     * @param {import("./MixedGeometryBatch.js").GeometryBatch} batch Geometry batch
+     * @param {import("../../geom/Geometry.js").Type} geometryType Geometry type
+     * @param {function(): void} callback Function called once the render buffers are updated
+     * @private
+     */
+    AbstractBatchRenderer.prototype.generateBuffers_ = function (batch, geometryType, callback) {
+        var messageId = workerMessageCounter++;
+        var messageType;
+        switch (geometryType) {
+            case 'Polygon':
+                messageType = WebGLWorkerMessageType.GENERATE_POLYGON_BUFFERS;
+                break;
+            case 'Point':
+                messageType = WebGLWorkerMessageType.GENERATE_POINT_BUFFERS;
+                break;
+            case 'LineString':
+                messageType = WebGLWorkerMessageType.GENERATE_LINE_STRING_BUFFERS;
+                break;
+            default:
+            // pass
+        }
+        /** @type {import('./constants.js').WebGLWorkerGenerateBuffersMessage} */
+        var message = {
+            id: messageId,
+            type: messageType,
+            renderInstructions: batch.renderInstructions.buffer,
+            renderInstructionsTransform: batch.renderInstructionsTransform,
+            customAttributesCount: this.customAttributes.length,
+        };
+        this.worker_.postMessage(message, [batch.renderInstructions.buffer]);
+        // leave ownership of render instructions
+        batch.renderInstructions = null;
+        var handleMessage = 
+        /**
+         * @param {*} event Event.
+         * @this {AbstractBatchRenderer}
+         */
+        function (event) {
+            var received = event.data;
+            // this is not the response to our request: skip
+            if (received.id !== messageId) {
+                return;
+            }
+            // we've received our response: stop listening
+            this.worker_.removeEventListener('message', handleMessage);
+            // store transform & invert transform for webgl buffers
+            batch.verticesBufferTransform = received.renderInstructionsTransform;
+            makeInverseTransform(batch.invertVerticesBufferTransform, batch.verticesBufferTransform);
+            // copy & flush received buffers to GPU
+            batch.verticesBuffer.fromArrayBuffer(received.vertexBuffer);
+            this.helper_.flushBufferData(batch.verticesBuffer);
+            batch.indicesBuffer.fromArrayBuffer(received.indexBuffer);
+            this.helper_.flushBufferData(batch.indicesBuffer);
+            // take back ownership of the render instructions for further use
+            batch.renderInstructions = new Float32Array(received.renderInstructions);
+            callback();
+        }.bind(this);
+        this.worker_.addEventListener('message', handleMessage);
+    };
+    return AbstractBatchRenderer;
+}());
+export default AbstractBatchRenderer;
+//# sourceMappingURL=BatchRenderer.js.map

package/render/webgl/BatchRenderer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BatchRenderer.js","sourceRoot":"","sources":["../../src/render/webgl/BatchRenderer.js"],"names":[],"mappings":"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"}

package/render/webgl/LineStringBatchRenderer.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Names of attributes made available to the vertex shader.
+ * Please note: changing these *will* break custom shaders!
+ */
+export type Attributes = string;
+export namespace Attributes {
+    const SEGMENT_START: string;
+    const SEGMENT_END: string;
+    const PARAMETERS: string;
+}
+export default LineStringBatchRenderer;
+declare class LineStringBatchRenderer extends AbstractBatchRenderer {
+    attributes: {
+        name: string;
+        size: number;
+        type: number;
+    }[];
+    /**
+     * Render instructions for lines are structured like so:
+     * [ customAttr0, ... , customAttrN, numberOfVertices0, x0, y0, ... , xN, yN, numberOfVertices1, ... ]
+     * @param {import("./MixedGeometryBatch.js").LineStringGeometryBatch} batch Linestring geometry batch
+     * @override
+     */
+    override generateRenderInstructions(batch: import("./MixedGeometryBatch.js").LineStringGeometryBatch): void;
+}
+import AbstractBatchRenderer from "./BatchRenderer.js";
+//# sourceMappingURL=LineStringBatchRenderer.d.ts.map

package/render/webgl/LineStringBatchRenderer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LineStringBatchRenderer.d.ts","sourceRoot":"","sources":["../../src/render/webgl/LineStringBatchRenderer.js"],"names":[],"mappings":";;;;yBAUU,MAAM;;;;;;;AAQhB;IAYI;;;;QAwBC;IAGH;;;;;OAKG;IACH,2CAHW,OAAO,yBAAyB,EAAE,uBAAuB,QAoDnE;CACF"}

package/render/webgl/LineStringBatchRenderer.js

@@ -0,0 +1,114 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+/**
+ * @module ol/render/webgl/LineStringBatchRenderer
+ */
+import AbstractBatchRenderer from './BatchRenderer.js';
+import { AttributeType } from '../../webgl/Helper.js';
+import { transform2D } from '../../geom/flat/transform.js';
+/**
+ * Names of attributes made available to the vertex shader.
+ * Please note: changing these *will* break custom shaders!
+ * @enum {string}
+ */
+export var Attributes = {
+    SEGMENT_START: 'a_segmentStart',
+    SEGMENT_END: 'a_segmentEnd',
+    PARAMETERS: 'a_parameters',
+};
+var LineStringBatchRenderer = /** @class */ (function (_super) {
+    __extends(LineStringBatchRenderer, _super);
+    /**
+     * @param {import("../../webgl/Helper.js").default} helper WebGL helper instance
+     * @param {Worker} worker WebGL worker instance
+     * @param {string} vertexShader Vertex shader
+     * @param {string} fragmentShader Fragment shader
+     * @param {Array<import('./BatchRenderer.js').CustomAttribute>} customAttributes List of custom attributes
+     */
+    function LineStringBatchRenderer(helper, worker, vertexShader, fragmentShader, customAttributes) {
+        var _this = _super.call(this, helper, worker, vertexShader, fragmentShader, customAttributes) || this;
+        // vertices for lines must hold both a position (x,y) and an offset (dx,dy)
+        _this.attributes = [
+            {
+                name: Attributes.SEGMENT_START,
+                size: 2,
+                type: AttributeType.FLOAT,
+            },
+            {
+                name: Attributes.SEGMENT_END,
+                size: 2,
+                type: AttributeType.FLOAT,
+            },
+            {
+                name: Attributes.PARAMETERS,
+                size: 1,
+                type: AttributeType.FLOAT,
+            },
+        ].concat(customAttributes.map(function (attribute) {
+            return {
+                name: 'a_' + attribute.name,
+                size: 1,
+                type: AttributeType.FLOAT,
+            };
+        }));
+        return _this;
+    }
+    /**
+     * Render instructions for lines are structured like so:
+     * [ customAttr0, ... , customAttrN, numberOfVertices0, x0, y0, ... , xN, yN, numberOfVertices1, ... ]
+     * @param {import("./MixedGeometryBatch.js").LineStringGeometryBatch} batch Linestring geometry batch
+     * @override
+     */
+    LineStringBatchRenderer.prototype.generateRenderInstructions = function (batch) {
+        // here we anticipate the amount of render instructions for lines:
+        // 2 instructions per vertex for position (x and y)
+        // + 1 instruction per line per custom attributes
+        // + 1 instruction per line (for vertices count)
+        var totalInstructionsCount = 2 * batch.verticesCount +
+            (1 + this.customAttributes.length) * batch.geometriesCount;
+        if (!batch.renderInstructions ||
+            batch.renderInstructions.length !== totalInstructionsCount) {
+            batch.renderInstructions = new Float32Array(totalInstructionsCount);
+        }
+        // loop on features to fill the render instructions
+        var batchEntry;
+        var flatCoords = [];
+        var renderIndex = 0;
+        var value;
+        for (var featureUid in batch.entries) {
+            batchEntry = batch.entries[featureUid];
+            for (var i = 0, ii = batchEntry.flatCoordss.length; i < ii; i++) {
+                flatCoords.length = batchEntry.flatCoordss[i].length;
+                transform2D(batchEntry.flatCoordss[i], 0, flatCoords.length, 2, batch.renderInstructionsTransform, flatCoords);
+                // custom attributes
+                for (var k = 0, kk = this.customAttributes.length; k < kk; k++) {
+                    value = this.customAttributes[k].callback(batchEntry.feature);
+                    batch.renderInstructions[renderIndex++] = value;
+                }
+                // vertices count
+                batch.renderInstructions[renderIndex++] = flatCoords.length / 2;
+                // looping on points for positions
+                for (var j = 0, jj = flatCoords.length; j < jj; j += 2) {
+                    batch.renderInstructions[renderIndex++] = flatCoords[j];
+                    batch.renderInstructions[renderIndex++] = flatCoords[j + 1];
+                }
+            }
+        }
+    };
+    return LineStringBatchRenderer;
+}(AbstractBatchRenderer));
+export default LineStringBatchRenderer;
+//# sourceMappingURL=LineStringBatchRenderer.js.map

package/render/webgl/LineStringBatchRenderer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LineStringBatchRenderer.js","sourceRoot":"","sources":["../../src/render/webgl/LineStringBatchRenderer.js"],"names":[],"mappings":"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"}