@luma.gl/shadertools 9.2.6 → 9.3.0-alpha.10

package/dist/lib/shader-module/shader-module-uniform-layout.d.ts

@@ -0,0 +1,91 @@
+import type { ShaderModule } from "./shader-module.js";
+/**
+ * Shader stages supported by shader-module uniform-layout validation helpers.
+ */
+export type ShaderModuleUniformLayoutStage = 'vertex' | 'fragment' | 'wgsl';
+/**
+ * Describes the result of comparing declared `uniformTypes` with the fields
+ * found in a shader uniform block.
+ */
+export type ShaderModuleUniformLayoutValidationResult = {
+    /** Name of the shader module being validated. */
+    moduleName: string;
+    /** Expected block name derived from the shader module name. */
+    uniformBlockName: string;
+    /** Shader stage that was inspected. */
+    stage: ShaderModuleUniformLayoutStage;
+    /** Field names declared by the module metadata. */
+    expectedUniformNames: string[];
+    /** Field names parsed from the shader source. */
+    actualUniformNames: string[];
+    /** Whether the declared and parsed field lists match exactly. */
+    matches: boolean;
+};
+/**
+ * Parsed information about one GLSL uniform block declaration.
+ */
+export type GLSLUniformBlockInfo = {
+    /** Declared block type name. */
+    blockName: string;
+    /** Optional instance name that follows the block declaration. */
+    instanceName: string | null;
+    /** Raw layout qualifier text, if present. */
+    layoutQualifier: string | null;
+    /** Whether any explicit layout qualifier was present. */
+    hasLayoutQualifier: boolean;
+    /** Whether the block explicitly declares `layout(std140)`. */
+    isStd140: boolean;
+    /** Raw source text inside the block braces. */
+    body: string;
+};
+/**
+ * Logging surface used by validation and warning helpers.
+ */
+type Logger = {
+    /** Error logger compatible with luma's deferred log API. */
+    error?: (...args: unknown[]) => () => unknown;
+    /** Warning logger compatible with luma's deferred log API. */
+    warn?: (...args: unknown[]) => () => unknown;
+};
+/**
+ * Returns the uniform block type name expected for the supplied shader module.
+ */
+export declare function getShaderModuleUniformBlockName(module: ShaderModule): string;
+/**
+ * Returns the ordered field names parsed from a shader module's uniform block.
+ *
+ * @returns `null` when the stage has no source or the expected block is absent.
+ */
+export declare function getShaderModuleUniformBlockFields(module: ShaderModule, stage: ShaderModuleUniformLayoutStage): string[] | null;
+/**
+ * Computes the validation result for a shader module's declared and parsed
+ * uniform-block field lists.
+ *
+ * @returns `null` when the module has no declared uniform types or no matching block.
+ */
+export declare function getShaderModuleUniformLayoutValidationResult(module: ShaderModule, stage: ShaderModuleUniformLayoutStage): ShaderModuleUniformLayoutValidationResult | null;
+/**
+ * Validates that a shader module's parsed uniform block matches `uniformTypes`.
+ *
+ * When a mismatch is detected, the helper logs a formatted error and optionally
+ * throws via {@link assert}.
+ */
+export declare function validateShaderModuleUniformLayout(module: ShaderModule, stage: ShaderModuleUniformLayoutStage, options?: {
+    log?: Logger;
+    throwOnError?: boolean;
+}): ShaderModuleUniformLayoutValidationResult | null;
+/**
+ * Parses all GLSL uniform blocks in a shader source string.
+ */
+export declare function getGLSLUniformBlocks(shaderSource: string): GLSLUniformBlockInfo[];
+/**
+ * Emits warnings for GLSL uniform blocks that do not explicitly declare
+ * `layout(std140)`.
+ *
+ * @returns The list of parsed blocks that were considered non-compliant.
+ */
+export declare function warnIfGLSLUniformBlocksAreNotStd140(shaderSource: string, stage: Exclude<ShaderModuleUniformLayoutStage, 'wgsl'>, log?: Logger, context?: {
+    label?: string;
+}): GLSLUniformBlockInfo[];
+export {};
+//# sourceMappingURL=shader-module-uniform-layout.d.ts.map

package/dist/lib/shader-module/shader-module-uniform-layout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-module-uniform-layout.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-uniform-layout.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAGlD;;GAEG;AACH,MAAM,MAAM,8BAA8B,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAC;AAE5E;;;GAGG;AACH,MAAM,MAAM,yCAAyC,GAAG;IACtD,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,CAAC;IACzB,uCAAuC;IACvC,KAAK,EAAE,8BAA8B,CAAC;IACtC,mDAAmD;IACnD,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iDAAiD;IACjD,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,iEAAiE;IACjE,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,6CAA6C;IAC7C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,yDAAyD;IACzD,kBAAkB,EAAE,OAAO,CAAC;IAC5B,8DAA8D;IAC9D,QAAQ,EAAE,OAAO,CAAC;IAClB,+CAA+C;IAC/C,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,KAAK,MAAM,GAAG;IACZ,4DAA4D;IAC5D,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,MAAM,OAAO,CAAC;IAC9C,8DAA8D;IAC9D,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,MAAM,OAAO,CAAC;CAC9C,CAAC;AAaF;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAE5E;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,8BAA8B,GACpC,MAAM,EAAE,GAAG,IAAI,CAcjB;AAED;;;;;GAKG;AACH,wBAAgB,4CAA4C,CAC1D,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,8BAA8B,GACpC,yCAAyC,GAAG,IAAI,CAmBlD;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,8BAA8B,EACrC,OAAO,GAAE;IACP,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;CACnB,GACL,yCAAyC,GAAG,IAAI,CAclD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAmBjF;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CACjD,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,OAAO,CAAC,8BAA8B,EAAE,MAAM,CAAC,EACtD,GAAG,CAAC,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAC,GACzB,oBAAoB,EAAE,CAqBxB"}

package/dist/lib/shader-module/shader-module-uniform-layout.js

@@ -0,0 +1,209 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { assert } from "../utils/assert.js";
+/**
+ * Matches one field declaration inside a GLSL uniform block body.
+ */
+const GLSL_UNIFORM_BLOCK_FIELD_REGEXP = /^(?:uniform\s+)?(?:(?:lowp|mediump|highp)\s+)?[A-Za-z0-9_]+(?:<[^>]+>)?\s+([A-Za-z0-9_]+)(?:\s*\[[^\]]+\])?\s*;/;
+/**
+ * Matches full GLSL uniform block declarations, including optional layout qualifiers.
+ */
+const GLSL_UNIFORM_BLOCK_REGEXP = /((?:layout\s*\([^)]*\)\s*)*)uniform\s+([A-Za-z_][A-Za-z0-9_]*)\s*\{([\s\S]*?)\}\s*([A-Za-z_][A-Za-z0-9_]*)?\s*;/g;
+/**
+ * Returns the uniform block type name expected for the supplied shader module.
+ */
+export function getShaderModuleUniformBlockName(module) {
+    return `${module.name}Uniforms`;
+}
+/**
+ * Returns the ordered field names parsed from a shader module's uniform block.
+ *
+ * @returns `null` when the stage has no source or the expected block is absent.
+ */
+export function getShaderModuleUniformBlockFields(module, stage) {
+    const shaderSource = stage === 'wgsl' ? module.source : stage === 'vertex' ? module.vs : module.fs;
+    if (!shaderSource) {
+        return null;
+    }
+    const uniformBlockName = getShaderModuleUniformBlockName(module);
+    return extractShaderUniformBlockFieldNames(shaderSource, stage === 'wgsl' ? 'wgsl' : 'glsl', uniformBlockName);
+}
+/**
+ * Computes the validation result for a shader module's declared and parsed
+ * uniform-block field lists.
+ *
+ * @returns `null` when the module has no declared uniform types or no matching block.
+ */
+export function getShaderModuleUniformLayoutValidationResult(module, stage) {
+    const expectedUniformNames = Object.keys(module.uniformTypes || {});
+    if (!expectedUniformNames.length) {
+        return null;
+    }
+    const actualUniformNames = getShaderModuleUniformBlockFields(module, stage);
+    if (!actualUniformNames) {
+        return null;
+    }
+    return {
+        moduleName: module.name,
+        uniformBlockName: getShaderModuleUniformBlockName(module),
+        stage,
+        expectedUniformNames,
+        actualUniformNames,
+        matches: areStringArraysEqual(expectedUniformNames, actualUniformNames)
+    };
+}
+/**
+ * Validates that a shader module's parsed uniform block matches `uniformTypes`.
+ *
+ * When a mismatch is detected, the helper logs a formatted error and optionally
+ * throws via {@link assert}.
+ */
+export function validateShaderModuleUniformLayout(module, stage, options = {}) {
+    const validationResult = getShaderModuleUniformLayoutValidationResult(module, stage);
+    if (!validationResult || validationResult.matches) {
+        return validationResult;
+    }
+    const message = formatShaderModuleUniformLayoutError(validationResult);
+    options.log?.error?.(message, validationResult)();
+    if (options.throwOnError !== false) {
+        assert(false, message);
+    }
+    return validationResult;
+}
+/**
+ * Parses all GLSL uniform blocks in a shader source string.
+ */
+export function getGLSLUniformBlocks(shaderSource) {
+    const blocks = [];
+    const uncommentedSource = stripShaderComments(shaderSource);
+    for (const sourceMatch of uncommentedSource.matchAll(GLSL_UNIFORM_BLOCK_REGEXP)) {
+        const layoutQualifier = sourceMatch[1]?.trim() || null;
+        blocks.push({
+            blockName: sourceMatch[2],
+            body: sourceMatch[3],
+            instanceName: sourceMatch[4] || null,
+            layoutQualifier,
+            hasLayoutQualifier: Boolean(layoutQualifier),
+            isStd140: Boolean(layoutQualifier && /\blayout\s*\([^)]*\bstd140\b[^)]*\)/.exec(layoutQualifier))
+        });
+    }
+    return blocks;
+}
+/**
+ * Emits warnings for GLSL uniform blocks that do not explicitly declare
+ * `layout(std140)`.
+ *
+ * @returns The list of parsed blocks that were considered non-compliant.
+ */
+export function warnIfGLSLUniformBlocksAreNotStd140(shaderSource, stage, log, context) {
+    const nonStd140Blocks = getGLSLUniformBlocks(shaderSource).filter(block => !block.isStd140);
+    const seenBlockNames = new Set();
+    for (const block of nonStd140Blocks) {
+        if (seenBlockNames.has(block.blockName)) {
+            continue;
+        }
+        seenBlockNames.add(block.blockName);
+        const shaderLabel = context?.label ? `${context.label} ` : '';
+        const actualLayout = block.hasLayoutQualifier
+            ? `declares ${normalizeWhitespace(block.layoutQualifier)} instead of layout(std140)`
+            : 'does not declare layout(std140)';
+        const message = `${shaderLabel}${stage} shader uniform block ${block.blockName} ${actualLayout}. luma.gl host-side shader block packing assumes explicit layout(std140) for GLSL uniform blocks. Add \`layout(std140)\` to the block declaration.`;
+        log?.warn?.(message, block)();
+    }
+    return nonStd140Blocks;
+}
+/**
+ * Extracts field names from the named GLSL or WGSL uniform block/struct.
+ */
+function extractShaderUniformBlockFieldNames(shaderSource, language, uniformBlockName) {
+    const sourceBody = language === 'wgsl'
+        ? extractWGSLStructBody(shaderSource, uniformBlockName)
+        : extractGLSLUniformBlockBody(shaderSource, uniformBlockName);
+    if (!sourceBody) {
+        return null;
+    }
+    const fieldNames = [];
+    for (const sourceLine of sourceBody.split('\n')) {
+        const line = sourceLine.replace(/\/\/.*$/, '').trim();
+        if (!line || line.startsWith('#')) {
+            continue;
+        }
+        const fieldMatch = language === 'wgsl'
+            ? line.match(/^([A-Za-z0-9_]+)\s*:/)
+            : line.match(GLSL_UNIFORM_BLOCK_FIELD_REGEXP);
+        if (fieldMatch) {
+            fieldNames.push(fieldMatch[1]);
+        }
+    }
+    return fieldNames;
+}
+/**
+ * Extracts the body of a WGSL struct with the supplied name.
+ */
+function extractWGSLStructBody(shaderSource, uniformBlockName) {
+    const structMatch = new RegExp(`\\bstruct\\s+${uniformBlockName}\\b`, 'm').exec(shaderSource);
+    if (!structMatch) {
+        return null;
+    }
+    const openBraceIndex = shaderSource.indexOf('{', structMatch.index);
+    if (openBraceIndex < 0) {
+        return null;
+    }
+    let braceDepth = 0;
+    for (let index = openBraceIndex; index < shaderSource.length; index++) {
+        const character = shaderSource[index];
+        if (character === '{') {
+            braceDepth++;
+            continue;
+        }
+        if (character !== '}') {
+            continue;
+        }
+        braceDepth--;
+        if (braceDepth === 0) {
+            return shaderSource.slice(openBraceIndex + 1, index);
+        }
+    }
+    return null;
+}
+/**
+ * Extracts the body of a named GLSL uniform block from shader source.
+ */
+function extractGLSLUniformBlockBody(shaderSource, uniformBlockName) {
+    const block = getGLSLUniformBlocks(shaderSource).find(candidate => candidate.blockName === uniformBlockName);
+    return block?.body || null;
+}
+/**
+ * Returns `true` when the two arrays contain the same strings in the same order.
+ */
+function areStringArraysEqual(leftValues, rightValues) {
+    if (leftValues.length !== rightValues.length) {
+        return false;
+    }
+    for (let valueIndex = 0; valueIndex < leftValues.length; valueIndex++) {
+        if (leftValues[valueIndex] !== rightValues[valueIndex]) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Formats the standard validation error message for a shader-module layout mismatch.
+ */
+function formatShaderModuleUniformLayoutError(validationResult) {
+    return `${validationResult.moduleName}: ${validationResult.stage} shader uniform block ${validationResult.uniformBlockName} does not match module.uniformTypes.\nExpected: ${validationResult.expectedUniformNames.join(', ')}\nActual: ${validationResult.actualUniformNames.join(', ')}`;
+}
+/**
+ * Removes line and block comments from shader source before lightweight parsing.
+ */
+function stripShaderComments(shaderSource) {
+    return shaderSource.replace(/\/\*[\s\S]*?\*\//g, '').replace(/\/\/.*$/gm, '');
+}
+/**
+ * Collapses repeated whitespace in a layout qualifier for log-friendly output.
+ */
+function normalizeWhitespace(value) {
+    return value.replace(/\s+/g, ' ').trim();
+}
+//# sourceMappingURL=shader-module-uniform-layout.js.map

package/dist/lib/shader-module/shader-module-uniform-layout.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-module-uniform-layout.js","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-uniform-layout.ts"],"names":[],"mappings":"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"}

package/dist/lib/shader-module/shader-module.d.ts

@@ -1,11 +1,15 @@
 import { UniformFormat } from "../../types.js";
 import { PropType, PropValidator } from "../filters/prop-types.js";
-import type { UniformSizes, UniformTypes, UniformValue } from "../utils/uniform-types.js";
+import type { ShaderModuleUniformValue, UniformTypes, UniformValue } from "../utils/uniform-types.js";
 import { ShaderInjection } from "../shader-assembly/shader-injections.js";
 type Binding = unknown;
 export type UniformInfo = {
     format?: UniformFormat;
 } & PropType;
+export type ShaderModuleBindingLayout = {
+    name: string;
+    group: number;
+};
 type BindingKeys<T> = {
     [K in keyof T]: T[K] extends UniformValue ? never : K;
 }[keyof T];
@@ -25,13 +29,17 @@ export type PickUniforms<T> = {
  * @note `UniformsT` & `BindingsT` are deduced from `PropsT` by default. If
  * a custom type for `UniformsT` is used, `BindingsT` should be also be provided.
  */
-export type ShaderModule<PropsT extends Record<string, any> = Record<string, any>, UniformsT extends Record<string, UniformValue> = PickUniforms<PropsT>, BindingsT extends Record<string, Binding> = PickBindings<PropsT>> = {
+export type ShaderModule<PropsT extends Record<string, any> = Record<string, any>, UniformsT extends Record<string, ShaderModuleUniformValue> = PickUniforms<PropsT>, BindingsT extends Record<string, Binding> = PickBindings<PropsT>> = {
     /** Used for type inference not for values */
     props?: PropsT;
     /** Used for type inference, not currently used for values */
     uniforms?: UniformsT;
     /** Used for type inference, not currently used for values */
     bindings?: BindingsT;
+    /** Logical bind-group assignment for bindings declared by this module */
+    bindingLayout?: readonly ShaderModuleBindingLayout[];
+    /** Preferred starting binding slot for this module's WGSL `@binding(auto)` declarations. */
+    firstBindingSlot?: number;
     name: string;
     /** WGSL code */
     source?: string;
@@ -41,15 +49,13 @@ export type ShaderModule<PropsT extends Record<string, any> = Record<string, any
     vs?: string;
     /** Uniform shader types @note: Both order and types MUST match uniform block declarations in shader */
     uniformTypes?: Required<UniformTypes<UniformsT>>;
-    /** Uniform shader array sizes (default 1) */
-    uniformSizes?: Required<UniformSizes<UniformsT>>;
     /** Uniform JS prop types  */
     propTypes?: Record<keyof UniformsT, UniformInfo>;
     /** Default uniform values */
     defaultUniforms?: Required<UniformsT>;
     /** Function that maps props to uniforms & bindings */
     getUniforms?: (props: Partial<PropsT>, prevUniforms?: UniformsT) => Partial<UniformsT & BindingsT>;
-    defines?: Record<string, boolean>;
+    defines?: Record<string, boolean | number>;
     /** Injections */
     inject?: Record<string, string | {
         injection: string;
@@ -79,7 +85,7 @@ export type ShaderModuleDeprecation = {
 export declare function initializeShaderModules(modules: ShaderModule[]): void;
 export declare function initializeShaderModule(module: ShaderModule): void;
 /** Convert module props to uniforms */
-export declare function getShaderModuleUniforms<ShaderModuleT extends ShaderModule<Record<string, unknown>, Record<string, UniformValue>>>(module: ShaderModuleT, props?: ShaderModuleT['props'], oldUniforms?: ShaderModuleT['uniforms']): Record<string, Binding | UniformValue>;
+export declare function getShaderModuleUniforms<ShaderModuleT extends ShaderModule<Record<string, unknown>, Record<string, ShaderModuleUniformValue>>>(module: ShaderModuleT, props?: ShaderModuleT['props'], oldUniforms?: ShaderModuleT['uniforms']): Record<string, Binding | ShaderModuleUniformValue>;
 export declare function checkShaderModuleDeprecations(shaderModule: ShaderModule, shaderSource: string, log: any): void;
 export {};
 //# sourceMappingURL=shader-module.d.ts.map

package/dist/lib/shader-module/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module.ts"],"names":[],"mappings":"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"}

package/dist/lib/shader-module/shader-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.js","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shader-module.js","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module.ts"],"names":[],"mappings":"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"}

package/dist/lib/utils/assert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/assert.ts"],"names":[],"mappings":"AAMA,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAIjE"}
+{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/assert.ts"],"names":[],"mappings":"AAMA,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAMjE"}

package/dist/lib/utils/assert.js

@@ -5,7 +5,9 @@
 // message so keep it for now.
 export function assert(condition, message) {
     if (!condition) {
-        throw new Error(message || 'shadertools: assertion failed.');
+        const error = new Error(message || 'shadertools: assertion failed.');
+        Error.captureStackTrace?.(error, assert);
+        throw error;
     }
 }
 //# sourceMappingURL=assert.js.map

package/dist/lib/utils/assert.js.map

@@ -1 +1 @@
-{"version":3,"file":"assert.js","sourceRoot":"","sources":["../../../src/lib/utils/assert.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,+EAA+E;AAC/E,8BAA8B;AAC9B,MAAM,UAAU,MAAM,CAAC,SAAkB,EAAE,OAAgB;IACzD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,gCAAgC,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC"}
+{"version":3,"file":"assert.js","sourceRoot":"","sources":["../../../src/lib/utils/assert.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,+EAA+E;AAC/E,8BAA8B;AAC9B,MAAM,UAAU,MAAM,CAAC,SAAkB,EAAE,OAAgB;IACzD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,IAAI,gCAAgC,CAAC,CAAC;QACrE,KAAK,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACzC,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/lib/utils/uniform-types.d.ts

@@ -1,14 +1,18 @@
 import type { Matrix3, Matrix4, Vector2, Vector3, Vector4, NumberArray2, NumberArray3, NumberArray4, NumberArray6, NumberArray8, NumberArray9, NumberArray12, NumberArray16 } from '@math.gl/core';
+import type { CompositeShaderType } from '@luma.gl/core';
 export type UniformValue = Readonly<number | boolean | NumberArray2 | NumberArray3 | NumberArray4 | NumberArray6 | NumberArray8 | NumberArray9 | NumberArray12 | NumberArray16 | Vector2 | Vector3 | Vector4 | Matrix3 | Matrix4>;
-type UniformType<ValueT extends UniformValue> = ValueT extends number | boolean ? 'f32' | 'i32' | 'u32' : ValueT extends Readonly<NumberArray2 | Vector2> ? 'vec2<f32>' | 'vec2<i32>' | 'vec2<u32>' : ValueT extends Readonly<NumberArray3 | Vector3> ? 'vec3<f32>' | 'vec3<i32>' | 'vec3<u32>' : ValueT extends Readonly<NumberArray4 | Vector4> ? 'vec4<f32>' | 'vec4<i32>' | 'vec4<u32>' | 'mat2x2<f32>' : ValueT extends Readonly<NumberArray6> ? 'mat2x3<f32>' | 'mat3x2<f32>' : ValueT extends Readonly<NumberArray8> ? 'mat2x4<f32>' | 'mat4x2<f32>' : ValueT extends Readonly<NumberArray9 | Matrix3> ? 'mat3x3<f32>' : ValueT extends Readonly<NumberArray12> ? 'mat3x4<f32>' | 'mat4x3<f32>' : ValueT extends Readonly<NumberArray16 | Matrix4> ? 'mat4x4<f32>' : never;
-type UniformProps = {
-    [name: string]: UniformValue;
+export type ShaderModuleUniformValue = UniformValue | ShaderModuleUniformStruct | ShaderModuleUniformArray;
+export type ShaderModuleUniformStruct = {
+    [name: string]: ShaderModuleUniformValue | undefined;
 };
+export type ShaderModuleUniformArray = ReadonlyArray<ShaderModuleUniformValue | undefined>;
+type UniformLeafType<ValueT extends UniformValue> = ValueT extends number | boolean ? 'f32' | 'i32' | 'u32' : ValueT extends Readonly<NumberArray2 | Vector2> ? 'vec2<f32>' | 'vec2<i32>' | 'vec2<u32>' : ValueT extends Readonly<NumberArray3 | Vector3> ? 'vec3<f32>' | 'vec3<i32>' | 'vec3<u32>' : ValueT extends Readonly<NumberArray4 | Vector4> ? 'vec4<f32>' | 'vec4<i32>' | 'vec4<u32>' | 'mat2x2<f32>' : ValueT extends Readonly<NumberArray6> ? 'mat2x3<f32>' | 'mat3x2<f32>' : ValueT extends Readonly<NumberArray8> ? 'mat2x4<f32>' | 'mat4x2<f32>' : ValueT extends Readonly<NumberArray9 | Matrix3> ? 'mat3x3<f32>' : ValueT extends Readonly<NumberArray12> ? 'mat3x4<f32>' | 'mat4x3<f32>' : ValueT extends Readonly<NumberArray16 | Matrix4> ? 'mat4x4<f32>' : never;
+type UniformType<ValueT> = ValueT extends UniformValue ? UniformLeafType<ValueT> : ValueT extends ReadonlyArray<infer ElementT> ? readonly [UniformType<NonNullable<ElementT>>, number] : ValueT extends Record<string, unknown> ? {
+    [name in keyof ValueT]-?: UniformType<NonNullable<ValueT[name]>>;
+} : never;
+type UniformProps = Record<string, unknown>;
 export type UniformTypes<PropsT extends UniformProps> = {
-    [name in keyof PropsT]: UniformType<PropsT[name]>;
-};
-export type UniformSizes<PropsT extends UniformProps> = {
-    [name in keyof PropsT]: number;
+    [name in keyof PropsT]-?: UniformType<NonNullable<PropsT[name]>> & CompositeShaderType;
 };
 export {};
 //# sourceMappingURL=uniform-types.d.ts.map

package/dist/lib/utils/uniform-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uniform-types.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/uniform-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACP,OAAO,EACP,OAAO,EACP,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,EACd,MAAM,eAAe,CAAC;AAOvB,MAAM,MAAM,YAAY,GAAG,QAAQ,CAC/B,MAAM,GACN,OAAO,GACP,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,aAAa,GACb,aAAa,GACb,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,CACV,CAAC;AAEF,KAAK,WAAW,CAAC,MAAM,SAAS,YAAY,IAAI,MAAM,SAAS,MAAM,GAAG,OAAO,GAC3E,KAAK,GAAG,KAAK,GAAG,KAAK,GACrB,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,WAAW,GAAG,WAAW,GAAG,WAAW,GACvC,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,WAAW,GAAG,WAAW,GAAG,WAAW,GACvC,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,aAAa,GACvD,MAAM,SAAS,QAAQ,CAAC,YAAY,CAAC,GACnC,aAAa,GAAG,aAAa,GAC7B,MAAM,SAAS,QAAQ,CAAC,YAAY,CAAC,GACnC,aAAa,GAAG,aAAa,GAC7B,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,aAAa,GACb,MAAM,SAAS,QAAQ,CAAC,aAAa,CAAC,GACpC,aAAa,GAAG,aAAa,GAC7B,MAAM,SAAS,QAAQ,CAAC,aAAa,GAAG,OAAO,CAAC,GAC9C,aAAa,GACb,KAAK,CAAC;AAE1B,KAAK,YAAY,GAAG;IAClB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,YAAY,IAAI;KACrD,IAAI,IAAI,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,YAAY,IAAI;KACrD,IAAI,IAAI,MAAM,MAAM,GAAG,MAAM;CAC/B,CAAC"}
+{"version":3,"file":"uniform-types.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/uniform-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACP,OAAO,EACP,OAAO,EACP,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,aAAa,EACd,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAOvD,MAAM,MAAM,YAAY,GAAG,QAAQ,CAC/B,MAAM,GACN,OAAO,GACP,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,aAAa,GACb,aAAa,GACb,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,CACV,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAChC,YAAY,GACZ,yBAAyB,GACzB,wBAAwB,CAAC;AAE7B,MAAM,MAAM,yBAAyB,GAAG;IACtC,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,aAAa,CAAC,wBAAwB,GAAG,SAAS,CAAC,CAAC;AAE3F,KAAK,eAAe,CAAC,MAAM,SAAS,YAAY,IAAI,MAAM,SAAS,MAAM,GAAG,OAAO,GAC/E,KAAK,GAAG,KAAK,GAAG,KAAK,GACrB,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,WAAW,GAAG,WAAW,GAAG,WAAW,GACvC,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,WAAW,GAAG,WAAW,GAAG,WAAW,GACvC,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,aAAa,GACvD,MAAM,SAAS,QAAQ,CAAC,YAAY,CAAC,GACnC,aAAa,GAAG,aAAa,GAC7B,MAAM,SAAS,QAAQ,CAAC,YAAY,CAAC,GACnC,aAAa,GAAG,aAAa,GAC7B,MAAM,SAAS,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,GAC7C,aAAa,GACb,MAAM,SAAS,QAAQ,CAAC,aAAa,CAAC,GACpC,aAAa,GAAG,aAAa,GAC7B,MAAM,SAAS,QAAQ,CAAC,aAAa,GAAG,OAAO,CAAC,GAC9C,aAAa,GACb,KAAK,CAAC;AAE1B,KAAK,WAAW,CAAC,MAAM,IAAI,MAAM,SAAS,YAAY,GAClD,eAAe,CAAC,MAAM,CAAC,GACvB,MAAM,SAAS,aAAa,CAAC,MAAM,QAAQ,CAAC,GAC1C,SAAS,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,GACrD,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACpC;KAAE,IAAI,IAAI,MAAM,MAAM,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;CAAC,GAClE,KAAK,CAAC;AAEd,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE5C,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,YAAY,IAAI;KACrD,IAAI,IAAI,MAAM,MAAM,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,mBAAmB;CACvF,CAAC"}

package/dist/modules/engine/picking/picking.d.ts

@@ -39,6 +39,9 @@ export type PickingUniforms = {
     highlightColor?: NumberArray4;
 };
 /**
+ * Deprecated legacy picking module retained for compatibility with existing
+ * shadertools users such as deck.gl. Keep the shader contract stable.
+ *
  * Provides support for color-coding-based picking and highlighting.
  * In particular, supports picking a specific instance in an instanced
  * draw call and highlighting an instance based on its picking color,
@@ -65,8 +68,8 @@ export declare const picking: {
         readonly highlightedObjectColor: [0, 0, 0];
         readonly highlightColor: NumberArray4;
     };
-    readonly vs: "uniform pickingUniforms {\n  float isActive;\n  float isAttribute;\n  float isHighlightActive;\n  float useFloatColors;\n  vec3 highlightedObjectColor;\n  vec4 highlightColor;\n} picking;\n\nout vec4 picking_vRGBcolor_Avalid;\n\n// Normalize unsigned byte color to 0-1 range\nvec3 picking_normalizeColor(vec3 color) {\n  return picking.useFloatColors > 0.5 ? color : color / 255.0;\n}\n\n// Normalize unsigned byte color to 0-1 range\nvec4 picking_normalizeColor(vec4 color) {\n  return picking.useFloatColors > 0.5 ? color : color / 255.0;\n}\n\nbool picking_isColorZero(vec3 color) {\n  return dot(color, vec3(1.0)) < 0.00001;\n}\n\nbool picking_isColorValid(vec3 color) {\n  return dot(color, vec3(1.0)) > 0.00001;\n}\n\n// Check if this vertex is highlighted \nbool isVertexHighlighted(vec3 vertexColor) {\n  vec3 highlightedObjectColor = picking_normalizeColor(picking.highlightedObjectColor);\n  return\n    bool(picking.isHighlightActive) && picking_isColorZero(abs(vertexColor - highlightedObjectColor));\n}\n\n// Set the current picking color\nvoid picking_setPickingColor(vec3 pickingColor) {\n  pickingColor = picking_normalizeColor(pickingColor);\n\n  if (bool(picking.isActive)) {\n    // Use alpha as the validity flag. If pickingColor is [0, 0, 0] fragment is non-pickable\n    picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));\n\n    if (!bool(picking.isAttribute)) {\n      // Stores the picking color so that the fragment shader can render it during picking\n      picking_vRGBcolor_Avalid.rgb = pickingColor;\n    }\n  } else {\n    // Do the comparison with selected item color in vertex shader as it should mean fewer compares\n    picking_vRGBcolor_Avalid.a = float(isVertexHighlighted(pickingColor));\n  }\n}\n\nvoid picking_setPickingAttribute(float value) {\n  if (bool(picking.isAttribute)) {\n    picking_vRGBcolor_Avalid.r = value;\n  }\n}\n\nvoid picking_setPickingAttribute(vec2 value) {\n  if (bool(picking.isAttribute)) {\n    picking_vRGBcolor_Avalid.rg = value;\n  }\n}\n\nvoid picking_setPickingAttribute(vec3 value) {\n  if (bool(picking.isAttribute)) {\n    picking_vRGBcolor_Avalid.rgb = value;\n  }\n}\n";
-    readonly fs: "uniform pickingUniforms {\n  float isActive;\n  float isAttribute;\n  float isHighlightActive;\n  float useFloatColors;\n  vec3 highlightedObjectColor;\n  vec4 highlightColor;\n} picking;\n\nin vec4 picking_vRGBcolor_Avalid;\n\n/*\n * Returns highlight color if this item is selected.\n */\nvec4 picking_filterHighlightColor(vec4 color) {\n  // If we are still picking, we don't highlight\n  if (picking.isActive > 0.5) {\n    return color;\n  }\n\n  bool selected = bool(picking_vRGBcolor_Avalid.a);\n\n  if (selected) {\n    // Blend in highlight color based on its alpha value\n    float highLightAlpha = picking.highlightColor.a;\n    float blendedAlpha = highLightAlpha + color.a * (1.0 - highLightAlpha);\n    float highLightRatio = highLightAlpha / blendedAlpha;\n\n    vec3 blendedRGB = mix(color.rgb, picking.highlightColor.rgb, highLightRatio);\n    return vec4(blendedRGB, blendedAlpha);\n  } else {\n    return color;\n  }\n}\n\n/*\n * Returns picking color if picking enabled else unmodified argument.\n */\nvec4 picking_filterPickingColor(vec4 color) {\n  if (bool(picking.isActive)) {\n    if (picking_vRGBcolor_Avalid.a == 0.0) {\n      discard;\n    }\n    return picking_vRGBcolor_Avalid;\n  }\n  return color;\n}\n\n/*\n * Returns picking color if picking is enabled if not\n * highlight color if this item is selected, otherwise unmodified argument.\n */\nvec4 picking_filterColor(vec4 color) {\n  vec4 highlightColor = picking_filterHighlightColor(color);\n  return picking_filterPickingColor(highlightColor);\n}\n";
+    readonly vs: "layout(std140) uniform pickingUniforms {\n  float isActive;\n  float isAttribute;\n  float isHighlightActive;\n  float useFloatColors;\n  vec3 highlightedObjectColor;\n  vec4 highlightColor;\n} picking;\n\nout vec4 picking_vRGBcolor_Avalid;\n\n// Normalize unsigned byte color to 0-1 range\nvec3 picking_normalizeColor(vec3 color) {\n  return picking.useFloatColors > 0.5 ? color : color / 255.0;\n}\n\n// Normalize unsigned byte color to 0-1 range\nvec4 picking_normalizeColor(vec4 color) {\n  return picking.useFloatColors > 0.5 ? color : color / 255.0;\n}\n\nbool picking_isColorZero(vec3 color) {\n  return dot(color, vec3(1.0)) < 0.00001;\n}\n\nbool picking_isColorValid(vec3 color) {\n  return dot(color, vec3(1.0)) > 0.00001;\n}\n\n// Check if this vertex is highlighted \nbool isVertexHighlighted(vec3 vertexColor) {\n  vec3 highlightedObjectColor = picking_normalizeColor(picking.highlightedObjectColor);\n  return\n    bool(picking.isHighlightActive) && picking_isColorZero(abs(vertexColor - highlightedObjectColor));\n}\n\n// Set the current picking color\nvoid picking_setPickingColor(vec3 pickingColor) {\n  pickingColor = picking_normalizeColor(pickingColor);\n\n  if (bool(picking.isActive)) {\n    // Use alpha as the validity flag. If pickingColor is [0, 0, 0] fragment is non-pickable\n    picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));\n\n    if (!bool(picking.isAttribute)) {\n      // Stores the picking color so that the fragment shader can render it during picking\n      picking_vRGBcolor_Avalid.rgb = pickingColor;\n    }\n  } else {\n    // Do the comparison with selected item color in vertex shader as it should mean fewer compares\n    picking_vRGBcolor_Avalid.a = float(isVertexHighlighted(pickingColor));\n  }\n}\n\nvoid picking_setPickingAttribute(float value) {\n  if (bool(picking.isAttribute)) {\n    picking_vRGBcolor_Avalid.r = value;\n  }\n}\n\nvoid picking_setPickingAttribute(vec2 value) {\n  if (bool(picking.isAttribute)) {\n    picking_vRGBcolor_Avalid.rg = value;\n  }\n}\n\nvoid picking_setPickingAttribute(vec3 value) {\n  if (bool(picking.isAttribute)) {\n    picking_vRGBcolor_Avalid.rgb = value;\n  }\n}\n";
+    readonly fs: "layout(std140) uniform pickingUniforms {\n  float isActive;\n  float isAttribute;\n  float isHighlightActive;\n  float useFloatColors;\n  vec3 highlightedObjectColor;\n  vec4 highlightColor;\n} picking;\n\nin vec4 picking_vRGBcolor_Avalid;\n\n/*\n * Returns highlight color if this item is selected.\n */\nvec4 picking_filterHighlightColor(vec4 color) {\n  // If we are still picking, we don't highlight\n  if (picking.isActive > 0.5) {\n    return color;\n  }\n\n  bool selected = bool(picking_vRGBcolor_Avalid.a);\n\n  if (selected) {\n    // Blend in highlight color based on its alpha value\n    float highLightAlpha = picking.highlightColor.a;\n    float blendedAlpha = highLightAlpha + color.a * (1.0 - highLightAlpha);\n    float highLightRatio = highLightAlpha / blendedAlpha;\n\n    vec3 blendedRGB = mix(color.rgb, picking.highlightColor.rgb, highLightRatio);\n    return vec4(blendedRGB, blendedAlpha);\n  } else {\n    return color;\n  }\n}\n\n/*\n * Returns picking color if picking enabled else unmodified argument.\n */\nvec4 picking_filterPickingColor(vec4 color) {\n  if (bool(picking.isActive)) {\n    if (picking_vRGBcolor_Avalid.a == 0.0) {\n      discard;\n    }\n    return picking_vRGBcolor_Avalid;\n  }\n  return color;\n}\n\n/*\n * Returns picking color if picking is enabled if not\n * highlight color if this item is selected, otherwise unmodified argument.\n */\nvec4 picking_filterColor(vec4 color) {\n  vec4 highlightColor = picking_filterHighlightColor(color);\n  return picking_filterPickingColor(highlightColor);\n}\n";
     readonly getUniforms: typeof getUniforms;
 };
 declare function getUniforms(opts?: PickingProps, prevUniforms?: PickingUniforms): PickingUniforms;

package/dist/modules/engine/picking/picking.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"picking.d.ts","sourceRoot":"","sources":["../../../../src/modules/engine/picking/picking.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAK9D;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,qDAAqD;IACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6FAA6F;IAC7F,sBAAsB,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7C,mDAAmD;IACnD,cAAc,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC;IAC7C,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,6DAA6D;IAC7D,sBAAsB,CAAC,EAAE,YAAY,CAAC;IACtC,mDAAmD;IACnD,cAAc,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAC;AAuIF;;;;;;GAMG;AACH,eAAO,MAAM,OAAO;oBACL,YAAY;uBACT,eAAe;;;;;;;;;;;;;;;;;;;;;CAwB+B,CAAC;AAEjE,iBAAS,WAAW,CAAC,IAAI,GAAE,YAAiB,EAAE,YAAY,CAAC,EAAE,eAAe,GAAG,eAAe,CA+B7F"}
+{"version":3,"file":"picking.d.ts","sourceRoot":"","sources":["../../../../src/modules/engine/picking/picking.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAK9D;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,qDAAqD;IACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6FAA6F;IAC7F,sBAAsB,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7C,mDAAmD;IACnD,cAAc,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC;IAC7C,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,+BAA+B;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,6DAA6D;IAC7D,sBAAsB,CAAC,EAAE,YAAY,CAAC;IACtC,mDAAmD;IACnD,cAAc,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAC;AAuIF;;;;;;;;;GASG;AACH,eAAO,MAAM,OAAO;oBACL,YAAY;uBACT,eAAe;;;;;;;;;;;;;;;;;;;;;CAwB+B,CAAC;AAEjE,iBAAS,WAAW,CAAC,IAAI,GAAE,YAAiB,EAAE,YAAY,CAAC,EAAE,eAAe,GAAG,eAAe,CA+B7F"}

package/dist/modules/engine/picking/picking.js

@@ -4,7 +4,7 @@
 // cyan color
 const DEFAULT_HIGHLIGHT_COLOR = [0, 1, 1, 1];
 const vs = /* glsl */ `\
-uniform pickingUniforms {
+layout(std140) uniform pickingUniforms {
   float isActive;
   float isAttribute;
   float isHighlightActive;
@@ -77,7 +77,7 @@ void picking_setPickingAttribute(vec3 value) {
 }
 `;
 const fs = /* glsl */ `\
-uniform pickingUniforms {
+layout(std140) uniform pickingUniforms {
   float isActive;
   float isAttribute;
   float isHighlightActive;
@@ -135,6 +135,9 @@ vec4 picking_filterColor(vec4 color) {
 }
 `;
 /**
+ * Deprecated legacy picking module retained for compatibility with existing
+ * shadertools users such as deck.gl. Keep the shader contract stable.
+ *
  * Provides support for color-coding-based picking and highlighting.
  * In particular, supports picking a specific instance in an instanced
  * draw call and highlighting an instance based on its picking color,

package/dist/modules/engine/picking/picking.js.map

@@ -1 +1 @@
-{"version":3,"file":"picking.js","sourceRoot":"","sources":["../../../../src/modules/engine/picking/picking.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,aAAa;AACb,MAAM,uBAAuB,GAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AA2C3D,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwErB,CAAC;AAEF,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDrB,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,KAAK,EAAE,EAAkB;IACzB,QAAQ,EAAE,EAAqB;IAE/B,IAAI,EAAE,SAAS;IAEf,YAAY,EAAE;QACZ,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,KAAK;QAClB,iBAAiB,EAAE,KAAK;QACxB,cAAc,EAAE,KAAK;QACrB,sBAAsB,EAAE,WAAW;QACnC,cAAc,EAAE,WAAW;KAC5B;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,KAAK;QAClB,iBAAiB,EAAE,KAAK;QACxB,cAAc,EAAE,IAAI;QACpB,sBAAsB,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACjC,cAAc,EAAE,uBAAuB;KACxC;IAED,EAAE;IACF,EAAE;IACF,WAAW;CACmD,CAAC;AAEjE,SAAS,WAAW,CAAC,OAAqB,EAAE,EAAE,YAA8B;IAC1E,MAAM,QAAQ,GAAG,EAAqB,CAAC;IAEvC,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;QAC9C,4EAA4E;IAC9E,CAAC;SAAM,IAAI,IAAI,CAAC,sBAAsB,KAAK,IAAI,EAAE,CAAC;QAChD,QAAQ,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,QAAQ,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAClC,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAiB,CAAC;QACvF,QAAQ,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;IAC3D,CAAC;IAED,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QACD,QAAQ,CAAC,cAAc,GAAG,KAAqB,CAAC;IAClD,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAChC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,QAAQ,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACtC,QAAQ,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACzD,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"picking.js","sourceRoot":"","sources":["../../../../src/modules/engine/picking/picking.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,aAAa;AACb,MAAM,uBAAuB,GAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AA2C3D,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwErB,CAAC;AAEF,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDrB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,KAAK,EAAE,EAAkB;IACzB,QAAQ,EAAE,EAAqB;IAE/B,IAAI,EAAE,SAAS;IAEf,YAAY,EAAE;QACZ,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,KAAK;QAClB,iBAAiB,EAAE,KAAK;QACxB,cAAc,EAAE,KAAK;QACrB,sBAAsB,EAAE,WAAW;QACnC,cAAc,EAAE,WAAW;KAC5B;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,KAAK;QAClB,iBAAiB,EAAE,KAAK;QACxB,cAAc,EAAE,IAAI;QACpB,sBAAsB,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACjC,cAAc,EAAE,uBAAuB;KACxC;IAED,EAAE;IACF,EAAE;IACF,WAAW;CACmD,CAAC;AAEjE,SAAS,WAAW,CAAC,OAAqB,EAAE,EAAE,YAA8B;IAC1E,MAAM,QAAQ,GAAG,EAAqB,CAAC;IAEvC,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;QAC9C,4EAA4E;IAC9E,CAAC;SAAM,IAAI,IAAI,CAAC,sBAAsB,KAAK,IAAI,EAAE,CAAC;QAChD,QAAQ,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,QAAQ,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAClC,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAiB,CAAC;QACvF,QAAQ,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;IAC3D,CAAC;IAED,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QACD,QAAQ,CAAC,cAAc,GAAG,KAAqB,CAAC;IAClD,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAChC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,QAAQ,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACtC,QAAQ,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACzD,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/dist/modules/engine/project/project.d.ts

@@ -32,7 +32,7 @@ export declare const projection: {
         readonly cameraPositionWorld: "vec3<f32>";
     };
     readonly getUniforms: typeof getUniforms;
-    readonly vs: "varying vec4 project_vPositionWorld;\nvarying vec3 project_vNormalWorld;\n\n// Project uniform block\nuniform Project {\n  mat4 viewMatrix;\n  mat4 projectionMatrix;\n  mat4 viewProjectionMatrix;\n  vec3 cameraPositionWorld;\n} project;\n\nstruct World {\n  vec3 position;\n  vec3 normal;\n};\n\nWorld world;\n\nvoid project_setPosition(vec4 position) {\n  project_vPositionWorld = position;\n}\n\nvoid project_setNormal(vec3 normal) {\n  project_vNormalWorld = normal;\n}\n\nvoid project_setPositionAndNormal_World(vec3 position, vec3 normal) {\n  world.position = position;\n  world.normal = normal;\n}\n\nvoid project_setPositionAndNormal_Model(vec3 position, vec3 normal, mat4 modelMatrix) {\n  world.position = (modelMatrix * vec4(position, 1.)).xyz;\n  world.normal = mat3(modelMatrix) * normal;\n}\n\nvec4 project_model_to_clipspace(vec4 position) {\n  return project.viewProjectionMatrix * position;\n}\n\nvec4 project_model_to_clipspace_Model(vec3 position, mat4 modelMatrix) {\n  return project.viewProjectionMatrix * modelMatrix * vec4(position, 1.);\n}\n\nvec4 project_world_to_clipspace(vec3 position) {\n  return project.viewProjectionMatrix * vec4(position, 1.);\n}\n\nvec4 project_view_to_clipspace(vec3 position) {\n  return project.projectionMatrix * vec4(position, 1.);\n}\n\nvec4 project_to_clipspace(vec3 position) {\n  return project.viewProjectionMatrix * vec4(position, 1.);\n}\n";
+    readonly vs: "varying vec4 project_vPositionWorld;\nvarying vec3 project_vNormalWorld;\n\n// Project uniform block\nlayout(std140) uniform Project {\n  mat4 viewMatrix;\n  mat4 projectionMatrix;\n  mat4 viewProjectionMatrix;\n  vec3 cameraPositionWorld;\n} project;\n\nstruct World {\n  vec3 position;\n  vec3 normal;\n};\n\nWorld world;\n\nvoid project_setPosition(vec4 position) {\n  project_vPositionWorld = position;\n}\n\nvoid project_setNormal(vec3 normal) {\n  project_vNormalWorld = normal;\n}\n\nvoid project_setPositionAndNormal_World(vec3 position, vec3 normal) {\n  world.position = position;\n  world.normal = normal;\n}\n\nvoid project_setPositionAndNormal_Model(vec3 position, vec3 normal, mat4 modelMatrix) {\n  world.position = (modelMatrix * vec4(position, 1.)).xyz;\n  world.normal = mat3(modelMatrix) * normal;\n}\n\nvec4 project_model_to_clipspace(vec4 position) {\n  return project.viewProjectionMatrix * position;\n}\n\nvec4 project_model_to_clipspace_Model(vec3 position, mat4 modelMatrix) {\n  return project.viewProjectionMatrix * modelMatrix * vec4(position, 1.);\n}\n\nvec4 project_world_to_clipspace(vec3 position) {\n  return project.viewProjectionMatrix * vec4(position, 1.);\n}\n\nvec4 project_view_to_clipspace(vec3 position) {\n  return project.projectionMatrix * vec4(position, 1.);\n}\n\nvec4 project_to_clipspace(vec3 position) {\n  return project.viewProjectionMatrix * vec4(position, 1.);\n}\n";
     readonly fs: "varying vec4 project_vPositionWorld;\nvarying vec3 project_vNormalWorld;\n\nvec4 project_getPosition_World() {\n  return project_vPositionWorld;\n}\n\nvec3 project_getNormal_World() {\n  return project_vNormalWorld;\n}\n";
 };
 export {};

package/dist/modules/engine/project/project.js

@@ -42,7 +42,7 @@ varying vec4 project_vPositionWorld;
 varying vec3 project_vNormalWorld;
 
 // Project uniform block
-uniform Project {
+layout(std140) uniform Project {
   mat4 viewMatrix;
   mat4 projectionMatrix;
   mat4 viewProjectionMatrix;

package/dist/modules/engine/skin/skin.d.ts

@@ -0,0 +1,30 @@
+export declare const source = "\nstruct skinUniforms {\n  jointMatrix: array<mat4x4<f32>, 20>,\n};\n\n@group(0) @binding(auto) var<uniform> skin: skinUniforms;\n\nfn getSkinMatrix(weights: vec4f, joints: vec4u) -> mat4x4<f32> {\n  return (weights.x * skin.jointMatrix[joints.x])\n       + (weights.y * skin.jointMatrix[joints.y])\n       + (weights.z * skin.jointMatrix[joints.z])\n       + (weights.w * skin.jointMatrix[joints.w]);\n}\n";
+export declare const vs = "\nlayout(std140) uniform skinUniforms {\n  mat4 jointMatrix[SKIN_MAX_JOINTS];\n} skin;\n\nmat4 getSkinMatrix(vec4 weights, uvec4 joints) {\n  return (weights.x * skin.jointMatrix[joints.x])\n       + (weights.y * skin.jointMatrix[joints.y])\n       + (weights.z * skin.jointMatrix[joints.z])\n       + (weights.w * skin.jointMatrix[joints.w]);\n}\n\n";
+export declare const fs = "";
+export type SkinProps = {
+    scenegraphsFromGLTF?: any;
+};
+export type SkinUniforms = {
+    jointMatrix?: any;
+};
+export declare const skin: {
+    readonly props: SkinProps;
+    readonly uniforms: SkinUniforms;
+    readonly name: "skin";
+    readonly bindingLayout: readonly [{
+        readonly name: "skin";
+        readonly group: 0;
+    }];
+    readonly dependencies: [];
+    readonly source: "\nstruct skinUniforms {\n  jointMatrix: array<mat4x4<f32>, 20>,\n};\n\n@group(0) @binding(auto) var<uniform> skin: skinUniforms;\n\nfn getSkinMatrix(weights: vec4f, joints: vec4u) -> mat4x4<f32> {\n  return (weights.x * skin.jointMatrix[joints.x])\n       + (weights.y * skin.jointMatrix[joints.y])\n       + (weights.z * skin.jointMatrix[joints.z])\n       + (weights.w * skin.jointMatrix[joints.w]);\n}\n";
+    readonly vs: "\nlayout(std140) uniform skinUniforms {\n  mat4 jointMatrix[SKIN_MAX_JOINTS];\n} skin;\n\nmat4 getSkinMatrix(vec4 weights, uvec4 joints) {\n  return (weights.x * skin.jointMatrix[joints.x])\n       + (weights.y * skin.jointMatrix[joints.y])\n       + (weights.z * skin.jointMatrix[joints.z])\n       + (weights.w * skin.jointMatrix[joints.w]);\n}\n\n";
+    readonly fs: "";
+    readonly defines: {
+        readonly SKIN_MAX_JOINTS: 20;
+    };
+    readonly getUniforms: (props?: SkinProps, prevUniforms?: SkinUniforms) => SkinUniforms;
+    readonly uniformTypes: {
+        readonly jointMatrix: readonly ["mat4x4<f32>", 20];
+    };
+};
+//# sourceMappingURL=skin.d.ts.map

package/dist/modules/engine/skin/skin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skin.d.ts","sourceRoot":"","sources":["../../../../src/modules/engine/skin/skin.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,MAAM,2ZAalB,CAAC;AAEF,eAAO,MAAM,EAAE,mWAad,CAAC;AAEF,eAAO,MAAM,EAAE,KACd,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,mBAAmB,CAAC,EAAE,GAAG,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,CAAC,EAAE,GAAG,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,IAAI;oBACF,SAAS;uBACN,YAAY;;;;;;;;;;;;;mCAaP,SAAS,iBAAsB,YAAY,KAAG,YAAY;;;;CA+CvB,CAAC"}