maplibre-gl 2.0.4 → 2.1.2

package/src/data/program_configuration.ts

@@ -3,7 +3,7 @@ import Color from '../style-spec/util/color';
 import {supportsPropertyExpression} from '../style-spec/util/properties';
 import {register} from '../util/web_worker_transfer';
 import {PossiblyEvaluatedPropertyValue} from '../style/properties';
-import {StructArrayLayout1f4, StructArrayLayout2f8, StructArrayLayout4f16, PatternLayoutArray} from './array_types';
+import {StructArrayLayout1f4, StructArrayLayout2f8, StructArrayLayout4f16, PatternLayoutArray} from './array_types.g';
 import {clamp} from '../util/util';
 import patternAttributes from './bucket/pattern_attributes';
 import EvaluationParameters from '../style/evaluation_parameters';
@@ -31,9 +31,9 @@ import type {FormattedSection} from '../style-spec/expression/types/formatted';
 import type {VectorTileLayer} from '@mapbox/vector-tile';
 
 export type BinderUniform = {
-  name: string;
-  property: string;
-  binding: Uniform<any>;
+    name: string;
+    property: string;
+    binding: Uniform<any>;
 };
 
 function packColor(color: Color): [number, number] {
@@ -72,33 +72,33 @@ function packColor(color: Color): [number, number] {
  */
 
 interface AttributeBinder {
-  populatePaintArray(
-    length: number,
-    feature: Feature,
-    imagePositions: {[_: string]: ImagePosition},
-    canonical?: CanonicalTileID,
-    formattedSection?: FormattedSection
-  ): void;
-  updatePaintArray(
-    start: number,
-    length: number,
-    feature: Feature,
-    featureState: FeatureState,
-    imagePositions: {[_: string]: ImagePosition}
-  ): void;
-  upload(a: Context): void;
-  destroy(): void;
+    populatePaintArray(
+        length: number,
+        feature: Feature,
+        imagePositions: {[_: string]: ImagePosition},
+        canonical?: CanonicalTileID,
+        formattedSection?: FormattedSection
+    ): void;
+    updatePaintArray(
+        start: number,
+        length: number,
+        feature: Feature,
+        featureState: FeatureState,
+        imagePositions: {[_: string]: ImagePosition}
+    ): void;
+    upload(a: Context): void;
+    destroy(): void;
 }
 
 interface UniformBinder {
-  uniformNames: Array<string>;
-  setUniform(
-    uniform: Uniform<any>,
-    globals: GlobalProperties,
-    currentValue: PossiblyEvaluatedPropertyValue<any>,
-    uniformName: string
-  ): void;
-  getBinding(context: Context, location: WebGLUniformLocation, name: string): Partial<Uniform<any>>;
+    uniformNames: Array<string>;
+    setUniform(
+        uniform: Uniform<any>,
+        globals: GlobalProperties,
+        currentValue: PossiblyEvaluatedPropertyValue<any>,
+        uniformName: string
+    ): void;
+    getBinding(context: Context, location: WebGLUniformLocation, name: string): Partial<Uniform<any>>;
 }
 
 class ConstantBinder implements UniformBinder {
@@ -113,9 +113,9 @@ class ConstantBinder implements UniformBinder {
     }
 
     setUniform(
-      uniform: Uniform<any>,
-      globals: GlobalProperties,
-      currentValue: PossiblyEvaluatedPropertyValue<unknown>
+        uniform: Uniform<any>,
+        globals: GlobalProperties,
+        currentValue: PossiblyEvaluatedPropertyValue<unknown>
     ): void {
         uniform.set(currentValue.constantOr(this.value));
     }
@@ -129,7 +129,7 @@ class ConstantBinder implements UniformBinder {
 
 class CrossFadedConstantBinder implements UniformBinder {
     uniformNames: Array<string>;
-    patternFrom: Array<number> ;
+    patternFrom: Array<number>;
     patternTo: Array<number>;
     pixelRatioFrom: number;
     pixelRatioTo: number;
@@ -152,9 +152,9 @@ class CrossFadedConstantBinder implements UniformBinder {
     setUniform(uniform: Uniform<any>, globals: GlobalProperties, currentValue: PossiblyEvaluatedPropertyValue<unknown>, uniformName: string) {
         const pos =
             uniformName === 'u_pattern_to' ? this.patternTo :
-            uniformName === 'u_pattern_from' ? this.patternFrom :
-            uniformName === 'u_pixel_ratio_to' ? this.pixelRatioTo :
-            uniformName === 'u_pixel_ratio_from' ? this.pixelRatioFrom : null;
+                uniformName === 'u_pattern_from' ? this.patternFrom :
+                    uniformName === 'u_pixel_ratio_to' ? this.pixelRatioTo :
+                        uniformName === 'u_pixel_ratio_from' ? this.pixelRatioFrom : null;
         if (pos) uniform.set(pos);
     }
 
@@ -175,7 +175,7 @@ class SourceExpressionBinder implements AttributeBinder {
     paintVertexBuffer: VertexBuffer;
 
     constructor(expression: SourceExpression, names: Array<string>, type: string, PaintVertexArray: {
-      new (...args: any): StructArray;
+        new (...args: any): StructArray;
     }) {
         this.expression = expression;
         this.type = type;
@@ -245,7 +245,7 @@ class CompositeExpressionBinder implements AttributeBinder, UniformBinder {
     paintVertexBuffer: VertexBuffer;
 
     constructor(expression: CompositeExpression, names: Array<string>, type: string, useIntegerZoom: boolean, zoom: number, PaintVertexArray: {
-      new (...args: any): StructArray;
+        new (...args: any): StructArray;
     }) {
         this.expression = expression;
         this.uniformNames = names.map(name => `u_${name}_t`);
@@ -332,7 +332,7 @@ class CrossFadedCompositeBinder implements AttributeBinder {
     paintVertexAttributes: Array<StructArrayMember>;
 
     constructor(expression: CompositeExpression, type: string, useIntegerZoom: boolean, zoom: number, PaintVertexArray: {
-      new (...args: any): StructArray;
+        new (...args: any): StructArray;
     }, layerId: string) {
         this.expression = expression;
         this.type = type;
@@ -485,11 +485,11 @@ export default class ProgramConfiguration {
     }
 
     updatePaintArrays(
-      featureStates: FeatureStates,
-      featureMap: FeaturePositionMap,
-      vtLayer: VectorTileLayer,
-      layer: TypedStyleLayer,
-      imagePositions: {[_: string]: ImagePosition}
+        featureStates: FeatureStates,
+        featureMap: FeaturePositionMap,
+        vtLayer: VectorTileLayer,
+        layer: TypedStyleLayer,
+        imagePositions: {[_: string]: ImagePosition}
     ): boolean {
         let dirty: boolean = false;
         for (const id in featureStates) {
@@ -576,10 +576,10 @@ export default class ProgramConfiguration {
     }
 
     setUniforms(
-      context: Context,
-      binderUniforms: Array<BinderUniform>,
-      properties: any,
-      globals: GlobalProperties
+        context: Context,
+        binderUniforms: Array<BinderUniform>,
+        properties: any,
+        globals: GlobalProperties
     ) {
         // Uniform state bindings are owned by the Program, but we set them
         // from within the ProgramConfiguraton's binder members.

package/src/data/segment.ts

@@ -6,12 +6,12 @@ import type VertexArrayObject from '../render/vertex_array_object';
 import type {StructArray} from '../util/struct_array';
 
 export type Segment = {
-  sortKey?: number;
-  vertexOffset: number;
-  primitiveOffset: number;
-  vertexLength: number;
-  primitiveLength: number;
-  vaos: {[_: string]: VertexArrayObject};
+    sortKey?: number;
+    vertexOffset: number;
+    primitiveOffset: number;
+    vertexLength: number;
+    primitiveLength: number;
+    vaos: {[_: string]: VertexArrayObject};
 };
 
 class SegmentVector {
@@ -23,10 +23,10 @@ class SegmentVector {
     }
 
     prepareSegment(
-      numVertices: number,
-      layoutVertexArray: StructArray,
-      indexArray: StructArray,
-      sortKey?: number
+        numVertices: number,
+        layoutVertexArray: StructArray,
+        indexArray: StructArray,
+        sortKey?: number
     ): Segment {
         let segment: Segment = this.segments[this.segments.length - 1];
         if (numVertices > SegmentVector.MAX_VERTEX_ARRAY_LENGTH) warnOnce(`Max vertices per segment is ${SegmentVector.MAX_VERTEX_ARRAY_LENGTH}: bucket requested ${numVertices}`);
@@ -56,10 +56,10 @@ class SegmentVector {
     }
 
     static simpleSegment(
-      vertexOffset: number,
-      primitiveOffset: number,
-      vertexLength: number,
-      primitiveLength: number
+        vertexOffset: number,
+        primitiveOffset: number,
+        vertexLength: number,
+        primitiveLength: number
     ): SegmentVector {
         return new SegmentVector([{
             vertexOffset,

package/src/geo/edge_insets.ts

@@ -116,8 +116,8 @@ class EdgeInsets {
  */
 export type PaddingOptions = {
     /**
-    * @property {number} top Padding in pixels from the top of the map canvas.
-    */
+     * @property {number} top Padding in pixels from the top of the map canvas.
+     */
     top: number;
     /**
      * @property {number} bottom Padding in pixels from the bottom of the map canvas.

package/src/geo/lng_lat.ts

@@ -161,11 +161,11 @@ class LngLat {
  * var v3 = {lon: -122.420679, lat: 37.772537};
  */
 export type LngLatLike = LngLat | {
-  lng: number;
-  lat: number;
+    lng: number;
+    lat: number;
 } | {
-  lon: number;
-  lat: number;
+    lon: number;
+    lat: number;
 } | [number, number];
 
 export default LngLat;

package/src/geo/lng_lat_bounds.ts

@@ -126,51 +126,51 @@ class LngLatBounds {
     getSouthWest(): LngLat { return this._sw; }
 
     /**
-    * Returns the northeast corner of the bounding box.
-    *
-    * @returns {LngLat} The northeast corner of the bounding box.
+     * Returns the northeast corner of the bounding box.
+     *
+     * @returns {LngLat} The northeast corner of the bounding box.
      */
     getNorthEast(): LngLat { return this._ne; }
 
     /**
-    * Returns the northwest corner of the bounding box.
-    *
-    * @returns {LngLat} The northwest corner of the bounding box.
+     * Returns the northwest corner of the bounding box.
+     *
+     * @returns {LngLat} The northwest corner of the bounding box.
      */
     getNorthWest(): LngLat { return new LngLat(this.getWest(), this.getNorth()); }
 
     /**
-    * Returns the southeast corner of the bounding box.
-    *
-    * @returns {LngLat} The southeast corner of the bounding box.
+     * Returns the southeast corner of the bounding box.
+     *
+     * @returns {LngLat} The southeast corner of the bounding box.
      */
     getSouthEast(): LngLat { return new LngLat(this.getEast(), this.getSouth()); }
 
     /**
-    * Returns the west edge of the bounding box.
-    *
-    * @returns {number} The west edge of the bounding box.
+     * Returns the west edge of the bounding box.
+     *
+     * @returns {number} The west edge of the bounding box.
      */
     getWest(): number { return this._sw.lng; }
 
     /**
-    * Returns the south edge of the bounding box.
-    *
-    * @returns {number} The south edge of the bounding box.
+     * Returns the south edge of the bounding box.
+     *
+     * @returns {number} The south edge of the bounding box.
      */
     getSouth(): number { return this._sw.lat; }
 
     /**
-    * Returns the east edge of the bounding box.
-    *
-    * @returns {number} The east edge of the bounding box.
+     * Returns the east edge of the bounding box.
+     *
+     * @returns {number} The east edge of the bounding box.
      */
     getEast(): number { return this._ne.lng; }
 
     /**
-    * Returns the north edge of the bounding box.
-    *
-    * @returns {number} The north edge of the bounding box.
+     * Returns the north edge of the bounding box.
+     *
+     * @returns {number} The north edge of the bounding box.
      */
     getNorth(): number { return this._ne.lat; }
 
@@ -210,20 +210,20 @@ class LngLatBounds {
     }
 
     /**
-    * Check if the point is within the bounding box.
-    *
-    * @param {LngLatLike} lnglat geographic point to check against.
-    * @returns {boolean} True if the point is within the bounding box.
-    * @example
-    * var llb = new maplibregl.LngLatBounds(
-    *   new maplibregl.LngLat(-73.9876, 40.7661),
-    *   new maplibregl.LngLat(-73.9397, 40.8002)
-    * );
-    *
-    * var ll = new maplibregl.LngLat(-73.9567, 40.7789);
-    *
-    * console.log(llb.contains(ll)); // = true
-    */
+     * Check if the point is within the bounding box.
+     *
+     * @param {LngLatLike} lnglat geographic point to check against.
+     * @returns {boolean} True if the point is within the bounding box.
+     * @example
+     * var llb = new maplibregl.LngLatBounds(
+     *   new maplibregl.LngLat(-73.9876, 40.7661),
+     *   new maplibregl.LngLat(-73.9397, 40.8002)
+     * );
+     *
+     * var ll = new maplibregl.LngLat(-73.9567, 40.7789);
+     *
+     * console.log(llb.contains(ll)); // = true
+     */
     contains(lnglat: LngLatLike) {
         const {lng, lat} = LngLat.convert(lnglat);
 

package/src/geo/mercator_coordinate.ts

@@ -99,9 +99,9 @@ class MercatorCoordinate {
         const lngLat = LngLat.convert(lngLatLike);
 
         return new MercatorCoordinate(
-                mercatorXfromLng(lngLat.lng),
-                mercatorYfromLat(lngLat.lat),
-                mercatorZfromAltitude(altitude, lngLat.lat));
+            mercatorXfromLng(lngLat.lng),
+            mercatorYfromLat(lngLat.lat),
+            mercatorZfromAltitude(altitude, lngLat.lat));
     }
 
     /**
@@ -114,8 +114,8 @@ class MercatorCoordinate {
      */
     toLngLat() {
         return new LngLat(
-                lngFromMercatorX(this.x),
-                latFromMercatorY(this.y));
+            lngFromMercatorX(this.x),
+            latFromMercatorY(this.y));
     }
 
     /**

package/src/geo/transform.test.ts

@@ -2,7 +2,7 @@ import Point from '@mapbox/point-geometry';
 import Transform from './transform';
 import LngLat from './lng_lat';
 import {OverscaledTileID, CanonicalTileID} from '../source/tile_id';
-import {fixedLngLat, fixedCoord} from '../../test/util/fixed';
+import {fixedLngLat, fixedCoord} from '../../test/unit/lib/fixed';
 
 describe('transform', () => {
     test('creates a transform', () => {

package/src/geo/transform.ts

@@ -262,8 +262,8 @@ class Transform {
      * @returns {number} zoom level An integer zoom level at which all tiles will be visible.
      */
     coveringZoomLevel(options: {
-      roundZoom?: boolean;
-      tileSize: number;
+        roundZoom?: boolean;
+        tileSize: number;
     }) {
         const z = (options.roundZoom ? Math.round : Math.floor)(
             this.zoom + this.scaleZoom(this.tileSize / options.tileSize)
@@ -315,14 +315,14 @@ class Transform {
      * @private
      */
     coveringTiles(
-      options: {
-        tileSize: number;
-        minzoom?: number;
-        maxzoom?: number;
-        roundZoom?: boolean;
-        reparseOverscaled?: boolean;
-        renderWorldCopies?: boolean;
-      }
+        options: {
+            tileSize: number;
+            minzoom?: number;
+            maxzoom?: number;
+            roundZoom?: boolean;
+            reparseOverscaled?: boolean;
+            renderWorldCopies?: boolean;
+        }
     ): Array<OverscaledTileID> {
         let z = this.coveringZoomLevel(options);
         const actualZ = z;
@@ -436,8 +436,8 @@ class Transform {
     project(lnglat: LngLat) {
         const lat = clamp(lnglat.lat, -this.maxValidLatitude, this.maxValidLatitude);
         return new Point(
-                mercatorXfromLng(lnglat.lng) * this.worldSize,
-                mercatorYfromLat(lat) * this.worldSize);
+            mercatorXfromLng(lnglat.lng) * this.worldSize,
+            mercatorYfromLat(lat) * this.worldSize);
     }
 
     unproject(point: Point): LngLat {
@@ -451,8 +451,8 @@ class Transform {
         const b = this.pointCoordinate(this.centerPoint);
         const loc = this.locationCoordinate(lnglat);
         const newCenter = new MercatorCoordinate(
-                loc.x - (a.x - b.x),
-                loc.y - (a.y - b.y));
+            loc.x - (a.x - b.x),
+            loc.y - (a.y - b.y));
         this.center = this.coordinateLocation(newCenter);
         if (this._renderWorldCopies) {
             this.center = this.center.wrap();

package/src/gl/context.ts

@@ -17,9 +17,9 @@ import type {
 import type Color from '../style-spec/util/color';
 
 type ClearArgs = {
-  color?: Color;
-  depth?: number;
-  stencil?: number;
+    color?: Color;
+    depth?: number;
+    stencil?: number;
 };
 
 class Context {

package/src/gl/types.ts

@@ -15,9 +15,9 @@ export type DepthRangeType = [number, number];
 export type DepthFuncType = CompareFuncType;
 
 export type StencilFuncType = {
-  func: CompareFuncType;
-  ref: number;
-  mask: number;
+    func: CompareFuncType;
+    ref: number;
+    mask: number;
 };
 
 export type StencilOpConstant = WebGLRenderingContext['KEEP'] | WebGLRenderingContext['ZERO'] | WebGLRenderingContext['REPLACE'] | WebGLRenderingContext['INCR'] | WebGLRenderingContext['INCR_WRAP'] | WebGLRenderingContext['DECR'] | WebGLRenderingContext['DECR_WRAP'] | WebGLRenderingContext['INVERT'];
@@ -29,29 +29,29 @@ export type TextureUnitType = number;
 export type ViewportType = [number, number, number, number];
 
 export type StencilTestGL = {
-  func: WebGLRenderingContext['NEVER'];
-  mask: 0;
+    func: WebGLRenderingContext['NEVER'];
+    mask: 0;
 } | {
-  func: WebGLRenderingContext['LESS'];
-  mask: number;
+    func: WebGLRenderingContext['LESS'];
+    mask: number;
 } | {
-  func: WebGLRenderingContext['EQUAL'];
-  mask: number;
+    func: WebGLRenderingContext['EQUAL'];
+    mask: number;
 } | {
-  func: WebGLRenderingContext['LEQUAL'];
-  mask: number;
+    func: WebGLRenderingContext['LEQUAL'];
+    mask: number;
 } | {
-  func: WebGLRenderingContext['GREATER'];
-  mask: number;
+    func: WebGLRenderingContext['GREATER'];
+    mask: number;
 } | {
-  func: WebGLRenderingContext['NOTEQUAL'];
-  mask: number;
+    func: WebGLRenderingContext['NOTEQUAL'];
+    mask: number;
 } | {
-  func: WebGLRenderingContext['GEQUAL'];
-  mask: number;
+    func: WebGLRenderingContext['GEQUAL'];
+    mask: number;
 } | {
-  func: WebGLRenderingContext['ALWAYS'];
-  mask: 0;
+    func: WebGLRenderingContext['ALWAYS'];
+    mask: 0;
 };
 
 export type CullFaceModeType = WebGLRenderingContext['FRONT'] | WebGLRenderingContext['BACK'] | WebGLRenderingContext['FRONT_AND_BACK'];

package/src/gl/value.ts

@@ -17,12 +17,12 @@ import type {
 } from './types';
 
 export interface IValue<T> {
-  current: T;
-  default: T;
-  dirty: boolean;
-  get(): T;
-  setDefault(): void;
-  set(value: T): void;
+    current: T;
+    default: T;
+    dirty: boolean;
+    get(): T;
+    setDefault(): void;
+    set(value: T): void;
 }
 
 class BaseValue<T> implements IValue<T> {

package/src/gl/vertex_buffer.test.ts

@@ -1,5 +1,5 @@
 import VertexBuffer from './vertex_buffer';
-import {StructArrayLayout3i6} from '../data/array_types';
+import {StructArrayLayout3i6} from '../data/array_types.g';
 import Context from '../gl/context';
 import gl from 'gl';
 import {StructArrayMember} from '../util/struct_array';

package/src/index.ts

@@ -1,4 +1,3 @@
-/// <reference path="./types/glsl.d.ts" />
 import assert from 'assert';
 import {supported} from '@mapbox/mapbox-gl-supported';
 
@@ -24,8 +23,16 @@ import WorkerPool from './util/worker_pool';
 import {prewarm, clearPrewarmedResources} from './util/global_worker_pool';
 import {clearTileCache} from './util/tile_request_cache';
 import {PerformanceUtils} from './util/performance';
+import {AJAXError} from './util/ajax';
 import type {RequestParameters, ResponseCallback} from './util/ajax';
 import type {Cancelable} from './types/cancelable';
+import GeoJSONSource from './source/geojson_source';
+import CanvasSource from './source/canvas_source';
+import ImageSource from './source/image_source';
+import RasterDEMTileSource from './source/raster_dem_tile_source';
+import RasterTileSource from './source/raster_tile_source';
+import VectorTileSource from './source/vector_tile_source';
+import VideoSource from './source/video_source';
 
 const exported = {
     supported,
@@ -45,7 +52,15 @@ const exported = {
     Point,
     MercatorCoordinate,
     Evented,
+    AJAXError,
     config,
+    CanvasSource,
+    GeoJSONSource,
+    ImageSource,
+    RasterDEMTileSource,
+    RasterTileSource,
+    VectorTileSource,
+    VideoSource,
     /**
      * Initializes resources like WebWorkers that can be shared across maps to lower load
      * times in some situations. `maplibregl.workerUrl` and `maplibregl.workerCount`, if being
@@ -223,14 +238,14 @@ Debug.extend(exported, {isSafari, getPerformanceMetrics: PerformanceUtils.getPer
  */
 
 /**
-  * Gets the map's [RTL text plugin](https://www.mapbox.com/mapbox-gl-js/plugins/#mapbox-gl-rtl-text) status.
-  * The status can be `unavailable` (i.e. not requested or removed), `loading`, `loaded` or `error`.
-  * If the status is `loaded` and the plugin is requested again, an error will be thrown.
-  *
-  * @function getRTLTextPluginStatus
-  * @example
-  * const pluginStatus = maplibregl.getRTLTextPluginStatus();
-  */
+ * Gets the map's [RTL text plugin](https://www.mapbox.com/mapbox-gl-js/plugins/#mapbox-gl-rtl-text) status.
+ * The status can be `unavailable` (i.e. not requested or removed), `loading`, `loaded` or `error`.
+ * If the status is `loaded` and the plugin is requested again, an error will be thrown.
+ *
+ * @function getRTLTextPluginStatus
+ * @example
+ * const pluginStatus = maplibregl.getRTLTextPluginStatus();
+ */
 
 export default exported;
 // canary assert: used to confirm that asserts have been removed from production build

package/src/render/draw_circle.ts

@@ -19,17 +19,17 @@ import type {CircleUniformsType} from './program/circle_program';
 export default drawCircles;
 
 type TileRenderState = {
-  programConfiguration: ProgramConfiguration;
-  program: Program<any>;
-  layoutVertexBuffer: VertexBuffer;
-  indexBuffer: IndexBuffer;
-  uniformValues: UniformValues<CircleUniformsType>;
+    programConfiguration: ProgramConfiguration;
+    program: Program<any>;
+    layoutVertexBuffer: VertexBuffer;
+    indexBuffer: IndexBuffer;
+    uniformValues: UniformValues<CircleUniformsType>;
 };
 
 type SegmentsTileRenderState = {
-  segments: SegmentVector;
-  sortKey: number;
-  state: TileRenderState;
+    segments: SegmentVector;
+    sortKey: number;
+    state: TileRenderState;
 };
 
 function drawCircles(painter: Painter, sourceCache: SourceCache, layer: CircleStyleLayer, coords: Array<OverscaledTileID>) {

package/src/render/draw_collision_debug.ts

@@ -8,7 +8,7 @@ import StencilMode from '../gl/stencil_mode';
 import CullFaceMode from '../gl/cull_face_mode';
 import {collisionUniformValues, collisionCircleUniformValues} from './program/collision_program';
 
-import {QuadTriangleArray, CollisionCircleLayoutArray} from '../data/array_types';
+import {QuadTriangleArray, CollisionCircleLayoutArray} from '../data/array_types.g';
 import {collisionCircleLayout} from '../data/bucket/symbol_attributes';
 import SegmentVector from '../data/segment';
 import {mat4} from 'gl-matrix';
@@ -18,10 +18,10 @@ import IndexBuffer from '../gl/index_buffer';
 export default drawCollisionDebug;
 
 type TileBatch = {
-  circleArray: Array<number>;
-  circleOffset: number;
-  transform: mat4;
-  invTransform: mat4;
+    circleArray: Array<number>;
+    circleOffset: number;
+    transform: mat4;
+    invTransform: mat4;
 };
 
 let quadTriangles: QuadTriangleArray;