@luma.gl/shadertools 9.1.0-alpha.1 → 9.1.0-alpha.12

package/dist/lib/{shader-assembly/resolve-modules.js → shader-module/shader-module-dependencies.js}

@@ -1,14 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { ShaderModuleInstance } from "../shader-module/shader-module-instance.js";
-/**
- * Instantiate shader modules and esolve any dependencies
- */
-export function resolveModules(modules) {
-    const instances = ShaderModuleInstance.instantiateModules(modules);
-    return getShaderDependencies(instances);
-}
+import { initializeShaderModules } from "./shader-module.js";
 /**
  * Takes a list of shader module names and returns a new list of
  * shader module names that includes all dependencies, sorted so
@@ -21,14 +14,17 @@ export function resolveModules(modules) {
  * @param modules - Array of modules (inline modules or module names)
  * @return - Array of modules
  */
-function getShaderDependencies(modules) {
+export function getShaderModuleDependencies(modules) {
+    initializeShaderModules(modules);
     const moduleMap = {};
     const moduleDepth = {};
     getDependencyGraph({ modules, level: 0, moduleMap, moduleDepth });
     // Return a reverse sort so that dependencies come before the modules that use them
-    return Object.keys(moduleDepth)
+    const dependencies = Object.keys(moduleDepth)
         .sort((a, b) => moduleDepth[b] - moduleDepth[a])
         .map(name => moduleMap[name]);
+    initializeShaderModules(dependencies);
+    return dependencies;
 }
 /**
  * Recursively checks module dependencies to calculate dependency level of each module.
@@ -59,7 +55,35 @@ export function getDependencyGraph(options) {
         }
     }
 }
-export const TEST_EXPORTS = {
-    getShaderDependencies,
-    getDependencyGraph
-};
+/**
+ * Takes a list of shader module names and returns a new list of
+ * shader module names that includes all dependencies, sorted so
+ * that modules that are dependencies of other modules come first.
+ *
+ * If the shader glsl code from the returned modules is concatenated
+ * in the reverse order, it is guaranteed that all functions be resolved and
+ * that all function and variable definitions come before use.
+ *
+ * @param modules - Array of modules (inline modules or module names)
+ * @return - Array of modules
+ */
+export function getShaderDependencies(modules) {
+    initializeShaderModules(modules);
+    const moduleMap = {};
+    const moduleDepth = {};
+    getDependencyGraph({ modules, level: 0, moduleMap, moduleDepth });
+    // Return a reverse sort so that dependencies come before the modules that use them
+    modules = Object.keys(moduleDepth)
+        .sort((a, b) => moduleDepth[b] - moduleDepth[a])
+        .map(name => moduleMap[name]);
+    initializeShaderModules(modules);
+    return modules;
+}
+// DEPRECATED
+/**
+ * Instantiate shader modules and resolve any dependencies
+ * @deprecated Use getShaderDpendencies
+ */
+export function resolveModules(modules) {
+    return getShaderDependencies(modules);
+}

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

@@ -1,21 +1,29 @@
-import { NumberArray } from '@math.gl/types';
-import { UniformFormat } from "../../types.js";
-import { PropType } from "../filters/prop-types.js";
-export type UniformValue = number | boolean | Readonly<NumberArray>;
+import type { NumericArray } from '@math.gl/types';
+import { Sampler, Texture } from '@luma.gl/core';
+import type { UniformFormat } from "../../types.js";
+import { PropType, PropValidator } from "../filters/prop-types.js";
+import { ShaderInjection } from "../shader-assembly/shader-injections.js";
+export type BindingValue = Buffer | Texture | Sampler;
+export type UniformValue = number | boolean | Readonly<NumericArray>;
 export type UniformInfo = {
     format?: UniformFormat;
 } & PropType;
 /**
  * A shader module definition object
- * @note Can be viewed as the ShaderModuleProps for a ShaderModuleInstance
+ *
+ * @note Needs to be initialized with `initializeShaderModules`
  */
-export type ShaderModule<PropsT extends Record<string, unknown> = Record<string, unknown>, UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>, BindingsT extends Record<string, unknown> = {}> = {
+export type ShaderModule<PropsT extends Record<string, unknown> = Record<string, unknown>, UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>, BindingsT extends Record<string, BindingValue> = Record<string, BindingValue>> = {
     /** Used for type inference not for values */
-    props?: Required<PropsT>;
+    props?: PropsT;
     /** Used for type inference, not currently used for values */
     uniforms?: UniformsT;
     name: string;
+    /** WGSL code */
+    source?: string;
+    /** GLSL fragment shader code */
     fs?: string;
+    /** GLSL vertex shader code */
     vs?: string;
     /** Uniform shader types @note: Both order and types MUST match uniform block declarations in shader */
     uniformTypes?: Record<keyof UniformsT, UniformFormat>;
@@ -23,8 +31,8 @@ export type ShaderModule<PropsT extends Record<string, unknown> = Record<string,
     uniformPropTypes?: Record<keyof UniformsT, UniformInfo>;
     /** Default uniform values */
     defaultUniforms?: Required<UniformsT>;
-    /** Function that maps settings to uniforms */
-    getUniforms?: (settings?: any, prevUniforms?: any) => Record<string, UniformValue>;
+    /** Function that maps props to uniforms & bindings */
+    getUniforms?: (props?: any, oldProps?: any) => Record<string, BindingValue | UniformValue>;
     /** uniform buffers, textures, samplers, storage, ... */
     bindings?: Record<keyof BindingsT, {
         location: number;
@@ -39,8 +47,15 @@ export type ShaderModule<PropsT extends Record<string, unknown> = Record<string,
     dependencies?: ShaderModule<any, any>[];
     /** Information on deprecated properties */
     deprecations?: ShaderModuleDeprecation[];
-    /** Internal */
-    normalized?: boolean;
+    /** The instance field contains information that is generated at run-time */
+    instance?: {
+        propValidators?: Record<string, PropValidator>;
+        parsedDeprecations: ShaderModuleDeprecation[];
+        normalizedInjections: {
+            vertex: Record<string, ShaderInjection>;
+            fragment: Record<string, ShaderInjection>;
+        };
+    };
 };
 /** Use to generate deprecations when shader module is used */
 export type ShaderModuleDeprecation = {
@@ -50,6 +65,9 @@ export type ShaderModuleDeprecation = {
     old: string;
     deprecated?: boolean;
 };
+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']): ShaderModuleT['uniforms'];
+export declare function getShaderModuleUniforms<ShaderModuleT extends ShaderModule<Record<string, unknown>, Record<string, UniformValue>>>(module: ShaderModuleT, props: ShaderModuleT['props'], oldUniforms?: ShaderModuleT['uniforms']): Record<string, BindingValue | UniformValue>;
+export declare function checkShaderModuleDeprecations(shaderModule: ShaderModule, shaderSource: string, log: any): void;
 //# 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":"AAIA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,aAAa,EAAC,uBAAoB;AAC1C,OAAO,EAAC,QAAQ,EAAC,iCAA8B;AAE/C,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;AAEpE,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB,GAAG,QAAQ,CAAC;AAEb;;;GAGG;AACH,MAAM,MAAM,YAAY,CACtB,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAC7E,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,IAC5C;IACF,6CAA6C;IAC7C,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,uGAAuG;IACvG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,SAAS,EAAE,aAAa,CAAC,CAAC;IACtD,6BAA6B;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,SAAS,EAAE,WAAW,CAAC,CAAC;IACxD,6BAA6B;IAC7B,eAAe,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEtC,8CAA8C;IAE9C,WAAW,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAEnF,wDAAwD;IACxD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,SAAS,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,UAAU,CAAA;KAAC,CAAC,CAAC;IAEjG,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAC1C,iBAAiB;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;IACrE,YAAY,CAAC,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;IACxC,2CAA2C;IAC3C,YAAY,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAEzC,eAAe;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,uCAAuC;AACvC,wBAAgB,uBAAuB,CACrC,aAAa,SAAS,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,EACzF,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,CASjF"}
+{"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

@@ -1,15 +1,85 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+import { makePropValidators, getValidatedProperties } from "../filters/prop-types.js";
+import { normalizeInjections } from "../shader-assembly/shader-injections.js";
+// SHNDER MODULE API
+export function initializeShaderModules(modules) {
+    modules.map((module) => initializeShaderModule(module));
+}
+export function initializeShaderModule(module) {
+    if (module.instance) {
+        return;
+    }
+    initializeShaderModules(module.dependencies || []);
+    const { uniformPropTypes = {}, deprecations = [], 
+    // defines = {},
+    inject = {} } = module;
+    const instance = {
+        normalizedInjections: normalizeInjections(inject),
+        parsedDeprecations: parseDeprecationDefinitions(deprecations)
+    };
+    if (uniformPropTypes) {
+        instance.propValidators = makePropValidators(uniformPropTypes);
+    }
+    module.instance = instance;
+}
 /** Convert module props to uniforms */
-export function getShaderModuleUniforms(module, props) {
-    const uniforms = { ...module.defaultUniforms };
+export function getShaderModuleUniforms(module, props, oldUniforms) {
+    initializeShaderModule(module);
+    const uniforms = oldUniforms || { ...module.defaultUniforms };
+    // If module has a getUniforms function, use it
     if (module.getUniforms) {
-        // @ts-expect-error
-        Object.assign(props, module.getUniforms(props));
+        return module.getUniforms(props, uniforms);
     }
-    else {
-        Object.assign(uniforms, props);
+    // Build uniforms from the uniforms array
+    // @ts-expect-error
+    return getValidatedProperties(props, module.instance?.propValidators, module.name);
+}
+/* TODO this looks like it was unused code
+  _defaultGetUniforms(opts: Record<string, any> = {}): Record<string, any> {
+    const uniforms: Record<string, any> = {};
+    const propTypes = this.uniforms;
+
+    for (const key in propTypes) {
+      const propDef = propTypes[key];
+      if (key in opts && !propDef.private) {
+        if (propDef.validate) {
+          assert(propDef.validate(opts[key], propDef), `${this.name}: invalid ${key}`);
+        }
+        uniforms[key] = opts[key];
+      } else {
+        uniforms[key] = propDef.value;
+      }
     }
+
     return uniforms;
+  }
+}
+*/
+// Warn about deprecated uniforms or functions
+export function checkShaderModuleDeprecations(shaderModule, shaderSource, log) {
+    shaderModule.deprecations?.forEach(def => {
+        if (def.regex?.test(shaderSource)) {
+            if (def.deprecated) {
+                log.deprecated(def.old, def.new)();
+            }
+            else {
+                log.removed(def.old, def.new)();
+            }
+        }
+    });
+}
+// HELPERS
+function parseDeprecationDefinitions(deprecations) {
+    deprecations.forEach(def => {
+        switch (def.type) {
+            case 'function':
+                def.regex = new RegExp(`\\b${def.old}\\(`);
+                break;
+            default:
+                def.regex = new RegExp(`${def.type} ${def.old};`);
+        }
+    });
+    return deprecations;
 }

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

@@ -1,11 +1,12 @@
 import type { ShaderModule, UniformValue } from "./shader-module.js";
 /**
- * A shaderpass is a shader module with additional information
- * on how to run
+ * A ShaderPass is a ShaderModule that can be run "standalone" (e.g. post processing effects)
+ * It adds additional information on how to run the module in one or more passes.
  */
 export type ShaderPass<PropsT extends Record<string, unknown> = Record<string, unknown>, UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>> = ShaderModule<PropsT, UniformsT> & {
     passes: ShaderPassData[];
 };
+/** Information on how to run a specific pass */
 type ShaderPassData = {
     sampler?: boolean;
     filter?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"shader-pass.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-pass.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,2BAAwB;AAEhE;;;GAGG;AACH,MAAM,MAAM,UAAU,CACpB,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAC3E,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG;IACpC,MAAM,EAAE,cAAc,EAAE,CAAC;CAC1B,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CACzC,CAAC"}
+{"version":3,"file":"shader-pass.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-pass.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,2BAAwB;AAEhE;;;GAGG;AACH,MAAM,MAAM,UAAU,CACpB,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAC3E,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG;IACpC,MAAM,EAAE,cAAc,EAAE,CAAC;CAC1B,CAAC;AAEF,gDAAgD;AAChD,KAAK,cAAc,GAAG;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CACzC,CAAC"}

package/dist/module-injectors.d.ts

@@ -1,3 +1,3 @@
-export declare const MODULE_INJECTORS_VS: string;
-export declare const MODULE_INJECTORS_FS: string;
+export declare const MODULE_INJECTORS_VS = "#ifdef MODULE_LOGDEPTH\n  logdepth_adjustPosition(gl_Position);\n#endif\n";
+export declare const MODULE_INJECTORS_FS = "#ifdef MODULE_MATERIAL\n  gl_FragColor = material_filterColor(gl_FragColor);\n#endif\n\n#ifdef MODULE_LIGHTING\n  gl_FragColor = lighting_filterColor(gl_FragColor);\n#endif\n\n#ifdef MODULE_FOG\n  gl_FragColor = fog_filterColor(gl_FragColor);\n#endif\n\n#ifdef MODULE_PICKING\n  gl_FragColor = picking_filterHighlightColor(gl_FragColor);\n  gl_FragColor = picking_filterPickingColor(gl_FragColor);\n#endif\n\n#ifdef MODULE_LOGDEPTH\n  logdepth_setFragDepth();\n#endif\n";
 //# sourceMappingURL=module-injectors.d.ts.map

package/dist/module-injectors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-injectors.d.ts","sourceRoot":"","sources":["../src/module-injectors.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB,QAI/B,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAqB/B,CAAC"}
+{"version":3,"file":"module-injectors.d.ts","sourceRoot":"","sources":["../src/module-injectors.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB,8EAI/B,CAAC;AAEF,eAAO,MAAM,mBAAmB,0dAqB/B,CAAC"}

package/dist/module-injectors.js

@@ -1,27 +1,30 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { glsl } from "./lib/glsl-utils/highlight.js";
-export const MODULE_INJECTORS_VS = `\
+export const MODULE_INJECTORS_VS = /* glsl */ `\
 #ifdef MODULE_LOGDEPTH
-logdepth_adjustPosition(gl_Position);
+  logdepth_adjustPosition(gl_Position);
 #endif
 `;
-export const MODULE_INJECTORS_FS = `\
+export const MODULE_INJECTORS_FS = /* glsl */ `\
 #ifdef MODULE_MATERIAL
-gl_FragColor = material_filterColor(gl_FragColor);
+  gl_FragColor = material_filterColor(gl_FragColor);
 #endif
+
 #ifdef MODULE_LIGHTING
-gl_FragColor = lighting_filterColor(gl_FragColor);
+  gl_FragColor = lighting_filterColor(gl_FragColor);
 #endif
+
 #ifdef MODULE_FOG
-gl_FragColor = fog_filterColor(gl_FragColor);
+  gl_FragColor = fog_filterColor(gl_FragColor);
 #endif
+
 #ifdef MODULE_PICKING
-gl_FragColor = picking_filterHighlightColor(gl_FragColor);
-gl_FragColor = picking_filterPickingColor(gl_FragColor);
+  gl_FragColor = picking_filterHighlightColor(gl_FragColor);
+  gl_FragColor = picking_filterPickingColor(gl_FragColor);
 #endif
+
 #ifdef MODULE_LOGDEPTH
-logdepth_setFragDepth();
+  logdepth_setFragDepth();
 #endif
 `;

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

@@ -1 +1 @@
-{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../../../src/modules/engine/geometry/geometry.ts"],"names":[],"mappings":"AAsCA;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC"}
+{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../../../src/modules/engine/geometry/geometry.ts"],"names":[],"mappings":"AAqCA;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC"}

package/dist/modules/engine/geometry/geometry.js

@@ -2,29 +2,33 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 // import {ShaderModule} from '../../types';
-import { glsl } from "../../../lib/glsl-utils/highlight.js";
 // TODO - reuse normal from geometry module
-const vs = `\
+const vs = /* glsl */ `\
 varying vec4 geometry_vPosition;
 varying vec3 geometry_vNormal;
+
 void geometry_setNormal(vec3 normal) {
-geometry_vNormal = normal;
+  geometry_vNormal = normal;
 }
+
 void geometry_setPosition(vec4 position) {
-geometry_vPosition = position;
+  geometry_vPosition = position;
 }
+
 void geometry_setPosition(vec3 position) {
-geometry_vPosition = vec4(position, 1.);
+  geometry_vPosition = vec4(position, 1.);
 }
 `;
-const fs = `\
+const fs = /* glsl */ `\
 varying vec4 geometry_vPosition;
 varying vec3 geometry_vNormal;
+
 vec4 geometry_getPosition() {
-return geometry_vPosition;
+  return geometry_vPosition;
 }
+
 vec3 geometry_getNormal() {
-return geometry_vNormal;
+  return geometry_vNormal;
 }
 `;
 /**

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

@@ -1,4 +1,4 @@
-import { NumberArray } from "../../../types.js";
+import { NumericArray } from "../../../types.js";
 /**
  * Props for the picking module, which depending on mode renders picking colors or highlighted item.
  * When active, renders picking colors, assumed to be rendered to off-screen "picking" buffer.
@@ -10,9 +10,9 @@ export type PickingProps = {
     /** Set to true when picking an attribute value instead of object index */
     isAttribute?: boolean;
     /** Set to a picking color to visually highlight that item, or `null` to explicitly clear **/
-    highlightedObjectColor?: NumberArray | null;
+    highlightedObjectColor?: NumericArray | null;
     /** Color of visual highlight of "selected" item */
-    highlightColor?: NumberArray;
+    highlightColor?: NumericArray;
     /** Color range 0-1 or 0-255 */
     useFloatColors?: boolean;
 };
@@ -34,9 +34,9 @@ export type PickingUniforms = {
     /** Do we have a highlighted item? */
     isHighlightActive?: boolean;
     /** Set to a picking color to visually highlight that item */
-    highlightedObjectColor?: NumberArray;
+    highlightedObjectColor?: NumericArray;
     /** Color of visual highlight of "selected" item */
-    highlightColor?: NumberArray;
+    highlightColor?: NumericArray;
 };
 /**
  * Provides support for color-coding-based picking and highlighting.
@@ -46,6 +46,8 @@ export type PickingUniforms = {
  * primitives with the same picking color in non-instanced draw-calls
  */
 export declare const picking: {
+    readonly props: PickingProps;
+    readonly uniforms: PickingUniforms;
     readonly name: "picking";
     readonly uniformTypes: {
         readonly isActive: "f32";
@@ -63,10 +65,8 @@ export declare const picking: {
         readonly highlightedObjectColor: Float32Array;
         readonly highlightColor: Float32Array;
     };
-    readonly vs: string;
-    readonly fs: string;
-    readonly props: Required<PickingProps>;
-    readonly uniforms: PickingUniforms;
+    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 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":"AAIA,OAAO,EAAC,WAAW,EAAC,0BAAuB;AAO3C;;;;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,WAAW,GAAG,IAAI,CAAC;IAC5C,mDAAmD;IACnD,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,+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,WAAW,CAAC;IACrC,mDAAmD;IACnD,cAAc,CAAC,EAAE,WAAW,CAAC;CAC9B,CAAC;AAuIF;;;;;;GAMG;AACH,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;CAuB4C,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":"AAIA,OAAO,EAAC,YAAY,EAAC,0BAAuB;AAM5C;;;;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,CAAC;IAC9B,+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"}