@luma.gl/engine 9.0.0-alpha.14 → 9.0.0-alpha.16

package/dist/geometry/geometry.js

@@ -1,152 +1,106 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { uid, assert } from '@luma.gl/api';
 import GL from '@luma.gl/constants';
-export default class Geometry {
-  constructor(props = {}) {
-    _defineProperty(this, "id", void 0);
-
-    _defineProperty(this, "userData", {});
-
-    _defineProperty(this, "topology", void 0);
-
-    _defineProperty(this, "drawMode", GL.TRIANGLES);
-
-    _defineProperty(this, "vertexCount", void 0);
-
-    _defineProperty(this, "attributes", void 0);
-
-    _defineProperty(this, "indices", void 0);
-
-    const {
-      id = uid('geometry'),
-      drawMode = GL.TRIANGLES,
-      attributes = {},
-      indices = null,
-      vertexCount = null
-    } = props;
-    this.id = id;
-    this.drawMode = drawMode;
-    this.topology = props.topology || convertToTopology(drawMode);
-
-    if (indices) {
-      this.indices = ArrayBuffer.isView(indices) ? {
-        value: indices,
-        size: 1
-      } : indices;
+class Geometry {
+    constructor(props = {}) {
+        this.userData = {};
+        /** @deprecated */
+        this.drawMode = GL.TRIANGLES;
+        const { id = uid('geometry'), drawMode = GL.TRIANGLES, attributes = {}, indices = null, vertexCount = null } = props;
+        this.id = id;
+        this.drawMode = drawMode;
+        this.topology = props.topology || convertToTopology(drawMode);
+        if (indices) {
+            // @ts-expect-error
+            this.indices = ArrayBuffer.isView(indices) ? { value: indices, size: 1 } : indices;
+        }
+        // @ts-expect-error
+        this.attributes = {};
+        for (const [attributeName, attributeValue] of Object.entries(attributes)) {
+            // Wrap "unwrapped" arrays and try to autodetect their type
+            const attribute = ArrayBuffer.isView(attributeValue) ? { value: attributeValue } : attributeValue;
+            assert(ArrayBuffer.isView(attribute.value), `${this._print(attributeName)}: must be typed array or object with value as typed array`);
+            if ((attributeName === 'POSITION' || attributeName === 'positions') && !attribute.size) {
+                attribute.size = 3;
+            }
+            // Move indices to separate field
+            if (attributeName === 'indices') {
+                assert(!this.indices);
+                // @ts-expect-error
+                this.indices = attribute;
+            }
+            else {
+                this.attributes[attributeName] = attribute;
+            }
+        }
+        // @ts-expect-error
+        if (this.indices && this.indices.isIndexed !== undefined) {
+            this.indices = Object.assign({}, this.indices);
+            // @ts-expect-error
+            delete this.indices.isIndexed;
+        }
+        this.vertexCount = vertexCount || this._calculateVertexCount(this.attributes, this.indices);
     }
-
-    this.attributes = {};
-
-    for (const [attributeName, attributeValue] of Object.entries(attributes)) {
-      const attribute = ArrayBuffer.isView(attributeValue) ? {
-        value: attributeValue
-      } : attributeValue;
-      assert(ArrayBuffer.isView(attribute.value), "".concat(this._print(attributeName), ": must be typed array or object with value as typed array"));
-
-      if ((attributeName === 'POSITION' || attributeName === 'positions') && !attribute.size) {
-        attribute.size = 3;
-      }
-
-      if (attributeName === 'indices') {
-        assert(!this.indices);
-        this.indices = attribute;
-      } else {
-        this.attributes[attributeName] = attribute;
-      }
+    /** @deprecated Use string topology constants instead */
+    get mode() {
+        return this.drawMode;
     }
-
-    if (this.indices && this.indices.isIndexed !== undefined) {
-      this.indices = Object.assign({}, this.indices);
-      delete this.indices.isIndexed;
+    getVertexCount() {
+        return this.vertexCount;
     }
-
-    this.vertexCount = vertexCount || this._calculateVertexCount(this.attributes, this.indices);
-  }
-
-  get mode() {
-    return this.drawMode;
-  }
-
-  getVertexCount() {
-    return this.vertexCount;
-  }
-
-  getAttributes() {
-    return this.indices ? {
-      indices: this.indices,
-      ...this.attributes
-    } : this.attributes;
-  }
-
-  _print(attributeName) {
-    return "Geometry ".concat(this.id, " attribute ").concat(attributeName);
-  }
-
-  _setAttributes(attributes, indices) {
-    return this;
-  }
-
-  _calculateVertexCount(attributes, indices) {
-    if (indices) {
-      return indices.value.length;
+    // Return an object with all attributes plus indices added as a field.
+    getAttributes() {
+        // @ts-expect-error Geometry types are a mess
+        return this.indices ? { indices: this.indices, ...this.attributes } : this.attributes;
     }
-
-    let vertexCount = Infinity;
-
-    for (const attributeName in attributes) {
-      const attribute = attributes[attributeName];
-      const {
-        value,
-        size,
-        constant
-      } = attribute;
-
-      if (!constant && value && size >= 1) {
-        vertexCount = Math.min(vertexCount, value.length / size);
-      }
+    // PRIVATE
+    _print(attributeName) {
+        return `Geometry ${this.id} attribute ${attributeName}`;
+    }
+    // GeometryAttribute
+    // value: typed array
+    // type: indices, vertices, uvs
+    // size: elements per vertex
+    // target: WebGL buffer type (string or constant)
+    _setAttributes(attributes, indices) {
+        return this;
+    }
+    _calculateVertexCount(attributes, indices) {
+        if (indices) {
+            return indices.value.length;
+        }
+        let vertexCount = Infinity;
+        for (const attributeName in attributes) {
+            const attribute = attributes[attributeName];
+            const { value, size, constant } = attribute;
+            if (!constant && value && size >= 1) {
+                vertexCount = Math.min(vertexCount, value.length / size);
+            }
+        }
+        assert(Number.isFinite(vertexCount));
+        return vertexCount;
     }
-
-    assert(Number.isFinite(vertexCount));
-    return vertexCount;
-  }
-
 }
-
-_defineProperty(Geometry, "DRAW_MODE", {
-  POINTS: GL.POINTS,
-  LINES: GL.LINES,
-  LINE_LOOP: GL.LINE_LOOP,
-  LINE_STRIP: GL.LINE_STRIP,
-  TRIANGLES: GL.TRIANGLES,
-  TRIANGLE_STRIP: GL.TRIANGLE_STRIP,
-  TRIANGLE_FAN: GL.TRIANGLE_FAN
-});
-
+/** @deprecated */
+Geometry.DRAW_MODE = {
+    POINTS: GL.POINTS,
+    LINES: GL.LINES,
+    LINE_LOOP: GL.LINE_LOOP,
+    LINE_STRIP: GL.LINE_STRIP,
+    TRIANGLES: GL.TRIANGLES,
+    TRIANGLE_STRIP: GL.TRIANGLE_STRIP,
+    TRIANGLE_FAN: GL.TRIANGLE_FAN // draw a connected group of triangles.
+};
+export default Geometry;
 function convertToTopology(drawMode) {
-  switch (drawMode) {
-    case GL.POINTS:
-      return 'point-list';
-
-    case GL.LINES:
-      return 'line-list';
-
-    case GL.LINE_STRIP:
-      return 'line-strip';
-
-    case GL.TRIANGLES:
-      return 'triangle-list';
-
-    case GL.TRIANGLE_STRIP:
-      return 'triangle-strip';
-
-    case GL.TRIANGLE_FAN:
-      return 'triangle-fan';
-
-    case GL.LINE_LOOP:
-      return 'line-loop';
-
-    default:
-      throw new Error(String(drawMode));
-  }
+    switch (drawMode) {
+        case GL.POINTS: return 'point-list'; // draw single points.
+        case GL.LINES: return 'line-list'; // draw lines. Each vertex connects to the one after it.
+        case GL.LINE_STRIP: return 'line-strip'; // draw a connected group of line segments from the first vertex to the last
+        case GL.TRIANGLES: return 'triangle-list'; // draw triangles. Each set of three vertices creates a separate triangle.
+        case GL.TRIANGLE_STRIP: return 'triangle-strip'; // draw a connected group of triangles.
+        case GL.TRIANGLE_FAN: return 'triangle-fan'; // draw a connected group of triangles.
+        case GL.LINE_LOOP: return 'line-loop'; // draw lines. Each set of two vertices is treated as a separate line segment.
+        default:
+            throw new Error(String(drawMode));
+    }
 }
-//# sourceMappingURL=geometry.js.map

package/dist/geometry/primitive-utils.js

@@ -1,2 +1,31 @@
+"use strict";
+/*
+import type {GeometryTable} from './geometry-table.js';
 
-//# sourceMappingURL=primitive-utils.js.map
+export function unpackIndexedGeometry(geometry: GeometryTable): GeometryTable {
+  const {indices, attributes} = geometry;
+  if (!indices) {
+    return geometry;
+  }
+
+  const vertexCount = indices.length;
+  const unpackedAttributes = {};
+
+  for (const [name, values] of Object.entries(attributes)) {
+    const size = {POSITION: 3, NORMAL: 3, TEX_COORD0: 2}[name];
+    const unpackedValues = new values.constructor(length * size);
+    for (let x = 0; x < vertexCount; ++x) {
+      const index = indices[x];
+      for (let i = 0; i < size; i++) {
+        unpackedValues[x * size + i] = values[index * size + i];
+      }
+    }
+    unpackedAttributes[name] = unpackedValues;
+  }
+
+  return {
+    length,
+    attributes: unpackedAttributes
+  };
+}
+*/ 

package/dist/index.js

@@ -1,16 +1,20 @@
-export { Timeline } from './animation/timeline';
-export { KeyFrames } from './animation/key-frames';
-export { AnimationLoopTemplate } from './animation-loop/render-loop';
-export { AnimationLoop } from './animation-loop/animation-loop';
-export { makeAnimationLoop } from './animation-loop/make-animation-loop';
-export { Model } from './lib/model';
-export { PipelineFactory } from './lib/pipeline-factory';
-export { default as Geometry } from './geometry/geometry';
-export { ConeGeometry } from './geometries/cone-geometry';
-export { CubeGeometry } from './geometries/cube-geometry';
-export { CylinderGeometry } from './geometries/cylinder-geometry';
-export { IcoSphereGeometry } from './geometries/ico-sphere-geometry';
-export { PlaneGeometry } from './geometries/plane-geometry';
-export { SphereGeometry } from './geometries/sphere-geometry';
-export { TruncatedConeGeometry } from './geometries/truncated-cone-geometry';
-//# sourceMappingURL=index.js.map
+// luma.gl Engine API
+// Animation
+export { Timeline } from './animation/timeline.js';
+export { KeyFrames } from './animation/key-frames.js';
+export { AnimationLoopTemplate } from './animation-loop/render-loop.js';
+export { AnimationLoop } from './animation-loop/animation-loop.js';
+export { makeAnimationLoop } from './animation-loop/make-animation-loop.js';
+export { Model } from './lib/model.js';
+export { PipelineFactory } from './lib/pipeline-factory.js';
+// Utils
+// export {default as ClipSpace} from './lib/clip-space.js';
+// Geometries
+export { default as Geometry } from './geometry/geometry.js';
+export { ConeGeometry } from './geometries/cone-geometry.js';
+export { CubeGeometry } from './geometries/cube-geometry.js';
+export { CylinderGeometry } from './geometries/cylinder-geometry.js';
+export { IcoSphereGeometry } from './geometries/ico-sphere-geometry.js';
+export { PlaneGeometry } from './geometries/plane-geometry.js';
+export { SphereGeometry } from './geometries/sphere-geometry.js';
+export { TruncatedConeGeometry } from './geometries/truncated-cone-geometry.js';

package/dist/lib/clip-space.js

@@ -1,2 +1,51 @@
+"use strict";
+// ClipSpace
+/*
+import GL from '@luma.gl/constants';
+import Model, {ModelProps} from './model.js';
+import Geometry from '../geometry/geometry.js';
 
-//# sourceMappingURL=clip-space.js.map
+const CLIPSPACE_VERTEX_SHADER = glsl`\
+attribute vec2 aClipSpacePosition;
+attribute vec2 aTexCoord;
+attribute vec2 aCoordinate;
+
+varying vec2 position;
+varying vec2 coordinate;
+varying vec2 uv;
+
+void main(void) {
+  gl_Position = vec4(aClipSpacePosition, 0., 1.);
+  position = aClipSpacePosition;
+  coordinate = aCoordinate;
+  uv = aTexCoord;
+}
+`;
+
+/* eslint-disable indent, no-multi-spaces *
+const POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];
+
+
+export default class ClipSpace extends Model {
+  constructor(gl: WebGLRenderingContext, opts?: ModelProps) {
+    const TEX_COORDS = POSITIONS.map((coord) => (coord === -1 ? 0 : coord));
+
+    super(
+      gl,
+      Object.assign({}, opts, {
+        vs: CLIPSPACE_VERTEX_SHADER,
+        geometry: new Geometry({
+          drawMode: GL.TRIANGLE_STRIP,
+          vertexCount: 4,
+          attributes: {
+            aClipSpacePosition: {size: 2, value: new Float32Array(POSITIONS)},
+            aTexCoord: {size: 2, value: new Float32Array(TEX_COORDS)},
+            aCoordinate: {size: 2, value: new Float32Array(TEX_COORDS)}
+          }
+        })
+      })
+    );
+    this.setVertexCount(4);
+  }
+}
+*/ 

package/dist/lib/model-utils.js

@@ -1,45 +1,113 @@
 import { Buffer, assert } from '@luma.gl/api';
+// Support for mapping new geometries with glTF attribute names to "classic" luma.gl shader names
 const GLTF_TO_LUMA_ATTRIBUTE_MAP = {
-  POSITION: 'positions',
-  NORMAL: 'normals',
-  COLOR_0: 'colors',
-  TEXCOORD_0: 'texCoords',
-  TEXCOORD_1: 'texCoords1',
-  TEXCOORD_2: 'texCoords2'
+    POSITION: 'positions',
+    NORMAL: 'normals',
+    COLOR_0: 'colors',
+    TEXCOORD_0: 'texCoords',
+    TEXCOORD_1: 'texCoords1',
+    TEXCOORD_2: 'texCoords2'
 };
-export function getIndexBufferFromGeometry(device, geometry) {
-  if (!geometry.indices) {
-    return undefined;
-  }
-
-  const data = geometry.indices.value || geometry.indices;
-  assert(data instanceof Uint16Array || data instanceof Uint32Array, 'attribute array for "indices" must be of integer type');
-  return device.createBuffer({
-    usage: Buffer.INDEX,
-    data
-  });
-}
-export function getAttributeBuffersFromGeometry(device, geometry) {
-  const buffers = {};
+/*
+export function getAttributeLayoutsFromGeometry(geometry: Geometry) {
+  const layouts: Record<string, {}> = {};
+  let indices = geometry.indices;
 
   for (const [name, attribute] of Object.entries(geometry.attributes)) {
     const remappedName = mapAttributeName(name);
 
-    if (attribute !== null && attribute !== void 0 && attribute.constant) {
+    if (attribute.constant) {
       throw new Error('constant attributes not supported');
     } else {
-      const typedArray = attribute === null || attribute === void 0 ? void 0 : attribute.value;
-      buffers[remappedName] = device.createBuffer({
-        data: typedArray,
-        id: "".concat(remappedName, "-buffer")
-      });
+      const typedArray = attribute.value;
+      // Create accessor by copying the attribute and removing `value``
+      const accessor = {...attribute};
+      delete accessor.value;
+      buffers[remappedName] = [device.createBuffer(typedArray), accessor];
+
+      inferAttributeAccessor(name, accessor);
     }
   }
+}
+
+export class Table {
+  length: number;
+  // columns: Record<string, TypedArray> = {};
+}
 
-  return buffers;
+export class GPUTable {
+  length: number;
+  columns: Record<string, Buffer> = {};
 }
 
+export function convertTableToGPUTable(table: Table) {
+  // for (const ) {}
+}
+
+export function renameTableColumns(table: Table, map: (name: string) => string) {
+  const newColumns = table.columns.reduce()
+  table.clone();
+}
+*/
+export function getIndexBufferFromGeometry(device, geometry) {
+    if (!geometry.indices) {
+        return undefined;
+    }
+    // @ts-expect-error
+    const data = geometry.indices.value || geometry.indices;
+    assert(data instanceof Uint16Array || data instanceof Uint32Array, 'attribute array for "indices" must be of integer type');
+    return device.createBuffer({ usage: Buffer.INDEX, data });
+}
+export function getAttributeBuffersFromGeometry(device, geometry) {
+    const buffers = {};
+    for (const [name, attribute] of Object.entries(geometry.attributes)) {
+        const remappedName = mapAttributeName(name);
+        if (attribute?.constant) {
+            throw new Error('constant attributes not supported');
+        }
+        else {
+            const typedArray = attribute?.value;
+            buffers[remappedName] = device.createBuffer({ data: typedArray, id: `${remappedName}-buffer` });
+        }
+    }
+    return buffers;
+}
 function mapAttributeName(name) {
-  return GLTF_TO_LUMA_ATTRIBUTE_MAP[name] || name;
+    // @ts-ignore-error
+    return GLTF_TO_LUMA_ATTRIBUTE_MAP[name] || name;
+}
+/*
+// Check for well known attribute names
+// eslint-disable-next-line complexity
+export function inferAttributeAccessor(attributeName, attribute) {
+  let category;
+  switch (attributeName) {
+    case 'texCoords':
+    case 'texCoord1':
+    case 'texCoord2':
+    case 'texCoord3':
+      category = 'uvs';
+      break;
+    case 'vertices':
+    case 'positions':
+    case 'normals':
+    case 'pickingColors':
+      category = 'vectors';
+      break;
+    default:
+  }
+
+  // Check for categorys
+  switch (category) {
+    case 'vectors':
+      attribute.size = attribute.size || 3;
+      break;
+    case 'uvs':
+      attribute.size = attribute.size || 2;
+      break;
+    default:
+  }
+
+  assert(Number.isFinite(attribute.size), `attribute ${attributeName} needs size`);
 }
-//# sourceMappingURL=model-utils.js.map
+*/

package/dist/lib/model.d.ts

@@ -2,7 +2,7 @@ import type { Device, Buffer, RenderPipelineProps, RenderPass, Binding, Primitiv
 import { RenderPipeline } from '@luma.gl/api';
 import type { ShaderModule } from '@luma.gl/shadertools';
 import type Geometry from '../geometry/geometry';
-export declare type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
+export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
     vs?: {
         glsl?: string;
         wgsl?: string;

package/dist/lib/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC9G,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAC;AAIjD,oBAAY,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG;IAEhE,EAAE,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IACpD,EAAE,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IACpD,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACrD,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC5B,CAAC;AAcF,aAAa;AACb,qBAAa,KAAK;IAChB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,WAAW,SAAC;IACrB,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE5B,OAAO,CAAC,kBAAkB,CAAuE;gBAErF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IA2C7C,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IASnC,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAmBjC,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMtD,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAMrC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAMvD,uBAAuB;IACvB,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAMpD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMhD,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAWvC"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC9G,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAC;AAIjD,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG;IAEhE,EAAE,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IACpD,EAAE,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IACpD,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACrD,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC5B,CAAC;AAcF,aAAa;AACb,qBAAa,KAAK;IAChB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,WAAW,SAAC;IACrB,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE5B,OAAO,CAAC,kBAAkB,CAAuE;gBAErF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IA2C7C,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IASnC,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAmBjC,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMtD,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAMrC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAMvD,uBAAuB;IACvB,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAMpD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMhD,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAWvC"}