ol 7.5.1 → 8.0.0-dev.1692053484481

package/style/literal.d.ts

@@ -1,10 +1,3 @@
-export type SymbolType = string;
-export namespace SymbolType {
-    let CIRCLE: string;
-    let SQUARE: string;
-    let TRIANGLE: string;
-    let IMAGE: string;
-}
 export type ExpressionValue = import("./expressions.js").ExpressionValue;
 export type ColorExpression = import("../color.js").Color | string | Array<ExpressionValue>;
 export type BaseProps = {
@@ -20,52 +13,6 @@ export type BaseProps = {
     variables?: {
         [x: string]: string | number | boolean | number[];
     } | undefined;
-    /**
-     * Symbol representation.
-     */
-    symbol?: LiteralSymbolStyle | undefined;
-};
-export type LiteralSymbolStyle = {
-    /**
-     * Size, mandatory.
-     */
-    size: ExpressionValue | Array<ExpressionValue>;
-    /**
-     * Symbol type to use, either a regular shape or an image.
-     */
-    symbolType: SymbolType;
-    /**
-     * Path to the image to be used for the symbol. Only required with `symbolType: 'image'`.
-     */
-    src?: string | undefined;
-    /**
-     * The `crossOrigin` attribute for loading `src`.
-     */
-    crossOrigin?: string | undefined;
-    /**
-     * Color used for the representation (either fill, line or symbol).
-     */
-    color?: ColorExpression | undefined;
-    /**
-     * Opacity.
-     */
-    opacity?: import("./expressions.js").ExpressionValue | undefined;
-    /**
-     * Symbol rotation in radians.
-     */
-    rotation?: import("./expressions.js").ExpressionValue | undefined;
-    /**
-     * Offset on X and Y axis for symbols. If not specified, the symbol will be centered.
-     */
-    offset?: import("./expressions.js").ExpressionValue[] | undefined;
-    /**
-     * Texture coordinates. If not specified, the whole texture will be used (range for 0 to 1 on both axes).
-     */
-    textureCoord?: import("./expressions.js").ExpressionValue[] | undefined;
-    /**
-     * Specify whether the symbol must rotate with the view or stay upwards.
-     */
-    rotateWithView?: boolean | undefined;
 };
 export type FillProps = {
     /**
@@ -102,7 +49,7 @@ export type IconProps = {
     /**
      * Anchor. Default value is the icon center.
      */
-    "icon-anchor"?: number[] | undefined;
+    "icon-anchor"?: number[] | import("./expressions.js").ExpressionValue | undefined;
     /**
      * Origin of the anchor: `bottom-left`, `bottom-right`,
      * `top-left` or `top-right`.
@@ -125,34 +72,24 @@ export type IconProps = {
      * the icon will be left as is.
      */
     "icon-color"?: ColorExpression | undefined;
+    /**
+     * Opacity of the icon.
+     */
+    "icon-opacity"?: import("./expressions.js").ExpressionValue | undefined;
     /**
      * The `crossOrigin` attribute for loaded images. Note that you must provide a
      * `icon-cross-origin` value if you want to access pixel data with the Canvas renderer.
      * See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
      */
     "icon-cross-origin"?: string | null | undefined;
-    /**
-     * Offset, which, together with the size and the offset origin, define the
-     * sub-rectangle to use from the original icon image.
-     */
-    "icon-offset"?: number[] | import("./expressions.js").ExpressionValue[] | undefined;
     /**
      * Displacement of the icon.
      */
-    "icon-displacement"?: number[] | import("./expressions.js").ExpressionValue[] | undefined;
-    /**
-     * Origin of the offset: `bottom-left`, `bottom-right`,
-     * `top-left` or `top-right`.
-     */
-    "icon-offset-origin"?: import("./Icon.js").IconOrigin | undefined;
-    /**
-     * Opacity of the icon.
-     */
-    "icon-opacity"?: number | undefined;
+    "icon-displacement"?: number[] | import("./expressions.js").ExpressionValue | undefined;
     /**
      * Scale.
      */
-    "icon-scale"?: import("../size.js").Size | import("./expressions.js").ExpressionValue | import("./expressions.js").ExpressionValue[] | undefined;
+    "icon-scale"?: import("../size.js").Size | import("./expressions.js").ExpressionValue | undefined;
     /**
      * Width of the icon. If not specified, the actual image width will be used. Cannot be combined
      * with `scale`.
@@ -171,18 +108,28 @@ export type IconProps = {
      * Whether to rotate the icon with the view.
      */
     "icon-rotate-with-view"?: boolean | undefined;
+    /**
+     * Offset, which, together with the size and the offset origin, define the
+     * sub-rectangle to use from the original icon image.
+     */
+    "icon-offset"?: number[] | import("./expressions.js").ExpressionValue | undefined;
+    /**
+     * Origin of the offset: `bottom-left`, `bottom-right`,
+     * `top-left` or `top-right`.
+     */
+    "icon-offset-origin"?: import("./Icon.js").IconOrigin | undefined;
     /**
      * Icon size in pixel. Can be used together with `icon-offset` to define the
      * sub-rectangle to use from the origin (sprite) icon image.
      */
-    "icon-size"?: import("../size.js").Size | import("./expressions.js").ExpressionValue[] | undefined;
+    "icon-size"?: import("../size.js").Size | import("./expressions.js").ExpressionValue | undefined;
 };
 export type ShapeProps = {
     /**
      * Number of points for stars and regular polygons. In case of a polygon, the number of points
      * is the number of sides.
      */
-    "shape-points"?: number | undefined;
+    "shape-points"?: import("./expressions.js").ExpressionValue | undefined;
     /**
      * The fill color.
      */
@@ -195,6 +142,10 @@ export type ShapeProps = {
      * Stroke pixel width.
      */
     "shape-stroke-width"?: import("./expressions.js").ExpressionValue | undefined;
+    /**
+     * Shape opacity.
+     */
+    "shape-opacity"?: import("./expressions.js").ExpressionValue | undefined;
     /**
      * Radius of a regular polygon.
      */
@@ -246,6 +197,10 @@ export type CircleProps = {
      * Stroke pixel width.
      */
     "circle-stroke-width"?: import("./expressions.js").ExpressionValue | undefined;
+    /**
+     * Circle opacity.
+     */
+    "circle-opacity"?: import("./expressions.js").ExpressionValue | undefined;
     /**
      * displacement
      */

package/style/literal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"literal.d.ts","sourceRoot":"","sources":["literal.js"],"names":[],"mappings":"yBAuBU,MAAM;;;;;;;8BAhBH,OAAO,kBAAkB,EAAE,eAAe;8BAG1C,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GAAC,MAAM,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;UAwBxD,eAAe,GAAC,MAAM,eAAe,CAAC;;;;gBACtC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BA4GX,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,GAAG,UAAU"}
+{"version":3,"file":"literal.d.ts","sourceRoot":"","sources":["literal.js"],"names":[],"mappings":"8BAOa,OAAO,kBAAkB,EAAE,eAAe;8BAG1C,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GAAC,MAAM,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BA8GzD,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,GAAG,UAAU"}

package/style/literal.js

@@ -17,31 +17,6 @@
  * point will be displayed. If undefined, all points will show.
  * @property {Object<string, number | Array<number> | string | boolean>} [variables] Style variables; each variable must hold a number.
  * Note: **this object is meant to be mutated**: changes to the values will immediately be visible on the rendered features
- * @property {LiteralSymbolStyle} [symbol] Symbol representation.
- */
-
-/**
- * @enum {string}
- */
-export const SymbolType = {
-  CIRCLE: 'circle',
-  SQUARE: 'square',
-  TRIANGLE: 'triangle',
-  IMAGE: 'image',
-};
-
-/**
- * @typedef {Object} LiteralSymbolStyle
- * @property {ExpressionValue|Array<ExpressionValue>} size Size, mandatory.
- * @property {SymbolType} symbolType Symbol type to use, either a regular shape or an image.
- * @property {string} [src] Path to the image to be used for the symbol. Only required with `symbolType: 'image'`.
- * @property {string} [crossOrigin='anonymous'] The `crossOrigin` attribute for loading `src`.
- * @property {ColorExpression} [color] Color used for the representation (either fill, line or symbol).
- * @property {ExpressionValue} [opacity=1] Opacity.
- * @property {ExpressionValue} [rotation=0] Symbol rotation in radians.
- * @property {Array<ExpressionValue, ExpressionValue>} [offset] Offset on X and Y axis for symbols. If not specified, the symbol will be centered.
- * @property {Array<ExpressionValue, ExpressionValue, ExpressionValue, ExpressionValue>} [textureCoord] Texture coordinates. If not specified, the whole texture will be used (range for 0 to 1 on both axes).
- * @property {boolean} [rotateWithView=false] Specify whether the symbol must rotate with the view or stay upwards.
  */
 
 /**
@@ -63,7 +38,7 @@ export const SymbolType = {
  * to provide the size of the image, with the `icon-img-size` option.
  * @property {import("../size.js").Size} [icon-img-size] Image size in pixels. Only required if `icon-img` is set and `icon-src` is not.
  * The provided size needs to match the actual size of the image.
- * @property {Array<number>} [icon-anchor=[0.5, 0.5]] Anchor. Default value is the icon center.
+ * @property {Array<number>|ExpressionValue} [icon-anchor=[0.5, 0.5]] Anchor. Default value is the icon center.
  * @property {import("./Icon.js").IconOrigin} [icon-anchor-origin='top-left'] Origin of the anchor: `bottom-left`, `bottom-right`,
  * `top-left` or `top-right`.
  * @property {import("./Icon.js").IconAnchorUnits} [icon-anchor-x-units='fraction'] Units in which the anchor x value is
@@ -74,33 +49,34 @@ export const SymbolType = {
  * the y value in pixels.
  * @property {ColorExpression} [icon-color] Color to tint the icon. If not specified,
  * the icon will be left as is.
+ * @property {ExpressionValue|number} [icon-opacity=1] Opacity of the icon.
  * @property {null|string} [icon-cross-origin] The `crossOrigin` attribute for loaded images. Note that you must provide a
  * `icon-cross-origin` value if you want to access pixel data with the Canvas renderer.
  * See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
- * @property {Array<number>|Array<ExpressionValue>} [icon-offset=[0, 0]] Offset, which, together with the size and the offset origin, define the
- * sub-rectangle to use from the original icon image.
- * @property {Array<number>|Array<ExpressionValue>} [icon-displacement=[0,0]] Displacement of the icon.
- * @property {import("./Icon.js").IconOrigin} [icon-offset-origin='top-left'] Origin of the offset: `bottom-left`, `bottom-right`,
- * `top-left` or `top-right`.
- * @property {number} [icon-opacity=1] Opacity of the icon.
- * @property {ExpressionValue|Array<ExpressionValue>|number|import("../size.js").Size} [icon-scale=1] Scale.
+ * @property {Array<number>|ExpressionValue} [icon-displacement=[0,0]] Displacement of the icon.
+ * @property {ExpressionValue|number|import("../size.js").Size} [icon-scale=1] Scale.
  * @property {ExpressionValue|number} [icon-width] Width of the icon. If not specified, the actual image width will be used. Cannot be combined
  * with `scale`.
  * @property {ExpressionValue|number} [icon-height] Height of the icon. If not specified, the actual image height will be used. Cannot be combined
  * with `scale`.
  * @property {ExpressionValue|number} [icon-rotation=0] Rotation in radians (positive rotation clockwise).
  * @property {boolean} [icon-rotate-with-view=false] Whether to rotate the icon with the view.
- * @property {Array<ExpressionValue>|import("../size.js").Size} [icon-size] Icon size in pixel. Can be used together with `icon-offset` to define the
+ * @property {Array<number>|ExpressionValue} [icon-offset=[0, 0]] Offset, which, together with the size and the offset origin, define the
+ * sub-rectangle to use from the original icon image.
+ * @property {import("./Icon.js").IconOrigin} [icon-offset-origin='top-left'] Origin of the offset: `bottom-left`, `bottom-right`,
+ * `top-left` or `top-right`.
+ * @property {ExpressionValue|import("../size.js").Size} [icon-size] Icon size in pixel. Can be used together with `icon-offset` to define the
  * sub-rectangle to use from the origin (sprite) icon image.
  */
 
 /**
  * @typedef {Object} ShapeProps
- * @property {number} [shape-points] Number of points for stars and regular polygons. In case of a polygon, the number of points
+ * @property {ExpressionValue|number} [shape-points] Number of points for stars and regular polygons. In case of a polygon, the number of points
  * is the number of sides.
  * @property {ColorExpression} [shape-fill-color] The fill color.
  * @property {ColorExpression} [shape-stroke-color] The stroke color.
  * @property {ExpressionValue|number} [shape-stroke-width] Stroke pixel width.
+ * @property {ExpressionValue|number} [shape-opacity] Shape opacity.
  * @property {ExpressionValue|number} [shape-radius] Radius of a regular polygon.
  * @property {ExpressionValue|number} [shape-radius1] First radius of a star. Ignored if radius is set.
  * @property {ExpressionValue|number} [shape-radius2] Second radius of a star.
@@ -118,6 +94,7 @@ export const SymbolType = {
  * @property {ColorExpression} [circle-fill-color] The fill color.
  * @property {ColorExpression} [circle-stroke-color] The stroke color.
  * @property {ExpressionValue|number} [circle-stroke-width] Stroke pixel width.
+ * @property {ExpressionValue|number} [circle-opacity] Circle opacity.
  * @property {Array<ExpressionValue>|Array<number>} [circle-displacement=[0,0]] displacement
  * @property {ExpressionValue|Array<ExpressionValue>|number|import("../size.js").Size} [circle-scale=1] Scale. A two dimensional scale will produce an ellipse.
  * Unless two dimensional scaling is required a better result may be obtained with an appropriate setting for `circle-radius`.
@@ -143,3 +120,5 @@ export const SymbolType = {
 /**
  * @typedef {BaseProps & IconProps & StrokeProps & FillProps & CircleProps & ShapeProps} LiteralStyle
  */
+
+export {};

package/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["util.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,4BAFY,KAAK,CAIhB;AASD;;;;;;;;GAQG;AACH,kCAHY,MAAM,CAKjB;AAED;;;GAGG;AACH,sBAFU,MAAM,CAEe"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["util.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,4BAFY,KAAK,CAIhB;AASD;;;;;;;;GAQG;AACH,kCAHY,MAAM,CAKjB;AAED;;;GAGG;AACH,sBAFU,MAAM,CAEiC"}

package/util.js

@@ -33,4 +33,4 @@ export function getUid(obj) {
  * OpenLayers version.
  * @type {string}
  */
-export const VERSION = '7.5.1';
+export const VERSION = '8.0.0-dev.1692053484481';

package/webgl/Helper.d.ts

@@ -19,11 +19,10 @@ export namespace ShaderType {
 export type DefaultUniform = string;
 export namespace DefaultUniform {
     let PROJECTION_MATRIX: string;
-    let OFFSET_SCALE_MATRIX: string;
-    let OFFSET_ROTATION_MATRIX: string;
     let TIME: string;
     let ZOOM: string;
     let RESOLUTION: string;
+    let ROTATION: string;
     let VIEWPORT_SIZE_PX: string;
     let PIXEL_RATIO: string;
     let HIT_DETECTION: string;
@@ -359,6 +358,12 @@ declare class WebGLHelper extends Disposable {
     setUniforms(uniforms: {
         [x: string]: UniformValue;
     }): void;
+    /**
+     * @param {Object<string, UniformValue>} uniforms Uniform definitions.
+     */
+    addUniforms(uniforms: {
+        [x: string]: UniformValue;
+    }): void;
     /**
      * @param {string} canvasCacheKey The canvas cache key.
      * @return {boolean} The provided key matches the one this helper was constructed with.

package/webgl/Helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Helper.d.ts","sourceRoot":"","sources":["Helper.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Helper.d.ts","sourceRoot":"","sources":["Helper.js"],"names":[],"mappings":"AAilCA;;;;GAIG;AACH,oDAHW,MAAM,oBAAoB,CAAC,GAC1B,MAAM,CASjB;;;;yBAhkCS,MAAM;;;;;;;;;6BAUN,MAAM;;;;;;;;;;;;;;;4BAgBN,MAAM;;;;;;;;;;;;YAhCF,OAAO,aAAa,EAAE,OAAO;;;;iBAC7B,WAAW;;;;;;;;;UA2CX,MAAM;;;;UACN,MAAM;;;;;;;;kCAOP,MAAM,GAAC,MAAM,MAAM,CAAC,GAAC,iBAAiB,GAAC,gBAAgB,GAAC,SAAS,GAAC,OAAO,cAAc,EAAE,SAAS;;;;;2BAMlG,mBAAmB,WAAU,OAAO,WAAW,EAAE,UAAU,KAAE,mBAAmB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAsB/E,MAAM;;;;;;;;;;;;;;;;;;aASN,qBAAqB;;;;WACrB,MAAM;;8BArGb,aAAa;+BAAb,aAAa;6BAAb,aAAa;sBAAb,aAAa;AA+KpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2HG;AACH;IACE;;OAEG;IACH,2CA8HC;IA1HC,eAAe;IACf,qCAA0E;IAE1E,eAAe;IACf,yCAC4C;IAE5C;;;OAGG;IACH,wBAE6B;IAE7B;;;OAGG;IACH,YAAmD;IAEnD;;;OAGG;IACH,qBAAsB;IAEtB;;;OAGG;IACH,wBAAyB;IAEzB;;;OAGG;IACH,wBAA2B;IAa3B;;;OAGG;IACH,4BAA4C;IAE5C;;;OAGG;IACH,2BAA2C;IAE3C;;;OAGG;IACH,iBAAwB;IAExB;;;OAGG;IACH,mCAAoC;IAEpC;;;OAGG;IACH,kCAAmC;IAEnC;;;;;OAKG;IACH,kBAAmB;IAKnB;;;;;;OAMG;IACH,2BAW2D;IAE3D;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,mBAA4B;IAG9B;;OAEG;IACH;YAFkB,MAAM,GAAE,YAAY;aAKrC;IAED;;OAEG;IACH;YAFkB,MAAM,GAAE,YAAY;aASrC;IAED;;;OAGG;IACH,sCAHW,MAAM,GACL,OAAO,CAIlB;IAED;;;;;OAKG;IACH,mBAHW,MAAM,GACL,MAAO,IAAI,CAStB;IAED;;;;;OAKG;IACH,mBAFW,OAAO,UAAU,EAAE,OAAO,QAepC;IAED;;;;OAIG;IACH,wBAFW,OAAO,UAAU,EAAE,OAAO,QAMpC;IAED;;OAEG;IACH,kBAFW,OAAO,aAAa,EAAE,OAAO,QAUvC;IAqBD;;;;;;;OAOG;IACH,wBAJW,OAAO,WAAW,EAAE,UAAU,oFAwCxC;IAED;;;;;OAKG;IACH,qBAJW,YAAY,QACZ,MAAM,eACN,MAAM,QAOhB;IAED;;;;;;;;OAQG;IACH,sCALW,OAAO,WAAW,EAAE,UAAU,gBAC9B,OAAO,mBAAmB,EAAE,OAAO,oFA6B7C;IAED;;;;OAIG;IACH,oBAHW,MAAM,OACN,MAAM,QAYhB;IAED;;;;;OAKG;IACH,yBAJW,OAAO,WAAW,EAAE,UAAU,uBACrB,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qCAC3D,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qBAmB9E;IAED;;OAEG;IACH,aAFY,iBAAiB,CAI5B;IAED;;;OAGG;IACH,SAFY,qBAAqB,CAIhC;IAED;;;OAGG;IACH,4BAFW,OAAO,WAAW,EAAE,UAAU,QAsBxC;IAED;;;OAGG;IACH,kCAFW,OAAO,QAUjB;IAED;;;OAGG;IACH,0BAFW,OAAO,WAAW,EAAE,UAAU,QAkFxC;IAED;;;;;OAKG;IACH,oBAHW,YAAY,cACZ,OAAO,WAAW,EAAE,UAAU,QAQxC;IAED;;;;;;;;OAQG;IACH,sBAJW,MAAM,QACN,UAAU,GACT,WAAW,CAQtB;IAED;;;;;OAKG;IACH,iCAJW,MAAM,sBACN,MAAM,GACL,YAAY,CA4CvB;IAED;;;;OAIG;IACH,yBAHW,MAAM,GACL,oBAAoB,CAY/B;IAED;;;;OAIG;IACH,2BAHW,MAAM,GACL,MAAM,CAYjB;IAED;;;;;;OAMG;IACH,oCAJW,OAAO,WAAW,EAAE,UAAU,aAC9B,OAAO,cAAc,EAAE,SAAS,GAC/B,OAAO,cAAc,EAAE,SAAS,CAkB3C;IAED;;;;OAIG;IACH,8BAHW,MAAM,SACN,MAAM,QAIhB;IAED;;;;OAIG;IACH,6BAHW,MAAM,SACN,MAAM,MAAM,CAAC,QAIvB;IAED;;;;OAIG;IACH,6BAHW,MAAM,SACN,MAAM,MAAM,CAAC,QAIvB;IAED;;;;OAIG;IACH,+BAHW,MAAM,SACN,MAAM,MAAM,CAAC,QAIvB;IAED;;;;;;;;;OASG;IACH,8BAQC;IAED;;;;;OAKG;IACH,6BAFW,MAAM,oBAAoB,CAAC,QAgBrC;IAED;;;OAGG;IACH,+BAGC;IAED;;;OAGG;IACH,mCAA+B;IAE/B;;;;;;;;;OASG;IACH,oBALW,MAAM,MAAM,CAAC,4GAGZ,YAAY,CAiCvB;CACF;uBA3kCsB,kBAAkB"}

package/webgl/Helper.js

@@ -15,9 +15,6 @@ import {clear} from '../obj.js';
 import {
   compose as composeTransform,
   create as createTransform,
-  reset as resetTransform,
-  rotate as rotateTransform,
-  scale as scaleTransform,
 } from '../transform.js';
 import {create, fromTransform} from '../vec/mat4.js';
 import {getUid} from '../util.js';
@@ -44,11 +41,10 @@ export const ShaderType = {
  */
 export const DefaultUniform = {
   PROJECTION_MATRIX: 'u_projectionMatrix',
-  OFFSET_SCALE_MATRIX: 'u_offsetScaleMatrix',
-  OFFSET_ROTATION_MATRIX: 'u_offsetRotateMatrix',
   TIME: 'u_time',
   ZOOM: 'u_zoom',
   RESOLUTION: 'u_resolution',
+  ROTATION: 'u_rotation',
   VIEWPORT_SIZE_PX: 'u_viewportSizePx',
   PIXEL_RATIO: 'u_pixelRatio',
   HIT_DETECTION: 'u_hitDetection',
@@ -450,6 +446,13 @@ class WebGLHelper extends Disposable {
    */
   setUniforms(uniforms) {
     this.uniforms_ = [];
+    this.addUniforms(uniforms);
+  }
+
+  /**
+   * @param {Object<string, UniformValue>} uniforms Uniform definitions.
+   */
+  addUniforms(uniforms) {
     for (const name in uniforms) {
       this.uniforms_.push({
         name: name,
@@ -706,23 +709,6 @@ class WebGLHelper extends Disposable {
     const rotation = frameState.viewState.rotation;
     const pixelRatio = frameState.pixelRatio;
 
-    const offsetScaleMatrix = resetTransform(this.offsetScaleMatrix_);
-    scaleTransform(offsetScaleMatrix, 2 / size[0], 2 / size[1]);
-
-    const offsetRotateMatrix = resetTransform(this.offsetRotateMatrix_);
-    if (rotation !== 0) {
-      rotateTransform(offsetRotateMatrix, -rotation);
-    }
-
-    this.setUniformMatrixValue(
-      DefaultUniform.OFFSET_SCALE_MATRIX,
-      fromTransform(this.tmpMat4_, offsetScaleMatrix)
-    );
-    this.setUniformMatrixValue(
-      DefaultUniform.OFFSET_ROTATION_MATRIX,
-      fromTransform(this.tmpMat4_, offsetRotateMatrix)
-    );
-
     this.setUniformFloatValue(
       DefaultUniform.TIME,
       (Date.now() - this.startTime_) * 0.001
@@ -737,6 +723,7 @@ class WebGLHelper extends Disposable {
       size[0],
       size[1],
     ]);
+    this.setUniformFloatValue(DefaultUniform.ROTATION, rotation);
   }
 
   /**
@@ -746,6 +733,11 @@ class WebGLHelper extends Disposable {
   applyHitDetectionUniform(enabled) {
     const loc = this.getUniformLocation(DefaultUniform.HIT_DETECTION);
     this.getGL().uniform1i(loc, enabled ? 1 : 0);
+
+    // hit detection uses a fixed pixel ratio
+    if (enabled) {
+      this.setUniformFloatValue(DefaultUniform.PIXEL_RATIO, 0.5);
+    }
   }
 
   /**
@@ -774,8 +766,7 @@ class WebGLHelper extends Disposable {
           uniform.prevValue = undefined;
           uniform.texture = gl.createTexture();
         }
-        gl.activeTexture(gl[`TEXTURE${textureSlot}`]);
-        gl.bindTexture(gl.TEXTURE_2D, uniform.texture);
+        this.bindTexture(uniform.texture, textureSlot, uniform.name);
         gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
         gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
         gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
@@ -794,9 +785,7 @@ class WebGLHelper extends Disposable {
             value
           );
         }
-
-        // fill texture slots by increasing index
-        gl.uniform1i(this.getUniformLocation(uniform.name), textureSlot++);
+        textureSlot++;
       } else if (Array.isArray(value) && value.length === 6) {
         this.setUniformMatrixValue(
           uniform.name,

package/webgl/ShaderBuilder.d.ts

@@ -164,6 +164,10 @@ export class ShaderBuilder {
      * @return {ShaderBuilder} the builder object
      */
     setSymbolOffsetExpression(expression: string): ShaderBuilder;
+    /**
+     * @return {string} The current symbol offset expression
+     */
+    getSymbolOffsetExpression(): string;
     /**
      * Sets an expression to compute the color of the shape.
      * This expression can use all the uniforms, varyings and attributes available
@@ -220,25 +224,11 @@ export class ShaderBuilder {
     addFragmentShaderFunction(code: any): void;
     /**
      * Generates a symbol vertex shader from the builder parameters
-     *
-     * The following uniforms are hardcoded in all shaders: `u_projectionMatrix`, `u_offsetScaleMatrix`,
-     * `u_offsetRotateMatrix`, `u_time`, `u_zoom`, `u_resolution`, `u_hitDetection`.
-     *
-     * The following attributes are hardcoded and expected to be present in the vertex buffers:
-     * `vec2 a_position`, `float a_index` (being the index of the vertex in the quad, 0 to 3), `vec4 a_hitColor`.
-     *
-     * The following varyings are hardcoded and gives the coordinate of the pixel both in the quad and on the texture:
-     * `vec2 v_quadCoord`, `vec2 v_texCoord`, `vec4 v_hitColor`.
-     *
      * @return {string|null} The full shader as a string; null if no size or color specified
      */
     getSymbolVertexShader(): string | null;
     /**
      * 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`, `vec4 v_hitColor`.
-     *
      * @return {string|null} The full shader as a string; null if no size or color specified
      */
     getSymbolFragmentShader(): string | null;

package/webgl/ShaderBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ShaderBuilder.d.ts","sourceRoot":"","sources":["ShaderBuilder.js"],"names":[],"mappings":"AAqBA;;;;;;GAMG;AAEH;;;;;;;;;;;;;GAaG;AACH;IAEI;;;;OAIG;IACH,kBAAmB;IAEnB;;;;OAIG;IACH,oBAAqB;IAErB;;;;OAIG;IACH,kBAAmB;IAEnB;;;OAGG;IACH,mBAAuB;IAEvB;;;OAGG;IACH,8BAEI;IAEJ;;;OAGG;IACH,kCAAsC;IAEtC;;;OAGG;IACH,gCAA0C;IAE1C;;;OAGG;IACH,+BAEC;IAED;;;OAGG;IACH,4BAAqD;IAErD;;;OAGG;IACH,2BAAiC;IAEjC;;;OAGG;IACH,8BAAkC;IAElC;;;OAGG;IACH,mBAAuB;IAEvB;;;OAGG;IACH,+BAAyE;IAEzE;;;OAGG;IACH,+BAEC;IAED;;;OAGG;IACH,iBAAqB;IAErB;;;OAGG;IACH,6BAEC;IAED;;;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,CAMxB;IAED;;OAEG;IACH,2BAFY,MAAM,CAIjB;IAED;;;;;;OAMG;IACH,wCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;OAMG;IACH,sCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;OAMG;IACH,qCAHW,MAAM,GACL,aAAa,CAMxB;IAED;;OAEG;IACH,4BAFY,MAAM,CAIjB;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,CAMxB;IAED;;;OAGG;IACH,qCAHW,MAAM,GACL,aAAa,CAMxB;IAED;;;OAGG;IACH,mCAHW,MAAM,GACL,aAAa,CAMxB;IAED,yCAKC;IACD,2CAKC;IAED;;;;;;;;;;;;;OAaG;IACH,yBAFY,MAAM,GAAC,IAAI,CA8EtB;IAED;;;;;;;OAOG;IACH,2BAFY,MAAM,GAAC,IAAI,CAmCtB;IAED;;;OAGG;IACH,yBAFY,MAAM,GAAC,IAAI,CAwFtB;IAED;;;;OAIG;IACH,2BAFY,MAAM,GAAC,IAAI,CAkEtB;IAED;;;;OAIG;IACH,uBAFY,MAAM,GAAC,IAAI,CAwCtB;IAED;;;OAGG;IACH,yBAFY,MAAM,GAAC,IAAI,CAmDtB;CACF;;;;;UAltBa,MAAM;;;;UACN,MAAM;;;;;gBACN,MAAM"}
+{"version":3,"file":"ShaderBuilder.d.ts","sourceRoot":"","sources":["ShaderBuilder.js"],"names":[],"mappings":"AA2BA;;;;;;GAMG;AAEH;;;;;;;;;;;;;GAaG;AACH;IAEI;;;;OAIG;IACH,kBAAmB;IAEnB;;;;OAIG;IACH,oBAAqB;IAErB;;;;OAIG;IACH,kBAAmB;IAEnB;;;OAGG;IACH,mBAAuB;IAEvB;;;OAGG;IACH,8BAEkE;IAElE;;;OAGG;IACH,kCAAsC;IAEtC;;;OAGG;IACH,gCAA0C;IAE1C;;;OAGG;IACH,+BAEC;IAED;;;OAGG;IACH,4BAAqD;IAErD;;;OAGG;IACH,2BAAiC;IAEjC;;;OAGG;IACH,8BAAkC;IAElC;;;OAGG;IACH,mBAAuB;IAEvB;;;OAGG;IACH,+BAAyE;IAEzE;;;OAGG;IACH,+BAEC;IAED;;;OAGG;IACH,iBAAqB;IAErB;;;OAGG;IACH,6BAEC;IAED;;;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,CAMxB;IAED;;OAEG;IACH,2BAFY,MAAM,CAIjB;IAED;;;;;;OAMG;IACH,wCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;;;;;OAMG;IACH,sCAHW,MAAM,GACL,aAAa,CAKxB;IAED;;OAEG;IACH,6BAFY,MAAM,CAIjB;IAED;;;;;;OAMG;IACH,qCAHW,MAAM,GACL,aAAa,CAMxB;IAED;;OAEG;IACH,4BAFY,MAAM,CAIjB;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,CAMxB;IAED;;;OAGG;IACH,qCAHW,MAAM,GACL,aAAa,CAMxB;IAED;;;OAGG;IACH,mCAHW,MAAM,GACL,aAAa,CAMxB;IAED,yCAKC;IACD,2CAKC;IAED;;;OAGG;IACH,yBAFY,MAAM,GAAC,IAAI,CA4FtB;IAED;;;OAGG;IACH,2BAFY,MAAM,GAAC,IAAI,CAsCtB;IAED;;;OAGG;IACH,yBAFY,MAAM,GAAC,IAAI,CAoFtB;IAED;;;;OAIG;IACH,2BAFY,MAAM,GAAC,IAAI,CA8DtB;IAED;;;;OAIG;IACH,uBAFY,MAAM,GAAC,IAAI,CAoCtB;IAED;;;OAGG;IACH,yBAFY,MAAM,GAAC,IAAI,CA+CtB;CACF;;;;;UA5sBa,MAAM;;;;UACN,MAAM;;;;;gBACN,MAAM"}