ol 7.3.0 → 7.3.1-dev

package/webgl/ShaderBuilder.d.ts

@@ -1,21 +1,3 @@
-/**
- * @typedef {Object} StyleParseResult
- * @property {ShaderBuilder} builder Shader builder pre-configured according to a given style
- * @property {Object<string,import("./Helper").UniformValue>} uniforms Uniform definitions.
- * @property {Array<import("../renderer/webgl/PointsLayer").CustomAttribute>} attributes Attribute descriptions.
- */
-/**
- * Parses a {@link import("../style/literal").LiteralStyle} object and returns a {@link ShaderBuilder}
- * object that has been configured according to the given style, as well as `attributes` and `uniforms`
- * arrays to be fed to the `WebGLPointsRenderer` class.
- *
- * Also returns `uniforms` and `attributes` properties as expected by the
- * {@link module:ol/renderer/webgl/PointsLayer~WebGLPointsLayerRenderer}.
- *
- * @param {import("../style/literal").LiteralStyle} style Literal style.
- * @return {StyleParseResult} Result containing shader params, attributes and uniforms.
- */
-export function parseLiteralStyle(style: import("../style/literal").LiteralStyle): StyleParseResult;
 /**
  * @typedef {Object} VaryingDescription
  * @property {string} name Varying name, as will be declared in the header.
@@ -33,7 +15,7 @@ export function parseLiteralStyle(style: import("../style/literal").LiteralStyle
  *   .addVarying('v_width', 'float', 'a_width')
  *   .addUniform('u_time')
  *   .setColorExpression('...')
- *   .setSizeExpression('...')
+ *   .setSymbolSizeExpression('...')
  *   .outputSymbolFragmentShader();
  * ```
  */
@@ -43,54 +25,79 @@ export class ShaderBuilder {
      * @type {Array<string>}
      * @private
      */
-    private uniforms;
+    private uniforms_;
     /**
      * Attributes; these will be declared in the header (should include the type).
      * @type {Array<string>}
      * @private
      */
-    private attributes;
+    private attributes_;
     /**
      * Varyings with a name, a type and an expression.
      * @type {Array<VaryingDescription>}
      * @private
      */
-    private varyings;
+    private varyings_;
     /**
      * @type {string}
      * @private
      */
-    private sizeExpression;
+    private symbolSizeExpression_;
     /**
      * @type {string}
      * @private
      */
-    private rotationExpression;
+    private symbolRotationExpression_;
     /**
      * @type {string}
      * @private
      */
-    private offsetExpression;
+    private symbolOffsetExpression_;
     /**
      * @type {string}
      * @private
      */
-    private colorExpression;
+    private symbolColorExpression_;
     /**
      * @type {string}
      * @private
      */
-    private texCoordExpression;
+    private texCoordExpression_;
     /**
      * @type {string}
      * @private
      */
-    private discardExpression;
+    private discardExpression_;
     /**
      * @type {boolean}
      * @private
      */
-    private rotateWithView;
+    private symbolRotateWithView_;
+    /**
+     * @type {string}
+     * @private
+     */
+    private strokeWidthExpression_;
+    /**
+     * @type {string}
+     * @private
+     */
+    private strokeColorExpression_;
+    /**
+     * @type {string}
+     * @private
+     */
+    private fillColorExpression_;
+    /**
+     * @type {Array<string>}
+     * @private
+     */
+    private vertexShaderFunctions_;
+    /**
+     * @type {Array<string>}
+     * @private
+     */
+    private fragmentShaderFunctions_;
     /**
      * Adds a uniform accessible in both fragment and vertex shaders.
      * The given name should include a type, such as `sampler2D u_texture`.
@@ -121,7 +128,7 @@ export class ShaderBuilder {
      * @param {string} expression Size expression
      * @return {ShaderBuilder} the builder object
      */
-    setSizeExpression(expression: string): ShaderBuilder;
+    setSymbolSizeExpression(expression: string): ShaderBuilder;
     /**
      * Sets an expression to compute the rotation of the shape.
      * This expression can use all the uniforms and attributes available
@@ -129,7 +136,7 @@ export class ShaderBuilder {
      * @param {string} expression Size expression
      * @return {ShaderBuilder} the builder object
      */
-    setRotationExpression(expression: string): ShaderBuilder;
+    setSymbolRotationExpression(expression: string): ShaderBuilder;
     /**
      * Sets an expression to compute the offset of the symbol from the point center.
      * This expression can use all the uniforms and attributes available
@@ -146,7 +153,7 @@ export class ShaderBuilder {
      * @param {string} expression Color expression
      * @return {ShaderBuilder} the builder object
      */
-    setColorExpression(expression: string): ShaderBuilder;
+    setSymbolColorExpression(expression: string): ShaderBuilder;
     /**
      * Sets an expression to compute the texture coordinates of the vertices.
      * This expression can use all the uniforms and attributes available
@@ -173,28 +180,16 @@ export class ShaderBuilder {
      */
     setSymbolRotateWithView(rotateWithView: boolean): ShaderBuilder;
     /**
-     * @return {string} Previously set size expression
-     */
-    getSizeExpression(): string;
-    /**
-     * @return {string} Previously set symbol offset expression
-     */
-    getOffsetExpression(): string;
-    /**
-     * @return {string} Previously set color expression
-     */
-    getColorExpression(): string;
-    /**
-     * @return {string} Previously set texture coordinate expression
-     */
-    getTextureCoordinateExpression(): string;
-    /**
-     * @return {string} Previously set fragment discard expression
+     * @param {string} expression Stroke width expression, returning value in pixels
+     * @return {ShaderBuilder} the builder object
      */
-    getFragmentDiscardExpression(): string;
+    setStrokeWidthExpression(expression: string): ShaderBuilder;
+    setStrokeColorExpression(expression: any): ShaderBuilder;
+    setFillColorExpression(expression: any): ShaderBuilder;
+    addVertexShaderFunction(code: any): void;
+    addFragmentShaderFunction(code: any): void;
     /**
-     * Generates a symbol vertex shader from the builder parameters,
-     * intended to be used on point geometries.
+     * Generates a symbol vertex shader from the builder parameters
      *
      * Four uniforms are hardcoded in all shaders: `u_projectionMatrix`, `u_offsetScaleMatrix`,
      * `u_offsetRotateMatrix`, `u_time`.
@@ -211,8 +206,7 @@ export class ShaderBuilder {
      */
     getSymbolVertexShader(forHitDetection?: boolean | undefined): string;
     /**
-     * Generates a symbol fragment shader from the builder parameters,
-     * intended to be used on point geometries.
+     * Generates a symbol fragment shader from the builder parameters
      *
      * Expects the following varyings to be transmitted by the vertex shader:
      * `vec2 v_quadCoord`, `vec2 v_texCoord`
@@ -222,23 +216,39 @@ export class ShaderBuilder {
      * @return {string} The full shader as a string.
      */
     getSymbolFragmentShader(forHitDetection?: boolean | undefined): string;
-}
-export type StyleParseResult = {
     /**
-     * Shader builder pre-configured according to a given style
+     * Generates a stroke vertex shader from the builder parameters
+     *
+     * @param {boolean} [forHitDetection] If true, the shader will be modified to include hit detection variables
+     * (namely, hit color with encoded feature id).
+     * @return {string} The full shader as a string.
+     */
+    getStrokeVertexShader(forHitDetection?: boolean | undefined): string;
+    /**
+     * Generates a stroke fragment shader from the builder parameters
+     *
+     * @param {boolean} [forHitDetection] If true, the shader will be modified to include hit detection variables
+     * (namely, hit color with encoded feature id).
+     * @return {string} The full shader as a string.
      */
-    builder: ShaderBuilder;
+    getStrokeFragmentShader(forHitDetection?: boolean | undefined): string;
     /**
-     * Uniform definitions.
+     * Generates a fill vertex shader from the builder parameters
+     *
+     * @param {boolean} [forHitDetection] If true, the shader will be modified to include hit detection variables
+     * (namely, hit color with encoded feature id).
+     * @return {string} The full shader as a string.
      */
-    uniforms: {
-        [x: string]: import("./Helper").UniformValue;
-    };
+    getFillVertexShader(forHitDetection?: boolean | undefined): string;
     /**
-     * Attribute descriptions.
+     * Generates a fill fragment shader from the builder parameters
+     *
+     * @param {boolean} [forHitDetection] If true, the shader will be modified to include hit detection variables
+     * (namely, hit color with encoded feature id).
+     * @return {string} The full shader as a string.
      */
-    attributes: Array<import("../renderer/webgl/PointsLayer").CustomAttribute>;
-};
+    getFillFragmentShader(forHitDetection?: boolean | undefined): string;
+}
 export type VaryingDescription = {
     /**
      * Varying name, as will be declared in the header.

package/webgl/ShaderBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ShaderBuilder.d.ts","sourceRoot":"","sources":["ShaderBuilder.js"],"names":[],"mappings":"AAwZA;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,yCAHW,OAAO,kBAAkB,EAAE,YAAY,GACtC,gBAAgB,CAuK3B;AAnkBD;;;;;;GAMG;AAEH;;;;;;;;;;;;;GAaG;AACH;IAEI;;;;OAIG;IACH,iBAAkB;IAElB;;;;OAIG;IACH,mBAAoB;IAEpB;;;;OAIG;IACH,iBAAkB;IAElB;;;OAGG;IACH,uBAAiC;IAEjC;;;OAGG;IACH,2BAA+B;IAE/B;;;OAGG;IACH,yBAAmC;IAEnC;;;OAGG;IACH,wBAAkC;IAElC;;;OAGG;IACH,2BAAoD;IAEpD;;;OAGG;IACH,0BAAgC;IAEhC;;;OAGG;IACH,uBAA2B;IAG7B;;;;;OAKG;IACH,iBAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;OAKG;IACH,mBAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;;OAOG;IACH,iBALW,MAAM,QACN,OAAO,GAAC,MAAM,GAAC,MAAM,GAAC,MAAM,cAC5B,MAAM,GACL,aAAa,CASxB;IAED;;;;;;OAMG;IACH,8BAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;OAMG;IACH,kCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;;OAOG;IACH,sCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;OAMG;IACH,+BAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;OAMG;IACH,2CAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;;;OAQG;IACH,yCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;OAKG;IACH,wCAHW,OAAO,GACN,aAAa,CAKxB;IAED;;OAEG;IACH,qBAFY,MAAM,CAIjB;IAED;;OAEG;IACH,uBAFY,MAAM,CAIjB;IAED;;OAEG;IACH,sBAFY,MAAM,CAIjB;IAED;;OAEG;IACH,kCAFY,MAAM,CAIjB;IAED;;OAEG;IACH,gCAFY,MAAM,CAIjB;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,8DAFY,MAAM,CAgFjB;IAED;;;;;;;;;;OAUG;IACH,gEAFY,MAAM,CAuCjB;CACF;;;;;aAIa,aAAa;;;;;YACN,MAAM,GAAC,OAAO,UAAU,EAAE,YAAY;;;;;gBAC7C,MAAM,OAAO,+BAA+B,EAAE,eAAe,CAAC;;;;;;UA9Y9D,MAAM;;;;UACN,MAAM;;;;;gBACN,MAAM"}
+{"version":3,"file":"ShaderBuilder.d.ts","sourceRoot":"","sources":["ShaderBuilder.js"],"names":[],"mappings":"AAeA;;;;;;GAMG;AAEH;;;;;;;;;;;;;GAaG;AACH;IAEI;;;;OAIG;IACH,kBAAmB;IAEnB;;;;OAIG;IACH,oBAAqB;IAErB;;;;OAIG;IACH,kBAAmB;IAEnB;;;OAGG;IACH,8BAAwC;IAExC;;;OAGG;IACH,kCAAsC;IAEtC;;;OAGG;IACH,gCAA0C;IAE1C;;;OAGG;IACH,+BAAyC;IAEzC;;;OAGG;IACH,4BAAqD;IAErD;;;OAGG;IACH,2BAAiC;IAEjC;;;OAGG;IACH,8BAAkC;IAElC;;;OAGG;IACH,+BAAmC;IAEnC;;;OAGG;IACH,+BAAyC;IAEzC;;;OAGG;IACH,6BAAuC;IAEvC;;;OAGG;IACH,+BAAgC;IAEhC;;;OAGG;IACH,iCAAkC;IAGpC;;;;;OAKG;IACH,iBAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;OAKG;IACH,mBAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;;OAOG;IACH,iBALW,MAAM,QACN,OAAO,GAAC,MAAM,GAAC,MAAM,GAAC,MAAM,cAC5B,MAAM,GACL,aAAa,CASxB;IAED;;;;;;OAMG;IACH,oCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;OAMG;IACH,wCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;;OAOG;IACH,sCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;OAMG;IACH,qCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;OAMG;IACH,2CAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;;;OAQG;IACH,yCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;OAKG;IACH,wCAHW,OAAO,GACN,aAAa,CAKxB;IAED;;;OAGG;IACH,qCAHW,MAAM,GACL,aAAa,CAKxB;IAED,yDAGC;IAED,uDAGC;IAED,yCAKC;IACD,2CAKC;IAED;;;;;;;;;;;;;;;OAeG;IACH,8DAFY,MAAM,CAiFjB;IAED;;;;;;;;;OASG;IACH,gEAFY,MAAM,CAwCjB;IAED;;;;;;OAMG;IACH,8DAFY,MAAM,CA6FjB;IAED;;;;;;OAMG;IACH,gEAFY,MAAM,CAwEjB;IAED;;;;;;OAMG;IACH,4DAFY,MAAM,CA8CjB;IAED;;;;;;OAMG;IACH,8DAFY,MAAM,CAyDjB;CACF;;;;;UA3sBa,MAAM;;;;UACN,MAAM;;;;;gBACN,MAAM"}