@luma.gl/shadertools 9.0.0-alpha.26 → 9.0.0-alpha.29

package/dist/dist.dev.js

@@ -3968,37 +3968,37 @@ vec4 dirlight_filterColor(vec4 color) {
   // src/modules/picking/picking.ts
   var DEFAULT_HIGHLIGHT_COLOR = new Uint8Array([0, 255, 255, 255]);
   var DEFAULT_MODULE_OPTIONS3 = {
-    pickingSelectedColor: null,
-    //  Set to a picking color to visually highlight that item
-    pickingHighlightColor: DEFAULT_HIGHLIGHT_COLOR,
-    // Color of visual highlight of "selected" item
     pickingActive: false,
     // Set to true when rendering to off-screen "picking" buffer
-    pickingAttribute: false
+    pickingAttribute: false,
     // Set to true when picking an attribute value instead of object index
+    pickingSelectedColor: null,
+    //  Set to a picking color to visually highlight that item
+    pickingHighlightColor: DEFAULT_HIGHLIGHT_COLOR
+    // Color of visual highlight of "selected" item
   };
-  function getUniforms5(opts = DEFAULT_MODULE_OPTIONS3) {
+  function getUniforms5(options = DEFAULT_MODULE_OPTIONS3) {
     const uniforms18 = {};
-    if (opts.pickingSelectedColor !== void 0) {
-      if (!opts.pickingSelectedColor) {
-        uniforms18.picking_uSelectedColorValid = 0;
-      } else {
-        const selectedColor = opts.pickingSelectedColor.slice(0, 3);
+    if (options.pickingActive !== void 0) {
+      uniforms18.picking_uActive = Boolean(options.pickingActive);
+      uniforms18.picking_uAttribute = Boolean(options.pickingAttribute);
+    }
+    if (options.pickingSelectedColor !== void 0) {
+      if (options.pickingSelectedColor) {
+        const selectedColor = options.pickingSelectedColor.slice(0, 3);
         uniforms18.picking_uSelectedColorValid = 1;
         uniforms18.picking_uSelectedColor = selectedColor;
+      } else {
+        uniforms18.picking_uSelectedColorValid = 0;
       }
     }
-    if (opts.pickingHighlightColor) {
-      const color = Array.from(opts.pickingHighlightColor, (x) => x / 255);
+    if (options.pickingHighlightColor) {
+      const color = Array.from(options.pickingHighlightColor, (x) => x / 255);
       if (!Number.isFinite(color[3])) {
         color[3] = 1;
       }
       uniforms18.picking_uHighlightColor = color;
     }
-    if (opts.pickingActive !== void 0) {
-      uniforms18.picking_uActive = Boolean(opts.pickingActive);
-      uniforms18.picking_uAttribute = Boolean(opts.pickingAttribute);
-    }
     return uniforms18;
   }
   var vs2 = glsl`\
@@ -4026,10 +4026,10 @@ void picking_setPickingColor(vec3 pickingColor) {
     // Use alpha as the validity flag. If pickingColor is [0, 0, 0] fragment is non-pickable
     picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));
 
-    if (!picking_uAttribute) {
+    // if (!picking_uAttribute) {
       // Stores the picking color so that the fragment shader can render it during picking
-      picking_vRGBcolor_Avalid.rgb = pickingColor * COLOR_SCALE;
-    }
+      picking_vRGBcolor_Avalid.rgb = pickingColor; //  * COLOR_SCALE;
+    // }
   } else {
     // Do the comparison with selected item color in vertex shader as it should mean fewer compares
     picking_vRGBcolor_Avalid.a = float(isVertexPicked(pickingColor));

package/dist/index.cjs

@@ -2368,37 +2368,37 @@ var dirlight = {
 // src/modules/picking/picking.ts
 var DEFAULT_HIGHLIGHT_COLOR = new Uint8Array([0, 255, 255, 255]);
 var DEFAULT_MODULE_OPTIONS3 = {
-  pickingSelectedColor: null,
-  //  Set to a picking color to visually highlight that item
-  pickingHighlightColor: DEFAULT_HIGHLIGHT_COLOR,
-  // Color of visual highlight of "selected" item
   pickingActive: false,
   // Set to true when rendering to off-screen "picking" buffer
-  pickingAttribute: false
+  pickingAttribute: false,
   // Set to true when picking an attribute value instead of object index
+  pickingSelectedColor: null,
+  //  Set to a picking color to visually highlight that item
+  pickingHighlightColor: DEFAULT_HIGHLIGHT_COLOR
+  // Color of visual highlight of "selected" item
 };
-function getUniforms5(opts = DEFAULT_MODULE_OPTIONS3) {
+function getUniforms5(options = DEFAULT_MODULE_OPTIONS3) {
   const uniforms18 = {};
-  if (opts.pickingSelectedColor !== void 0) {
-    if (!opts.pickingSelectedColor) {
-      uniforms18.picking_uSelectedColorValid = 0;
-    } else {
-      const selectedColor = opts.pickingSelectedColor.slice(0, 3);
+  if (options.pickingActive !== void 0) {
+    uniforms18.picking_uActive = Boolean(options.pickingActive);
+    uniforms18.picking_uAttribute = Boolean(options.pickingAttribute);
+  }
+  if (options.pickingSelectedColor !== void 0) {
+    if (options.pickingSelectedColor) {
+      const selectedColor = options.pickingSelectedColor.slice(0, 3);
       uniforms18.picking_uSelectedColorValid = 1;
       uniforms18.picking_uSelectedColor = selectedColor;
+    } else {
+      uniforms18.picking_uSelectedColorValid = 0;
     }
   }
-  if (opts.pickingHighlightColor) {
-    const color = Array.from(opts.pickingHighlightColor, (x) => x / 255);
+  if (options.pickingHighlightColor) {
+    const color = Array.from(options.pickingHighlightColor, (x) => x / 255);
     if (!Number.isFinite(color[3])) {
       color[3] = 1;
     }
     uniforms18.picking_uHighlightColor = color;
   }
-  if (opts.pickingActive !== void 0) {
-    uniforms18.picking_uActive = Boolean(opts.pickingActive);
-    uniforms18.picking_uAttribute = Boolean(opts.pickingAttribute);
-  }
   return uniforms18;
 }
 var vs2 = glsl`\
@@ -2426,10 +2426,10 @@ void picking_setPickingColor(vec3 pickingColor) {
     // Use alpha as the validity flag. If pickingColor is [0, 0, 0] fragment is non-pickable
     picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));
 
-    if (!picking_uAttribute) {
+    // if (!picking_uAttribute) {
       // Stores the picking color so that the fragment shader can render it during picking
-      picking_vRGBcolor_Avalid.rgb = pickingColor * COLOR_SCALE;
-    }
+      picking_vRGBcolor_Avalid.rgb = pickingColor; //  * COLOR_SCALE;
+    // }
   } else {
     // Do the comparison with selected item color in vertex shader as it should mean fewer compares
     picking_vRGBcolor_Avalid.a = float(isVertexPicked(pickingColor));

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

@@ -5,7 +5,14 @@ export type PickingOptions = {
     pickingActive?: boolean;
     pickingAttribute: boolean;
 };
-declare function getUniforms(opts?: Required<PickingOptions>): Record<string, any>;
+export type PickingUniforms = {
+    picking_uActive?: boolean;
+    picking_uAttribute?: boolean;
+    picking_uSelectedColorValid?: number;
+    picking_uSelectedColor?: NumberArray;
+    picking_uHighlightColor?: NumberArray;
+};
+declare function getUniforms(options?: Required<PickingOptions>): PickingUniforms;
 /**
  * Provides support for color-coding-based picking and highlighting.
  * In particular, supports picking a specific instance in an instanced

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

@@ -1 +1 @@
-{"version":3,"file":"picking.d.ts","sourceRoot":"","sources":["../../../src/modules/picking/picking.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAOxC,MAAM,MAAM,cAAc,GAAG;IAC3B,oBAAoB,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,WAAW,CAAC;IACpC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AASD,iBAAS,WAAW,CAAC,IAAI,2BAAyB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAuBvE;AA0GD;;;;;;GAMG;AACH,eAAO,MAAM,OAAO;;;;;CAKnB,CAAC"}
+{"version":3,"file":"picking.d.ts","sourceRoot":"","sources":["../../../src/modules/picking/picking.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAOxC,MAAM,MAAM,cAAc,GAAG;IAC3B,oBAAoB,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC1C,qBAAqB,CAAC,EAAE,WAAW,CAAC;IACpC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,WAAW,CAAC;IACrC,uBAAuB,CAAC,EAAE,WAAW,CAAC;CACvC,CAAA;AASD,iBAAS,WAAW,CAAC,OAAO,2BAAyB,GAAG,eAAe,CAwBtE;AA0GD;;;;;;GAMG;AACH,eAAO,MAAM,OAAO;;;;;CAKnB,CAAC"}

package/dist/modules/picking/picking.js

@@ -3,37 +3,37 @@ var _templateObject, _templateObject2;
 import { glsl } from "../../lib/glsl-utils/highlight.js";
 const DEFAULT_HIGHLIGHT_COLOR = new Uint8Array([0, 255, 255, 255]);
 const DEFAULT_MODULE_OPTIONS = {
-  pickingSelectedColor: null,
-  pickingHighlightColor: DEFAULT_HIGHLIGHT_COLOR,
   pickingActive: false,
-  pickingAttribute: false
+  pickingAttribute: false,
+  pickingSelectedColor: null,
+  pickingHighlightColor: DEFAULT_HIGHLIGHT_COLOR
 };
 function getUniforms() {
-  let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_MODULE_OPTIONS;
+  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_MODULE_OPTIONS;
   const uniforms = {};
-  if (opts.pickingSelectedColor !== undefined) {
-    if (!opts.pickingSelectedColor) {
-      uniforms.picking_uSelectedColorValid = 0;
-    } else {
-      const selectedColor = opts.pickingSelectedColor.slice(0, 3);
+  if (options.pickingActive !== undefined) {
+    uniforms.picking_uActive = Boolean(options.pickingActive);
+    uniforms.picking_uAttribute = Boolean(options.pickingAttribute);
+  }
+  if (options.pickingSelectedColor !== undefined) {
+    if (options.pickingSelectedColor) {
+      const selectedColor = options.pickingSelectedColor.slice(0, 3);
       uniforms.picking_uSelectedColorValid = 1;
       uniforms.picking_uSelectedColor = selectedColor;
+    } else {
+      uniforms.picking_uSelectedColorValid = 0;
     }
   }
-  if (opts.pickingHighlightColor) {
-    const color = Array.from(opts.pickingHighlightColor, x => x / 255);
+  if (options.pickingHighlightColor) {
+    const color = Array.from(options.pickingHighlightColor, x => x / 255);
     if (!Number.isFinite(color[3])) {
       color[3] = 1;
     }
     uniforms.picking_uHighlightColor = color;
   }
-  if (opts.pickingActive !== undefined) {
-    uniforms.picking_uActive = Boolean(opts.pickingActive);
-    uniforms.picking_uAttribute = Boolean(opts.pickingAttribute);
-  }
   return uniforms;
 }
-const vs = glsl(_templateObject || (_templateObject = _taggedTemplateLiteral(["uniform bool picking_uActive;\nuniform bool picking_uAttribute;\nuniform vec3 picking_uSelectedColor;\nuniform bool picking_uSelectedColorValid;\n\nout vec4 picking_vRGBcolor_Avalid;\n\nconst float COLOR_SCALE = 1. / 255.;\n\nbool picking_isColorValid(vec3 color) {\n  return dot(color, vec3(1.0)) > 0.001;\n}\n\nbool isVertexPicked(vec3 vertexColor) {\n  return\n    picking_uSelectedColorValid &&\n    !picking_isColorValid(abs(vertexColor - picking_uSelectedColor));\n}\n\nvoid picking_setPickingColor(vec3 pickingColor) {\n  if (picking_uActive) {\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 (!picking_uAttribute) {\n      // Stores the picking color so that the fragment shader can render it during picking\n      picking_vRGBcolor_Avalid.rgb = pickingColor * COLOR_SCALE;\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(isVertexPicked(pickingColor));\n  }\n}\n\nvoid picking_setPickingAttribute(float value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.r = value;\n  }\n}\nvoid picking_setPickingAttribute(vec2 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rg = value;\n  }\n}\nvoid picking_setPickingAttribute(vec3 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rgb = value;\n  }\n}\n"], ["\\\nuniform bool picking_uActive;\nuniform bool picking_uAttribute;\nuniform vec3 picking_uSelectedColor;\nuniform bool picking_uSelectedColorValid;\n\nout vec4 picking_vRGBcolor_Avalid;\n\nconst float COLOR_SCALE = 1. / 255.;\n\nbool picking_isColorValid(vec3 color) {\n  return dot(color, vec3(1.0)) > 0.001;\n}\n\nbool isVertexPicked(vec3 vertexColor) {\n  return\n    picking_uSelectedColorValid &&\n    !picking_isColorValid(abs(vertexColor - picking_uSelectedColor));\n}\n\nvoid picking_setPickingColor(vec3 pickingColor) {\n  if (picking_uActive) {\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 (!picking_uAttribute) {\n      // Stores the picking color so that the fragment shader can render it during picking\n      picking_vRGBcolor_Avalid.rgb = pickingColor * COLOR_SCALE;\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(isVertexPicked(pickingColor));\n  }\n}\n\nvoid picking_setPickingAttribute(float value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.r = value;\n  }\n}\nvoid picking_setPickingAttribute(vec2 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rg = value;\n  }\n}\nvoid picking_setPickingAttribute(vec3 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rgb = value;\n  }\n}\n"])));
+const vs = glsl(_templateObject || (_templateObject = _taggedTemplateLiteral(["uniform bool picking_uActive;\nuniform bool picking_uAttribute;\nuniform vec3 picking_uSelectedColor;\nuniform bool picking_uSelectedColorValid;\n\nout vec4 picking_vRGBcolor_Avalid;\n\nconst float COLOR_SCALE = 1. / 255.;\n\nbool picking_isColorValid(vec3 color) {\n  return dot(color, vec3(1.0)) > 0.001;\n}\n\nbool isVertexPicked(vec3 vertexColor) {\n  return\n    picking_uSelectedColorValid &&\n    !picking_isColorValid(abs(vertexColor - picking_uSelectedColor));\n}\n\nvoid picking_setPickingColor(vec3 pickingColor) {\n  if (picking_uActive) {\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 (!picking_uAttribute) {\n      // Stores the picking color so that the fragment shader can render it during picking\n      picking_vRGBcolor_Avalid.rgb = pickingColor; //  * COLOR_SCALE;\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(isVertexPicked(pickingColor));\n  }\n}\n\nvoid picking_setPickingAttribute(float value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.r = value;\n  }\n}\nvoid picking_setPickingAttribute(vec2 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rg = value;\n  }\n}\nvoid picking_setPickingAttribute(vec3 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rgb = value;\n  }\n}\n"], ["\\\nuniform bool picking_uActive;\nuniform bool picking_uAttribute;\nuniform vec3 picking_uSelectedColor;\nuniform bool picking_uSelectedColorValid;\n\nout vec4 picking_vRGBcolor_Avalid;\n\nconst float COLOR_SCALE = 1. / 255.;\n\nbool picking_isColorValid(vec3 color) {\n  return dot(color, vec3(1.0)) > 0.001;\n}\n\nbool isVertexPicked(vec3 vertexColor) {\n  return\n    picking_uSelectedColorValid &&\n    !picking_isColorValid(abs(vertexColor - picking_uSelectedColor));\n}\n\nvoid picking_setPickingColor(vec3 pickingColor) {\n  if (picking_uActive) {\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 (!picking_uAttribute) {\n      // Stores the picking color so that the fragment shader can render it during picking\n      picking_vRGBcolor_Avalid.rgb = pickingColor; //  * COLOR_SCALE;\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(isVertexPicked(pickingColor));\n  }\n}\n\nvoid picking_setPickingAttribute(float value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.r = value;\n  }\n}\nvoid picking_setPickingAttribute(vec2 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rg = value;\n  }\n}\nvoid picking_setPickingAttribute(vec3 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rgb = value;\n  }\n}\n"])));
 const fs = glsl(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["uniform bool picking_uActive;\nuniform vec3 picking_uSelectedColor;\nuniform vec4 picking_uHighlightColor;\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 (picking_uActive) {\n    return color;\n  }\n  bool selected = bool(picking_vRGBcolor_Avalid.a);\n\n  if (selected) {\n    float highLightAlpha = picking_uHighlightColor.a;\n    float blendedAlpha = highLightAlpha + color.a * (1.0 - highLightAlpha);\n    float highLightRatio = highLightAlpha / blendedAlpha;\n\n    vec3 blendedRGB = mix(color.rgb, picking_uHighlightColor.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 (picking_uActive) {\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 highightColor = picking_filterHighlightColor(color);\n  return picking_filterPickingColor(highightColor);\n}\n\n"], ["\\\nuniform bool picking_uActive;\nuniform vec3 picking_uSelectedColor;\nuniform vec4 picking_uHighlightColor;\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 (picking_uActive) {\n    return color;\n  }\n  bool selected = bool(picking_vRGBcolor_Avalid.a);\n\n  if (selected) {\n    float highLightAlpha = picking_uHighlightColor.a;\n    float blendedAlpha = highLightAlpha + color.a * (1.0 - highLightAlpha);\n    float highLightRatio = highLightAlpha / blendedAlpha;\n\n    vec3 blendedRGB = mix(color.rgb, picking_uHighlightColor.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 (picking_uActive) {\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 highightColor = picking_filterHighlightColor(color);\n  return picking_filterPickingColor(highightColor);\n}\n\n"])));
 export const picking = {
   name: 'picking',

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

@@ -1 +1 @@
-{"version":3,"file":"picking.js","names":["glsl","DEFAULT_HIGHLIGHT_COLOR","Uint8Array","DEFAULT_MODULE_OPTIONS","pickingSelectedColor","pickingHighlightColor","pickingActive","pickingAttribute","getUniforms","opts","arguments","length","undefined","uniforms","picking_uSelectedColorValid","selectedColor","slice","picking_uSelectedColor","color","Array","from","x","Number","isFinite","picking_uHighlightColor","picking_uActive","Boolean","picking_uAttribute","vs","_templateObject","_taggedTemplateLiteral","fs","_templateObject2","picking","name"],"sources":["../../../src/modules/picking/picking.ts"],"sourcesContent":["import {NumberArray} from '../../types';\nimport {glsl} from '../../lib/glsl-utils/highlight';\n\n/* eslint-disable camelcase */\n\nconst DEFAULT_HIGHLIGHT_COLOR = new Uint8Array([0, 255, 255, 255]);\n\nexport type PickingOptions = {\n  pickingSelectedColor?: NumberArray | null, //  Set to a picking color to visually highlight that item\n  pickingHighlightColor?: NumberArray, // Color of visual highlight of \"selected\" item\n  pickingActive?: boolean, // Set to true when rendering to off-screen \"picking\" buffer\n  pickingAttribute: boolean // Set to true when picking an attribute value instead of object index\n}\n\nconst DEFAULT_MODULE_OPTIONS: Required<PickingOptions> = {\n  pickingSelectedColor: null, //  Set to a picking color to visually highlight that item\n  pickingHighlightColor: DEFAULT_HIGHLIGHT_COLOR, // Color of visual highlight of \"selected\" item\n  pickingActive: false, // Set to true when rendering to off-screen \"picking\" buffer\n  pickingAttribute: false // Set to true when picking an attribute value instead of object index\n};\n\nfunction getUniforms(opts = DEFAULT_MODULE_OPTIONS): Record<string, any> {\n  const uniforms: Record<string, any> = {};\n  if (opts.pickingSelectedColor !== undefined) {\n    if (!opts.pickingSelectedColor) {\n      uniforms.picking_uSelectedColorValid = 0;\n    } else {\n      const selectedColor = opts.pickingSelectedColor.slice(0, 3);\n      uniforms.picking_uSelectedColorValid = 1;\n      uniforms.picking_uSelectedColor = selectedColor;\n    }\n  }\n  if (opts.pickingHighlightColor) {\n    const color = Array.from(opts.pickingHighlightColor, (x) => x / 255);\n    if (!Number.isFinite(color[3])) {\n      color[3] = 1;\n    }\n    uniforms.picking_uHighlightColor = color;\n  }\n  if (opts.pickingActive !== undefined) {\n    uniforms.picking_uActive = Boolean(opts.pickingActive);\n    uniforms.picking_uAttribute = Boolean(opts.pickingAttribute);\n  }\n  return uniforms;\n}\n\nconst vs = glsl`\\\nuniform bool picking_uActive;\nuniform bool picking_uAttribute;\nuniform vec3 picking_uSelectedColor;\nuniform bool picking_uSelectedColorValid;\n\nout vec4 picking_vRGBcolor_Avalid;\n\nconst float COLOR_SCALE = 1. / 255.;\n\nbool picking_isColorValid(vec3 color) {\n  return dot(color, vec3(1.0)) > 0.001;\n}\n\nbool isVertexPicked(vec3 vertexColor) {\n  return\n    picking_uSelectedColorValid &&\n    !picking_isColorValid(abs(vertexColor - picking_uSelectedColor));\n}\n\nvoid picking_setPickingColor(vec3 pickingColor) {\n  if (picking_uActive) {\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 (!picking_uAttribute) {\n      // Stores the picking color so that the fragment shader can render it during picking\n      picking_vRGBcolor_Avalid.rgb = pickingColor * COLOR_SCALE;\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(isVertexPicked(pickingColor));\n  }\n}\n\nvoid picking_setPickingAttribute(float value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.r = value;\n  }\n}\nvoid picking_setPickingAttribute(vec2 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rg = value;\n  }\n}\nvoid picking_setPickingAttribute(vec3 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rgb = value;\n  }\n}\n`;\n\nconst fs = glsl`\\\nuniform bool picking_uActive;\nuniform vec3 picking_uSelectedColor;\nuniform vec4 picking_uHighlightColor;\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 (picking_uActive) {\n    return color;\n  }\n  bool selected = bool(picking_vRGBcolor_Avalid.a);\n\n  if (selected) {\n    float highLightAlpha = picking_uHighlightColor.a;\n    float blendedAlpha = highLightAlpha + color.a * (1.0 - highLightAlpha);\n    float highLightRatio = highLightAlpha / blendedAlpha;\n\n    vec3 blendedRGB = mix(color.rgb, picking_uHighlightColor.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 (picking_uActive) {\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 highightColor = picking_filterHighlightColor(color);\n  return picking_filterPickingColor(highightColor);\n}\n\n`;\n\n/**\n * Provides support for color-coding-based picking and highlighting.\n * In particular, supports picking a specific instance in an instanced\n * draw call and highlighting an instance based on its picking color,\n * and correspondingly, supports picking and highlighting groups of\n * primitives with the same picking color in non-instanced draw-calls\n */\nexport const picking = {\n  name: 'picking',\n  vs,\n  fs,\n  getUniforms\n};\n"],"mappings":";;SACQA,IAAI;AAIZ,MAAMC,uBAAuB,GAAG,IAAIC,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AASlE,MAAMC,sBAAgD,GAAG;EACvDC,oBAAoB,EAAE,IAAI;EAC1BC,qBAAqB,EAAEJ,uBAAuB;EAC9CK,aAAa,EAAE,KAAK;EACpBC,gBAAgB,EAAE;AACpB,CAAC;AAED,SAASC,WAAWA,CAAA,EAAqD;EAAA,IAApDC,IAAI,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAGP,sBAAsB;EAChD,MAAMU,QAA6B,GAAG,CAAC,CAAC;EACxC,IAAIJ,IAAI,CAACL,oBAAoB,KAAKQ,SAAS,EAAE;IAC3C,IAAI,CAACH,IAAI,CAACL,oBAAoB,EAAE;MAC9BS,QAAQ,CAACC,2BAA2B,GAAG,CAAC;IAC1C,CAAC,MAAM;MACL,MAAMC,aAAa,GAAGN,IAAI,CAACL,oBAAoB,CAACY,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;MAC3DH,QAAQ,CAACC,2BAA2B,GAAG,CAAC;MACxCD,QAAQ,CAACI,sBAAsB,GAAGF,aAAa;IACjD;EACF;EACA,IAAIN,IAAI,CAACJ,qBAAqB,EAAE;IAC9B,MAAMa,KAAK,GAAGC,KAAK,CAACC,IAAI,CAACX,IAAI,CAACJ,qBAAqB,EAAGgB,CAAC,IAAKA,CAAC,GAAG,GAAG,CAAC;IACpE,IAAI,CAACC,MAAM,CAACC,QAAQ,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;MAC9BA,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;IACd;IACAL,QAAQ,CAACW,uBAAuB,GAAGN,KAAK;EAC1C;EACA,IAAIT,IAAI,CAACH,aAAa,KAAKM,SAAS,EAAE;IACpCC,QAAQ,CAACY,eAAe,GAAGC,OAAO,CAACjB,IAAI,CAACH,aAAa,CAAC;IACtDO,QAAQ,CAACc,kBAAkB,GAAGD,OAAO,CAACjB,IAAI,CAACF,gBAAgB,CAAC;EAC9D;EACA,OAAOM,QAAQ;AACjB;AAEA,MAAMe,EAAE,GAAG5B,IAAI,CAAA6B,eAAA,KAAAA,eAAA,GAAAC,sBAAA,w8FAkDd;AAED,MAAMC,EAAE,GAAG/B,IAAI,CAAAgC,gBAAA,KAAAA,gBAAA,GAAAF,sBAAA,0nFAkDd;AASD,OAAO,MAAMG,OAAO,GAAG;EACrBC,IAAI,EAAE,SAAS;EACfN,EAAE;EACFG,EAAE;EACFvB;AACF,CAAC"}
+{"version":3,"file":"picking.js","names":["glsl","DEFAULT_HIGHLIGHT_COLOR","Uint8Array","DEFAULT_MODULE_OPTIONS","pickingActive","pickingAttribute","pickingSelectedColor","pickingHighlightColor","getUniforms","options","arguments","length","undefined","uniforms","picking_uActive","Boolean","picking_uAttribute","selectedColor","slice","picking_uSelectedColorValid","picking_uSelectedColor","color","Array","from","x","Number","isFinite","picking_uHighlightColor","vs","_templateObject","_taggedTemplateLiteral","fs","_templateObject2","picking","name"],"sources":["../../../src/modules/picking/picking.ts"],"sourcesContent":["import {NumberArray} from '../../types';\nimport {glsl} from '../../lib/glsl-utils/highlight';\n\n/* eslint-disable camelcase */\n\nconst DEFAULT_HIGHLIGHT_COLOR = new Uint8Array([0, 255, 255, 255]);\n\nexport type PickingOptions = {\n  pickingSelectedColor?: NumberArray | null, //  Set to a picking color to visually highlight that item\n  pickingHighlightColor?: NumberArray, // Color of visual highlight of \"selected\" item\n  pickingActive?: boolean, // Set to true when rendering to off-screen \"picking\" buffer\n  pickingAttribute: boolean // Set to true when picking an attribute value instead of object index\n}\n\nexport type PickingUniforms = {\n  picking_uActive?: boolean;\n  picking_uAttribute?: boolean;\n  picking_uSelectedColorValid?: number;\n  picking_uSelectedColor?: NumberArray;\n  picking_uHighlightColor?: NumberArray;\n}\n\nconst DEFAULT_MODULE_OPTIONS: Required<PickingOptions> = {\n  pickingActive: false, // Set to true when rendering to off-screen \"picking\" buffer\n  pickingAttribute: false, // Set to true when picking an attribute value instead of object index\n  pickingSelectedColor: null, //  Set to a picking color to visually highlight that item\n  pickingHighlightColor: DEFAULT_HIGHLIGHT_COLOR, // Color of visual highlight of \"selected\" item\n};\n\nfunction getUniforms(options = DEFAULT_MODULE_OPTIONS): PickingUniforms {\n  const uniforms: PickingUniforms = {};\n  if (options.pickingActive !== undefined) {\n    uniforms.picking_uActive = Boolean(options.pickingActive);\n    uniforms.picking_uAttribute = Boolean(options.pickingAttribute);\n  }\n\n  if (options.pickingSelectedColor !== undefined) {\n    if (options.pickingSelectedColor) {\n      const selectedColor = options.pickingSelectedColor.slice(0, 3);\n      uniforms.picking_uSelectedColorValid = 1;\n      uniforms.picking_uSelectedColor = selectedColor;\n    } else {\n      uniforms.picking_uSelectedColorValid = 0;\n    }\n  }\n  if (options.pickingHighlightColor) {\n    const color = Array.from(options.pickingHighlightColor, (x) => x / 255);\n    if (!Number.isFinite(color[3])) {\n      color[3] = 1;\n    }\n    uniforms.picking_uHighlightColor = color;\n  }\n  return uniforms;\n}\n\nconst vs = glsl`\\\nuniform bool picking_uActive;\nuniform bool picking_uAttribute;\nuniform vec3 picking_uSelectedColor;\nuniform bool picking_uSelectedColorValid;\n\nout vec4 picking_vRGBcolor_Avalid;\n\nconst float COLOR_SCALE = 1. / 255.;\n\nbool picking_isColorValid(vec3 color) {\n  return dot(color, vec3(1.0)) > 0.001;\n}\n\nbool isVertexPicked(vec3 vertexColor) {\n  return\n    picking_uSelectedColorValid &&\n    !picking_isColorValid(abs(vertexColor - picking_uSelectedColor));\n}\n\nvoid picking_setPickingColor(vec3 pickingColor) {\n  if (picking_uActive) {\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 (!picking_uAttribute) {\n      // Stores the picking color so that the fragment shader can render it during picking\n      picking_vRGBcolor_Avalid.rgb = pickingColor; //  * COLOR_SCALE;\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(isVertexPicked(pickingColor));\n  }\n}\n\nvoid picking_setPickingAttribute(float value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.r = value;\n  }\n}\nvoid picking_setPickingAttribute(vec2 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rg = value;\n  }\n}\nvoid picking_setPickingAttribute(vec3 value) {\n  if (picking_uAttribute) {\n    picking_vRGBcolor_Avalid.rgb = value;\n  }\n}\n`;\n\nconst fs = glsl`\\\nuniform bool picking_uActive;\nuniform vec3 picking_uSelectedColor;\nuniform vec4 picking_uHighlightColor;\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 (picking_uActive) {\n    return color;\n  }\n  bool selected = bool(picking_vRGBcolor_Avalid.a);\n\n  if (selected) {\n    float highLightAlpha = picking_uHighlightColor.a;\n    float blendedAlpha = highLightAlpha + color.a * (1.0 - highLightAlpha);\n    float highLightRatio = highLightAlpha / blendedAlpha;\n\n    vec3 blendedRGB = mix(color.rgb, picking_uHighlightColor.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 (picking_uActive) {\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 highightColor = picking_filterHighlightColor(color);\n  return picking_filterPickingColor(highightColor);\n}\n\n`;\n\n/**\n * Provides support for color-coding-based picking and highlighting.\n * In particular, supports picking a specific instance in an instanced\n * draw call and highlighting an instance based on its picking color,\n * and correspondingly, supports picking and highlighting groups of\n * primitives with the same picking color in non-instanced draw-calls\n */\nexport const picking = {\n  name: 'picking',\n  vs,\n  fs,\n  getUniforms\n};\n"],"mappings":";;SACQA,IAAI;AAIZ,MAAMC,uBAAuB,GAAG,IAAIC,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAiBlE,MAAMC,sBAAgD,GAAG;EACvDC,aAAa,EAAE,KAAK;EACpBC,gBAAgB,EAAE,KAAK;EACvBC,oBAAoB,EAAE,IAAI;EAC1BC,qBAAqB,EAAEN;AACzB,CAAC;AAED,SAASO,WAAWA,CAAA,EAAoD;EAAA,IAAnDC,OAAO,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAGP,sBAAsB;EACnD,MAAMU,QAAyB,GAAG,CAAC,CAAC;EACpC,IAAIJ,OAAO,CAACL,aAAa,KAAKQ,SAAS,EAAE;IACvCC,QAAQ,CAACC,eAAe,GAAGC,OAAO,CAACN,OAAO,CAACL,aAAa,CAAC;IACzDS,QAAQ,CAACG,kBAAkB,GAAGD,OAAO,CAACN,OAAO,CAACJ,gBAAgB,CAAC;EACjE;EAEA,IAAII,OAAO,CAACH,oBAAoB,KAAKM,SAAS,EAAE;IAC9C,IAAIH,OAAO,CAACH,oBAAoB,EAAE;MAChC,MAAMW,aAAa,GAAGR,OAAO,CAACH,oBAAoB,CAACY,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;MAC9DL,QAAQ,CAACM,2BAA2B,GAAG,CAAC;MACxCN,QAAQ,CAACO,sBAAsB,GAAGH,aAAa;IACjD,CAAC,MAAM;MACLJ,QAAQ,CAACM,2BAA2B,GAAG,CAAC;IAC1C;EACF;EACA,IAAIV,OAAO,CAACF,qBAAqB,EAAE;IACjC,MAAMc,KAAK,GAAGC,KAAK,CAACC,IAAI,CAACd,OAAO,CAACF,qBAAqB,EAAGiB,CAAC,IAAKA,CAAC,GAAG,GAAG,CAAC;IACvE,IAAI,CAACC,MAAM,CAACC,QAAQ,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;MAC9BA,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;IACd;IACAR,QAAQ,CAACc,uBAAuB,GAAGN,KAAK;EAC1C;EACA,OAAOR,QAAQ;AACjB;AAEA,MAAMe,EAAE,GAAG5B,IAAI,CAAA6B,eAAA,KAAAA,eAAA,GAAAC,sBAAA,89FAkDd;AAED,MAAMC,EAAE,GAAG/B,IAAI,CAAAgC,gBAAA,KAAAA,gBAAA,GAAAF,sBAAA,0nFAkDd;AASD,OAAO,MAAMG,OAAO,GAAG;EACrBC,IAAI,EAAE,SAAS;EACfN,EAAE;EACFG,EAAE;EACFvB;AACF,CAAC"}

package/dist.min.js

@@ -2398,7 +2398,7 @@ vec4 dirlight_filterColor(vec4 color) {
   float d = abs(dot(normalize(normal), normalize(dirlight_uLightDirection)));
   return vec4(color.rgb * d, color.a);
 }
-`]))),St={name:"dirlight",fs:Do,getUniforms:Uo,dependencies:[un]};var Ft,It,ko=new Uint8Array([0,255,255,255]),zo={pickingSelectedColor:null,pickingHighlightColor:ko,pickingActive:!1,pickingAttribute:!1};function Bo(){var n=arguments.length>0&&arguments[0]!==void 0?arguments[0]:zo,e={};if(n.pickingSelectedColor!==void 0)if(!n.pickingSelectedColor)e.picking_uSelectedColorValid=0;else{var t=n.pickingSelectedColor.slice(0,3);e.picking_uSelectedColorValid=1,e.picking_uSelectedColor=t}if(n.pickingHighlightColor){var r=Array.from(n.pickingHighlightColor,function(o){return o/255});Number.isFinite(r[3])||(r[3]=1),e.picking_uHighlightColor=r}return n.pickingActive!==void 0&&(e.picking_uActive=Boolean(n.pickingActive),e.picking_uAttribute=Boolean(n.pickingAttribute)),e}var Xo=f(Ft||(Ft=u([`uniform bool picking_uActive;
+`]))),St={name:"dirlight",fs:Do,getUniforms:Uo,dependencies:[un]};var Ft,It,ko=new Uint8Array([0,255,255,255]),zo={pickingActive:!1,pickingAttribute:!1,pickingSelectedColor:null,pickingHighlightColor:ko};function Bo(){var n=arguments.length>0&&arguments[0]!==void 0?arguments[0]:zo,e={};if(n.pickingActive!==void 0&&(e.picking_uActive=Boolean(n.pickingActive),e.picking_uAttribute=Boolean(n.pickingAttribute)),n.pickingSelectedColor!==void 0)if(n.pickingSelectedColor){var t=n.pickingSelectedColor.slice(0,3);e.picking_uSelectedColorValid=1,e.picking_uSelectedColor=t}else e.picking_uSelectedColorValid=0;if(n.pickingHighlightColor){var r=Array.from(n.pickingHighlightColor,function(o){return o/255});Number.isFinite(r[3])||(r[3]=1),e.picking_uHighlightColor=r}return e}var Xo=f(Ft||(Ft=u([`uniform bool picking_uActive;
 uniform bool picking_uAttribute;
 uniform vec3 picking_uSelectedColor;
 uniform bool picking_uSelectedColorValid;
@@ -2422,10 +2422,10 @@ void picking_setPickingColor(vec3 pickingColor) {
     // Use alpha as the validity flag. If pickingColor is [0, 0, 0] fragment is non-pickable
     picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));
 
-    if (!picking_uAttribute) {
+    // if (!picking_uAttribute) {
       // Stores the picking color so that the fragment shader can render it during picking
-      picking_vRGBcolor_Avalid.rgb = pickingColor * COLOR_SCALE;
-    }
+      picking_vRGBcolor_Avalid.rgb = pickingColor; //  * COLOR_SCALE;
+    // }
   } else {
     // Do the comparison with selected item color in vertex shader as it should mean fewer compares
     picking_vRGBcolor_Avalid.a = float(isVertexPicked(pickingColor));
@@ -2472,10 +2472,10 @@ void picking_setPickingColor(vec3 pickingColor) {
     // Use alpha as the validity flag. If pickingColor is [0, 0, 0] fragment is non-pickable
     picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));
 
-    if (!picking_uAttribute) {
+    // if (!picking_uAttribute) {
       // Stores the picking color so that the fragment shader can render it during picking
-      picking_vRGBcolor_Avalid.rgb = pickingColor * COLOR_SCALE;
-    }
+      picking_vRGBcolor_Avalid.rgb = pickingColor; //  * COLOR_SCALE;
+    // }
   } else {
     // Do the comparison with selected item color in vertex shader as it should mean fewer compares
     picking_vRGBcolor_Avalid.a = float(isVertexPicked(pickingColor));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/shadertools",
-  "version": "9.0.0-alpha.26",
+  "version": "9.0.0-alpha.29",
   "description": "Shader module system for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@luma.gl/api": "9.0.0-alpha.26",
+    "@luma.gl/api": "9.0.0-alpha.29",
     "@math.gl/core": "4.0.0-alpha.4"
   },
-  "gitHead": "e255f78c1c0a4555808c6e9282bcecb6accd147b"
+  "gitHead": "1aee1ad82fd09d441172f5ef490ebc083a7fa239"
 }

package/src/modules/picking/picking.ts

@@ -12,35 +12,44 @@ export type PickingOptions = {
   pickingAttribute: boolean // Set to true when picking an attribute value instead of object index
 }
 
+export type PickingUniforms = {
+  picking_uActive?: boolean;
+  picking_uAttribute?: boolean;
+  picking_uSelectedColorValid?: number;
+  picking_uSelectedColor?: NumberArray;
+  picking_uHighlightColor?: NumberArray;
+}
+
 const DEFAULT_MODULE_OPTIONS: Required<PickingOptions> = {
+  pickingActive: false, // Set to true when rendering to off-screen "picking" buffer
+  pickingAttribute: false, // Set to true when picking an attribute value instead of object index
   pickingSelectedColor: null, //  Set to a picking color to visually highlight that item
   pickingHighlightColor: DEFAULT_HIGHLIGHT_COLOR, // Color of visual highlight of "selected" item
-  pickingActive: false, // Set to true when rendering to off-screen "picking" buffer
-  pickingAttribute: false // Set to true when picking an attribute value instead of object index
 };
 
-function getUniforms(opts = DEFAULT_MODULE_OPTIONS): Record<string, any> {
-  const uniforms: Record<string, any> = {};
-  if (opts.pickingSelectedColor !== undefined) {
-    if (!opts.pickingSelectedColor) {
-      uniforms.picking_uSelectedColorValid = 0;
-    } else {
-      const selectedColor = opts.pickingSelectedColor.slice(0, 3);
+function getUniforms(options = DEFAULT_MODULE_OPTIONS): PickingUniforms {
+  const uniforms: PickingUniforms = {};
+  if (options.pickingActive !== undefined) {
+    uniforms.picking_uActive = Boolean(options.pickingActive);
+    uniforms.picking_uAttribute = Boolean(options.pickingAttribute);
+  }
+
+  if (options.pickingSelectedColor !== undefined) {
+    if (options.pickingSelectedColor) {
+      const selectedColor = options.pickingSelectedColor.slice(0, 3);
       uniforms.picking_uSelectedColorValid = 1;
       uniforms.picking_uSelectedColor = selectedColor;
+    } else {
+      uniforms.picking_uSelectedColorValid = 0;
     }
   }
-  if (opts.pickingHighlightColor) {
-    const color = Array.from(opts.pickingHighlightColor, (x) => x / 255);
+  if (options.pickingHighlightColor) {
+    const color = Array.from(options.pickingHighlightColor, (x) => x / 255);
     if (!Number.isFinite(color[3])) {
       color[3] = 1;
     }
     uniforms.picking_uHighlightColor = color;
   }
-  if (opts.pickingActive !== undefined) {
-    uniforms.picking_uActive = Boolean(opts.pickingActive);
-    uniforms.picking_uAttribute = Boolean(opts.pickingAttribute);
-  }
   return uniforms;
 }
 
@@ -69,10 +78,10 @@ void picking_setPickingColor(vec3 pickingColor) {
     // Use alpha as the validity flag. If pickingColor is [0, 0, 0] fragment is non-pickable
     picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));
 
-    if (!picking_uAttribute) {
+    // if (!picking_uAttribute) {
       // Stores the picking color so that the fragment shader can render it during picking
-      picking_vRGBcolor_Avalid.rgb = pickingColor * COLOR_SCALE;
-    }
+      picking_vRGBcolor_Avalid.rgb = pickingColor; //  * COLOR_SCALE;
+    // }
   } else {
     // Do the comparison with selected item color in vertex shader as it should mean fewer compares
     picking_vRGBcolor_Avalid.a = float(isVertexPicked(pickingColor));