@luma.gl/shadertools 9.0.0-alpha.48 → 9.0.0-alpha.50

package/dist/dist.dev.js

@@ -316,7 +316,7 @@ ${inject[key]}` : inject[key];
         if (module instanceof ShaderModuleInstance) {
           return module;
         }
-        assert(typeof module !== "string", `Shader module use by name is deprecated. Import shader module '${module}' and use it directly.`);
+        assert(typeof module !== "string", `Shader module use by name is deprecated. Import shader module '${JSON.stringify(module)}' and use it directly.`);
         if (!module.name) {
           console.warn("shader module has no name");
           module.name = `shader-module-${index++}`;
@@ -1112,7 +1112,7 @@ ${FS_GLES}`;
     const {
       version = 100,
       input,
-      inputType,
+      inputChannels,
       output
     } = options || {};
     if (!input) {
@@ -1124,10 +1124,11 @@ ${FS_GLES}`;
       }
       return FS100;
     }
-    if (!inputType) {
-      throw new Error("inputType");
+    if (!inputChannels) {
+      throw new Error("inputChannels");
     }
-    const outputValue = convertToVec4(input, inputType);
+    const inputType = channelCountToType(inputChannels);
+    const outputValue = convertToVec4(input, inputChannels);
     if (version >= 300) {
       return `#version ${version} ${version === 300 ? "es" : ""}
 in ${inputType} ${input};
@@ -1169,18 +1170,32 @@ void main() {
         throw new Error(type);
     }
   }
-  function convertToVec4(variable, type) {
-    switch (type) {
-      case "float":
+  function channelCountToType(channels) {
+    switch (channels) {
+      case 1:
+        return "float";
+      case 2:
+        return "vec2";
+      case 3:
+        return "vec3";
+      case 4:
+        return "vec4";
+      default:
+        throw new Error(`invalid channels: ${channels}`);
+    }
+  }
+  function convertToVec4(variable, channels) {
+    switch (channels) {
+      case 1:
         return `vec4(${variable}, 0.0, 0.0, 1.0)`;
-      case "vec2":
+      case 2:
         return `vec4(${variable}, 0.0, 1.0)`;
-      case "vec3":
+      case 3:
         return `vec4(${variable}, 1.0)`;
-      case "vec4":
+      case 4:
         return variable;
       default:
-        throw new Error(type);
+        throw new Error(`invalid channels: ${channels}`);
     }
   }
 
@@ -4339,27 +4354,24 @@ vec4 picking_filterColor(vec4 color) {
     uniformTypes: {
       isActive: "f32",
       isAttribute: "f32",
-      useFloatColors: "f32",
       isHighlightActive: "f32",
+      useFloatColors: "f32",
       highlightedObjectColor: "vec3<f32>",
       highlightColor: "vec4<f32>"
     },
     defaultUniforms: {
       isActive: false,
       isAttribute: false,
-      useFloatColors: true,
       isHighlightActive: false,
+      useFloatColors: true,
       highlightedObjectColor: new Float32Array([0, 0, 0]),
       highlightColor: DEFAULT_HIGHLIGHT_COLOR
     },
     getUniforms
   };
   function getUniforms(opts = {}, prevUniforms) {
-    const uniforms = {
-      ...picking.defaultUniforms
-    };
+    const uniforms = {};
     if (opts.highlightedObjectColor === void 0) {
-      delete uniforms.highlightedObjectColor;
     } else if (opts.highlightedObjectColor === null) {
       uniforms.isHighlightActive = false;
     } else {
@@ -4518,7 +4530,6 @@ float getPointLightAttenuation(PointLight pointLight, float distance) {
     if (props.enabled !== void 0) {
       uniforms.enabled = props.enabled ? 1 : 0;
     }
-    console.error(uniforms);
     return uniforms;
   }
   function getLightSourceUniforms({

package/dist/index.cjs

@@ -304,7 +304,7 @@ var ShaderModuleInstance = class {
       }
       assert(
         typeof module2 !== "string",
-        `Shader module use by name is deprecated. Import shader module '${module2}' and use it directly.`
+        `Shader module use by name is deprecated. Import shader module '${JSON.stringify(module2)}' and use it directly.`
       );
       if (!module2.name) {
         console.warn("shader module has no name");
@@ -1091,7 +1091,7 @@ function getQualifierDetails(line, qualifiers) {
   return { qualifier, type, name };
 }
 function getPassthroughFS(options) {
-  const { version = 100, input, inputType, output } = options || {};
+  const { version = 100, input, inputChannels, output } = options || {};
   if (!input) {
     if (version === 300) {
       return FS300;
@@ -1101,10 +1101,11 @@ ${FS_GLES}`;
     }
     return FS100;
   }
-  if (!inputType) {
-    throw new Error("inputType");
+  if (!inputChannels) {
+    throw new Error("inputChannels");
   }
-  const outputValue = convertToVec4(input, inputType);
+  const inputType = channelCountToType(inputChannels);
+  const outputValue = convertToVec4(input, inputChannels);
   if (version >= 300) {
     return `#version ${version} ${version === 300 ? "es" : ""}
 in ${inputType} ${input};
@@ -1146,18 +1147,32 @@ function typeToChannelCount(type) {
       throw new Error(type);
   }
 }
-function convertToVec4(variable, type) {
-  switch (type) {
-    case "float":
+function channelCountToType(channels) {
+  switch (channels) {
+    case 1:
+      return "float";
+    case 2:
+      return "vec2";
+    case 3:
+      return "vec3";
+    case 4:
+      return "vec4";
+    default:
+      throw new Error(`invalid channels: ${channels}`);
+  }
+}
+function convertToVec4(variable, channels) {
+  switch (channels) {
+    case 1:
       return `vec4(${variable}, 0.0, 0.0, 1.0)`;
-    case "vec2":
+    case 2:
       return `vec4(${variable}, 0.0, 1.0)`;
-    case "vec3":
+    case 3:
       return `vec4(${variable}, 1.0)`;
-    case "vec4":
+    case 4:
       return variable;
     default:
-      throw new Error(type);
+      throw new Error(`invalid channels: ${channels}`);
   }
 }
 
@@ -4425,25 +4440,24 @@ var picking = {
   uniformTypes: {
     isActive: "f32",
     isAttribute: "f32",
-    useFloatColors: "f32",
     isHighlightActive: "f32",
+    useFloatColors: "f32",
     highlightedObjectColor: "vec3<f32>",
     highlightColor: "vec4<f32>"
   },
   defaultUniforms: {
     isActive: false,
     isAttribute: false,
-    useFloatColors: true,
     isHighlightActive: false,
+    useFloatColors: true,
     highlightedObjectColor: new Float32Array([0, 0, 0]),
     highlightColor: DEFAULT_HIGHLIGHT_COLOR
   },
   getUniforms
 };
 function getUniforms(opts = {}, prevUniforms) {
-  const uniforms = { ...picking.defaultUniforms };
+  const uniforms = {};
   if (opts.highlightedObjectColor === void 0) {
-    delete uniforms.highlightedObjectColor;
   } else if (opts.highlightedObjectColor === null) {
     uniforms.isHighlightActive = false;
   } else {
@@ -4586,7 +4600,6 @@ function getUniforms2(props, prevUniforms = {}) {
   if (props.enabled !== void 0) {
     uniforms.enabled = props.enabled ? 1 : 0;
   }
-  console.error(uniforms);
   return uniforms;
 }
 function getLightSourceUniforms({

package/dist/lib/glsl-utils/shader-utils.d.ts

@@ -11,7 +11,7 @@ export declare function getQualifierDetails(line: string, qualifiers: string | s
 export declare function getPassthroughFS(options?: {
     version?: number;
     input?: string;
-    inputType?: string;
+    inputChannels?: 1 | 2 | 3 | 4;
     output?: string;
 }): string;
 /** convert glsl type to suffix */
@@ -19,6 +19,6 @@ export declare function typeToChannelSuffix(type: string): 'x' | 'xy' | 'xyz' |
 /** convert glsl type to channel count */
 export declare function typeToChannelCount(type: string): 1 | 2 | 3 | 4;
 /** Returns glsl instruction for converting to vec4 */
-export declare function convertToVec4(variable: string, type: string): string;
+export declare function convertToVec4(variable: string, channels: 1 | 2 | 3 | 4): string;
 export {};
 //# sourceMappingURL=shader-utils.d.ts.map

package/dist/lib/glsl-utils/shader-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/glsl-utils/shader-utils.ts"],"names":[],"mappings":"AAaA,KAAK,aAAa,GAAG;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAA;AAGD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,GAAG,IAAI,CAUrG;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,MAAM,CAiCT;AAED,kCAAkC;AAClC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAI,GAAG,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,CAU9E;AAED,yCAAyC;AACzC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAU9D;AAED,sDAAsD;AACtD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAUpE"}
+{"version":3,"file":"shader-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/glsl-utils/shader-utils.ts"],"names":[],"mappings":"AAaA,KAAK,aAAa,GAAG;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAA;AAGD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,aAAa,GAAG,IAAI,CAUrG;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,MAAM,CAkCT;AAED,kCAAkC;AAClC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAI,GAAG,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,CAU9E;AAED,yCAAyC;AACzC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAU9D;AAaD,sDAAsD;AACtD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAU/E"}

package/dist/lib/glsl-utils/shader-utils.js

@@ -24,7 +24,7 @@ export function getPassthroughFS(options) {
   const {
     version = 100,
     input,
-    inputType,
+    inputChannels,
     output
   } = options || {};
   if (!input) {
@@ -35,10 +35,11 @@ export function getPassthroughFS(options) {
     }
     return FS100;
   }
-  if (!inputType) {
-    throw new Error('inputType');
+  if (!inputChannels) {
+    throw new Error('inputChannels');
   }
-  const outputValue = convertToVec4(input, inputType);
+  const inputType = channelCountToType(inputChannels);
+  const outputValue = convertToVec4(input, inputChannels);
   if (version >= 300) {
     return `\
 #version ${version} ${version === 300 ? 'es' : ''}
@@ -82,18 +83,32 @@ export function typeToChannelCount(type) {
       throw new Error(type);
   }
 }
-export function convertToVec4(variable, type) {
-  switch (type) {
-    case 'float':
+function channelCountToType(channels) {
+  switch (channels) {
+    case 1:
+      return 'float';
+    case 2:
+      return 'vec2';
+    case 3:
+      return 'vec3';
+    case 4:
+      return 'vec4';
+    default:
+      throw new Error(`invalid channels: ${channels}`);
+  }
+}
+export function convertToVec4(variable, channels) {
+  switch (channels) {
+    case 1:
       return `vec4(${variable}, 0.0, 0.0, 1.0)`;
-    case 'vec2':
+    case 2:
       return `vec4(${variable}, 0.0, 1.0)`;
-    case 'vec3':
+    case 3:
       return `vec4(${variable}, 1.0)`;
-    case 'vec4':
+    case 4:
       return variable;
     default:
-      throw new Error(type);
+      throw new Error(`invalid channels: ${channels}`);
   }
 }
 //# sourceMappingURL=shader-utils.js.map

package/dist/lib/glsl-utils/shader-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"shader-utils.js","names":["glsl","FS100","FS_GLES","FS300","getQualifierDetails","line","qualifiers","Array","isArray","words","replace","split","qualifier","type","definition","includes","name","getPassthroughFS","options","version","input","inputType","output","Error","outputValue","convertToVec4","typeToChannelSuffix","typeToChannelCount","variable"],"sources":["../../../src/lib/glsl-utils/shader-utils.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {glsl} from './highlight';\n\nconst FS100 = glsl`void main() {gl_FragColor = vec4(0);}`;\nconst FS_GLES = glsl`\\\nout vec4 transform_output;\nvoid main() {\n  transform_output = vec4(0);\n}`;\nconst FS300 = `#version 300 es\\n${FS_GLES}`;\n\ntype QualifierInfo = {\n  qualifier: string;\n  type: string;\n  name: string;\n}\n\n// Prase given glsl line and return qualifier details or null\nexport function getQualifierDetails(line: string, qualifiers: string | string[]): QualifierInfo | null {\n  qualifiers = Array.isArray(qualifiers) ? qualifiers : [qualifiers];\n  const words = line.replace(/^\\s+/, '').split(/\\s+/);\n  // TODO add support for precession qualifiers (highp, mediump and lowp)\n  const [qualifier, type, definition] = words;\n  if (!qualifiers.includes(qualifier) || !type || !definition) {\n    return null;\n  }\n  const name = definition.split(';')[0];\n  return {qualifier, type, name};\n}\n\n/**\n * Given the shader version, input and output variable names,\n * builds and return a pass through fragment shader.\n */\nexport function getPassthroughFS(options?: {\n  version?: number;\n  input?: string;\n  inputType?: string;\n  output?: string;\n}): string {\n  const {version = 100, input, inputType, output} = options || {};\n  if (!input) {\n    if (version === 300) {\n      // Fast-path for WebGL 2.0\n      return FS300;\n    } else if (version > 300) {\n      // Use the supplied version for OpenGL/ES 3.2+\n      return `#version ${version}\\n${FS_GLES}`;\n    }\n    // Fast-path for WebGL 1.0\n    return FS100;\n  }\n  if (!inputType) {\n    throw new Error('inputType');\n  }\n  const outputValue = convertToVec4(input, inputType);\n  if (version >= 300) {\n    // If version is 300, assume WebGL 2.0\n    return `\\\n#version ${version} ${version === 300 ? 'es' : ''}\nin ${inputType} ${input};\nout vec4 ${output};\nvoid main() {\n  ${output} = ${outputValue};\n}`;\n  }\n  // WebGL 1.0\n  return `\\\nvarying ${inputType} ${input};\nvoid main() {\n  gl_FragColor = ${outputValue};\n}`;\n}\n\n/** convert glsl type to suffix */\nexport function typeToChannelSuffix(type: string):  'x' | 'xy' | 'xyz' | 'xyzw' {\n  // prettier-ignore\n  switch (type) {\n    case 'float': return 'x';\n    case 'vec2': return 'xy';\n    case 'vec3': return 'xyz';\n    case 'vec4': return 'xyzw';\n    default:\n      throw new Error(type);\n  }\n}\n\n/** convert glsl type to channel count */\nexport function typeToChannelCount(type: string): 1 | 2 | 3 | 4 {\n  // prettier-ignore\n  switch (type) {\n    case 'float': return 1;\n    case 'vec2': return 2;\n    case 'vec3': return 3;\n    case 'vec4': return 4;\n    default:\n      throw new Error(type);\n  }\n}\n\n/** Returns glsl instruction for converting to vec4 */\nexport function convertToVec4(variable: string, type: string): string {\n  // prettier-ignore\n  switch (type) {\n    case 'float': return `vec4(${variable}, 0.0, 0.0, 1.0)`;\n    case 'vec2': return `vec4(${variable}, 0.0, 1.0)`;\n    case 'vec3': return `vec4(${variable}, 1.0)`;\n    case 'vec4': return variable;\n    default:\n      throw new Error(type);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"shader-utils.js","names":["glsl","FS100","FS_GLES","FS300","getQualifierDetails","line","qualifiers","Array","isArray","words","replace","split","qualifier","type","definition","includes","name","getPassthroughFS","options","version","input","inputChannels","output","Error","inputType","channelCountToType","outputValue","convertToVec4","typeToChannelSuffix","typeToChannelCount","channels","variable"],"sources":["../../../src/lib/glsl-utils/shader-utils.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {glsl} from './highlight';\n\nconst FS100 = glsl`void main() {gl_FragColor = vec4(0);}`;\nconst FS_GLES = glsl`\\\nout vec4 transform_output;\nvoid main() {\n  transform_output = vec4(0);\n}`;\nconst FS300 = `#version 300 es\\n${FS_GLES}`;\n\ntype QualifierInfo = {\n  qualifier: string;\n  type: string;\n  name: string;\n}\n\n// Prase given glsl line and return qualifier details or null\nexport function getQualifierDetails(line: string, qualifiers: string | string[]): QualifierInfo | null {\n  qualifiers = Array.isArray(qualifiers) ? qualifiers : [qualifiers];\n  const words = line.replace(/^\\s+/, '').split(/\\s+/);\n  // TODO add support for precession qualifiers (highp, mediump and lowp)\n  const [qualifier, type, definition] = words;\n  if (!qualifiers.includes(qualifier) || !type || !definition) {\n    return null;\n  }\n  const name = definition.split(';')[0];\n  return {qualifier, type, name};\n}\n\n/**\n * Given the shader version, input and output variable names,\n * builds and return a pass through fragment shader.\n */\nexport function getPassthroughFS(options?: {\n  version?: number;\n  input?: string;\n  inputChannels?: 1 | 2 | 3 | 4;\n  output?: string;\n}): string {\n  const {version = 100, input, inputChannels, output} = options || {};\n  if (!input) {\n    if (version === 300) {\n      // Fast-path for WebGL 2.0\n      return FS300;\n    } else if (version > 300) {\n      // Use the supplied version for OpenGL/ES 3.2+\n      return `#version ${version}\\n${FS_GLES}`;\n    }\n    // Fast-path for WebGL 1.0\n    return FS100;\n  }\n  if (!inputChannels) {\n    throw new Error('inputChannels');\n  }\n  const inputType = channelCountToType(inputChannels);\n  const outputValue = convertToVec4(input, inputChannels);\n  if (version >= 300) {\n    // If version is 300, assume WebGL 2.0\n    return `\\\n#version ${version} ${version === 300 ? 'es' : ''}\nin ${inputType} ${input};\nout vec4 ${output};\nvoid main() {\n  ${output} = ${outputValue};\n}`;\n  }\n  // WebGL 1.0\n  return `\\\nvarying ${inputType} ${input};\nvoid main() {\n  gl_FragColor = ${outputValue};\n}`;\n}\n\n/** convert glsl type to suffix */\nexport function typeToChannelSuffix(type: string):  'x' | 'xy' | 'xyz' | 'xyzw' {\n  // prettier-ignore\n  switch (type) {\n    case 'float': return 'x';\n    case 'vec2': return 'xy';\n    case 'vec3': return 'xyz';\n    case 'vec4': return 'xyzw';\n    default:\n      throw new Error(type);\n  }\n}\n\n/** convert glsl type to channel count */\nexport function typeToChannelCount(type: string): 1 | 2 | 3 | 4 {\n  // prettier-ignore\n  switch (type) {\n    case 'float': return 1;\n    case 'vec2': return 2;\n    case 'vec3': return 3;\n    case 'vec4': return 4;\n    default:\n      throw new Error(type);\n  }\n}\nfunction channelCountToType(channels: 1 | 2 | 3 |4): 'float' | 'vec2' | 'vec3' | 'vec4' {\n  // prettier-ignore\n  switch (channels) {\n    case 1: return 'float';\n    case 2: return 'vec2';\n    case 3: return 'vec3';\n    case 4: return 'vec4';\n    default:\n      throw new Error(`invalid channels: ${channels}`);\n  }\n}\n\n/** Returns glsl instruction for converting to vec4 */\nexport function convertToVec4(variable: string, channels: 1 | 2 | 3 | 4): string {\n  // prettier-ignore\n  switch (channels) {\n    case 1: return `vec4(${variable}, 0.0, 0.0, 1.0)`;\n    case 2: return `vec4(${variable}, 0.0, 1.0)`;\n    case 3: return `vec4(${variable}, 1.0)`;\n    case 4: return variable;\n    default:\n      throw new Error(`invalid channels: ${channels}`);\n  }\n}\n"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"shader-module-instance.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-instance.ts"],"names":[],"mappings":"AAIA,OAAO,EAA6C,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAC,YAAY,EAAE,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAuB,MAAM,sCAAsC,CAAC;AAI5F,yEAAyE;AACzE,qBAAa,oBAAoB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,iBAAiB,EAAE,QAAQ,CAAC;IAC5B,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,YAAY,EAAE,uBAAuB,EAAE,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACzC,UAAU,EAAE;QACV,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;KAC3C,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;IAC7C,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;IAEjD,MAAM,CAAC,kBAAkB,CACvB,OAAO,EAAE,CAAC,YAAY,GAAG,oBAAoB,CAAC,EAAE,GAC/C,oBAAoB,EAAE;gBAsBb,KAAK,EAAE,YAAY;IA6B/B,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM;IAwBrD,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAQ/F,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAK7C,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI;IAYvD,4BAA4B,CAAC,YAAY,EAAE,uBAAuB,EAAE;IAcpE,mBAAmB,CAAC,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAkBzE"}
+{"version":3,"file":"shader-module-instance.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-instance.ts"],"names":[],"mappings":"AAIA,OAAO,EAA6C,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAC,YAAY,EAAE,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAuB,MAAM,sCAAsC,CAAC;AAI5F,yEAAyE;AACzE,qBAAa,oBAAoB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,iBAAiB,EAAE,QAAQ,CAAC;IAC5B,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,YAAY,EAAE,uBAAuB,EAAE,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACzC,UAAU,EAAE;QACV,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;KAC3C,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;IAC7C,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;IAEjD,MAAM,CAAC,kBAAkB,CACvB,OAAO,EAAE,CAAC,YAAY,GAAG,oBAAoB,CAAC,EAAE,GAC/C,oBAAoB,EAAE;gBAuBb,KAAK,EAAE,YAAY;IA6B/B,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM;IAwBrD,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAQ/F,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAK7C,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI;IAYvD,4BAA4B,CAAC,YAAY,EAAE,uBAAuB,EAAE;IAcpE,mBAAmB,CAAC,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAkBzE"}

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

@@ -8,7 +8,7 @@ export class ShaderModuleInstance {
       if (module instanceof ShaderModuleInstance) {
         return module;
       }
-      assert(typeof module !== 'string', `Shader module use by name is deprecated. Import shader module '${module}' and use it directly.`);
+      assert(typeof module !== 'string', `Shader module use by name is deprecated. Import shader module '${JSON.stringify(module)}' and use it directly.`);
       if (!module.name) {
         console.warn('shader module has no name');
         module.name = `shader-module-${index++}`;

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

@@ -1 +1 @@
-{"version":3,"file":"shader-module-instance.js","names":["assert","makePropValidators","getValidatedProperties","normalizeInjections","index","ShaderModuleInstance","instantiateModules","modules","map","module","name","console","warn","moduleObject","dependencies","constructor","props","vs","fs","getModuleUniforms","deprecations","defines","injections","uniforms","uniformTypes","uniformPropTypes","getUniforms","inject","_parseDeprecationDefinitions","getModuleSource","stage","moduleSource","moduleName","toUpperCase","replace","userProps","getDefines","checkDeprecations","shaderSource","log","forEach","def","_def$regex","regex","test","deprecated","old","new","removed","type","RegExp","_defaultGetUniforms","opts","arguments","length","undefined","propTypes","key","propDef","private","validate","value"],"sources":["../../../src/lib/shader-module/shader-module-instance.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {assert} from '../utils/assert';\nimport {makePropValidators, getValidatedProperties, PropValidator} from '../filters/prop-types';\nimport {ShaderModule, ShaderModuleDeprecation} from './shader-module';\nimport { ShaderInjection, normalizeInjections } from '../shader-assembly/shader-injections';\n\nlet index = 1;\n\n/** An initialized ShaderModule, ready to use with `assembleShaders()` */\nexport class ShaderModuleInstance {\n  name: string;\n  vs?: string;\n  fs?: string;\n  getModuleUniforms: Function;\n  dependencies: ShaderModuleInstance[];\n  deprecations: ShaderModuleDeprecation[];\n  defines: Record<string, string | number>;\n  injections: {\n    vertex: Record<string, ShaderInjection>;\n    fragment: Record<string, ShaderInjection>;\n  };\n  uniforms: Record<string, PropValidator> = {};\n  uniformTypes: Record<string, PropValidator> = {};\n\n  static instantiateModules(\n    modules: (ShaderModule | ShaderModuleInstance)[]\n  ): ShaderModuleInstance[] {\n    return modules.map((module: ShaderModule | ShaderModuleInstance) => {\n      if (module instanceof ShaderModuleInstance) {\n        return module;\n      }\n\n      assert(\n        typeof module !== 'string',\n        `Shader module use by name is deprecated. Import shader module '${module}' and use it directly.`\n      );\n      if (!module.name) {\n        console.warn('shader module has no name');\n        module.name = `shader-module-${index++}`;\n      }\n\n      const moduleObject = new ShaderModuleInstance(module);\n      moduleObject.dependencies = ShaderModuleInstance.instantiateModules(module.dependencies || []);\n\n      return moduleObject;\n    });\n  }\n\n  constructor(props: ShaderModule) {\n    const {\n      name,\n      vs,\n      fs,\n      dependencies = [],\n      uniformPropTypes = {},\n      getUniforms,\n      deprecations = [],\n      defines = {},\n      inject = {}\n    } = props;\n\n    assert(typeof name === 'string');\n    this.name = name;\n    this.vs = vs;\n    this.fs = fs;\n    this.getModuleUniforms = getUniforms;\n    this.dependencies = ShaderModuleInstance.instantiateModules(dependencies);\n    this.deprecations = this._parseDeprecationDefinitions(deprecations);\n    this.defines = defines;\n    this.injections = normalizeInjections(inject);\n\n    if (uniformPropTypes) {\n      this.uniforms = makePropValidators(uniformPropTypes);\n    }\n  }\n\n  // Extracts the source code chunk for the specified shader type from the named shader module\n  getModuleSource(stage: 'vertex' | 'fragment'): string {\n    let moduleSource;\n    switch (stage) {\n      case 'vertex':\n        moduleSource = this.vs || '';\n        break;\n      case 'fragment':\n        moduleSource = this.fs || '';\n        break;\n      default:\n        assert(false);\n    }\n\n    const moduleName = this.name.toUpperCase().replace(/[^0-9a-z]/gi, '_');\n    return `\\\n// ----- MODULE ${this.name} ---------------\n\n#define MODULE_${moduleName}\n${moduleSource}\\\n\n\n`;\n  }\n\n  getUniforms(userProps: Record<string, any>, uniforms: Record<string, any>): Record<string, any> {\n    if (this.getModuleUniforms) {\n      return this.getModuleUniforms(userProps, uniforms);\n    }\n    // Build uniforms from the uniforms array\n    return getValidatedProperties(userProps, this.uniforms, this.name);\n  }\n\n  getDefines(): Record<string, string | number> {\n    return this.defines;\n  }\n\n  // Warn about deprecated uniforms or functions\n  checkDeprecations(shaderSource: string, log: any): void {\n    this.deprecations.forEach(def => {\n      if (def.regex?.test(shaderSource)) {\n        if (def.deprecated) {\n          log.deprecated(def.old, def.new)();\n        } else {\n          log.removed(def.old, def.new)();\n        }\n      }\n    });\n  }\n\n  _parseDeprecationDefinitions(deprecations: ShaderModuleDeprecation[]) {\n    deprecations.forEach(def => {\n      switch (def.type) {\n        case 'function':\n          def.regex = new RegExp(`\\\\b${def.old}\\\\(`);\n          break;\n        default:\n          def.regex = new RegExp(`${def.type} ${def.old};`);\n      }\n    });\n\n    return deprecations;\n  }\n\n  _defaultGetUniforms(opts: Record<string, any> = {}): Record<string, any> {\n    const uniforms: Record<string, any> = {};\n    const propTypes = this.uniforms;\n\n    for (const key in propTypes) {\n      const propDef = propTypes[key];\n      if (key in opts && !propDef.private) {\n        if (propDef.validate) {\n          assert(propDef.validate(opts[key], propDef), `${this.name}: invalid ${key}`);\n        }\n        uniforms[key] = opts[key];\n      } else {\n        uniforms[key] = propDef.value;\n      }\n    }\n\n    return uniforms;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"shader-module-instance.js","names":["assert","makePropValidators","getValidatedProperties","normalizeInjections","index","ShaderModuleInstance","instantiateModules","modules","map","module","JSON","stringify","name","console","warn","moduleObject","dependencies","constructor","props","vs","fs","getModuleUniforms","deprecations","defines","injections","uniforms","uniformTypes","uniformPropTypes","getUniforms","inject","_parseDeprecationDefinitions","getModuleSource","stage","moduleSource","moduleName","toUpperCase","replace","userProps","getDefines","checkDeprecations","shaderSource","log","forEach","def","_def$regex","regex","test","deprecated","old","new","removed","type","RegExp","_defaultGetUniforms","opts","arguments","length","undefined","propTypes","key","propDef","private","validate","value"],"sources":["../../../src/lib/shader-module/shader-module-instance.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {assert} from '../utils/assert';\nimport {makePropValidators, getValidatedProperties, PropValidator} from '../filters/prop-types';\nimport {ShaderModule, ShaderModuleDeprecation} from './shader-module';\nimport { ShaderInjection, normalizeInjections } from '../shader-assembly/shader-injections';\n\nlet index = 1;\n\n/** An initialized ShaderModule, ready to use with `assembleShaders()` */\nexport class ShaderModuleInstance {\n  name: string;\n  vs?: string;\n  fs?: string;\n  getModuleUniforms: Function;\n  dependencies: ShaderModuleInstance[];\n  deprecations: ShaderModuleDeprecation[];\n  defines: Record<string, string | number>;\n  injections: {\n    vertex: Record<string, ShaderInjection>;\n    fragment: Record<string, ShaderInjection>;\n  };\n  uniforms: Record<string, PropValidator> = {};\n  uniformTypes: Record<string, PropValidator> = {};\n\n  static instantiateModules(\n    modules: (ShaderModule | ShaderModuleInstance)[]\n  ): ShaderModuleInstance[] {\n    return modules.map((module: ShaderModule | ShaderModuleInstance) => {\n      if (module instanceof ShaderModuleInstance) {\n        return module;\n      }\n\n      assert(\n        typeof module !== 'string',\n        `Shader module use by name is deprecated. Import shader module '${JSON.stringify(module)}' and use it directly.`\n      );\n      if (!module.name) {\n        // eslint-disable-next-line no-console\n        console.warn('shader module has no name');\n        module.name = `shader-module-${index++}`;\n      }\n\n      const moduleObject = new ShaderModuleInstance(module);\n      moduleObject.dependencies = ShaderModuleInstance.instantiateModules(module.dependencies || []);\n\n      return moduleObject;\n    });\n  }\n\n  constructor(props: ShaderModule) {\n    const {\n      name,\n      vs,\n      fs,\n      dependencies = [],\n      uniformPropTypes = {},\n      getUniforms,\n      deprecations = [],\n      defines = {},\n      inject = {}\n    } = props;\n\n    assert(typeof name === 'string');\n    this.name = name;\n    this.vs = vs;\n    this.fs = fs;\n    this.getModuleUniforms = getUniforms;\n    this.dependencies = ShaderModuleInstance.instantiateModules(dependencies);\n    this.deprecations = this._parseDeprecationDefinitions(deprecations);\n    this.defines = defines;\n    this.injections = normalizeInjections(inject);\n\n    if (uniformPropTypes) {\n      this.uniforms = makePropValidators(uniformPropTypes);\n    }\n  }\n\n  // Extracts the source code chunk for the specified shader type from the named shader module\n  getModuleSource(stage: 'vertex' | 'fragment'): string {\n    let moduleSource;\n    switch (stage) {\n      case 'vertex':\n        moduleSource = this.vs || '';\n        break;\n      case 'fragment':\n        moduleSource = this.fs || '';\n        break;\n      default:\n        assert(false);\n    }\n\n    const moduleName = this.name.toUpperCase().replace(/[^0-9a-z]/gi, '_');\n    return `\\\n// ----- MODULE ${this.name} ---------------\n\n#define MODULE_${moduleName}\n${moduleSource}\\\n\n\n`;\n  }\n\n  getUniforms(userProps: Record<string, any>, uniforms: Record<string, any>): Record<string, any> {\n    if (this.getModuleUniforms) {\n      return this.getModuleUniforms(userProps, uniforms);\n    }\n    // Build uniforms from the uniforms array\n    return getValidatedProperties(userProps, this.uniforms, this.name);\n  }\n\n  getDefines(): Record<string, string | number> {\n    return this.defines;\n  }\n\n  // Warn about deprecated uniforms or functions\n  checkDeprecations(shaderSource: string, log: any): void {\n    this.deprecations.forEach(def => {\n      if (def.regex?.test(shaderSource)) {\n        if (def.deprecated) {\n          log.deprecated(def.old, def.new)();\n        } else {\n          log.removed(def.old, def.new)();\n        }\n      }\n    });\n  }\n\n  _parseDeprecationDefinitions(deprecations: ShaderModuleDeprecation[]) {\n    deprecations.forEach(def => {\n      switch (def.type) {\n        case 'function':\n          def.regex = new RegExp(`\\\\b${def.old}\\\\(`);\n          break;\n        default:\n          def.regex = new RegExp(`${def.type} ${def.old};`);\n      }\n    });\n\n    return deprecations;\n  }\n\n  _defaultGetUniforms(opts: Record<string, any> = {}): Record<string, any> {\n    const uniforms: Record<string, any> = {};\n    const propTypes = this.uniforms;\n\n    for (const key in propTypes) {\n      const propDef = propTypes[key];\n      if (key in opts && !propDef.private) {\n        if (propDef.validate) {\n          assert(propDef.validate(opts[key], propDef), `${this.name}: invalid ${key}`);\n        }\n        uniforms[key] = opts[key];\n      } else {\n        uniforms[key] = propDef.value;\n      }\n    }\n\n    return uniforms;\n  }\n}\n"],"mappings":"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"}

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

@@ -138,16 +138,16 @@ export const picking = {
   uniformTypes: {
     isActive: 'f32',
     isAttribute: 'f32',
-    useFloatColors: 'f32',
     isHighlightActive: 'f32',
+    useFloatColors: 'f32',
     highlightedObjectColor: 'vec3<f32>',
     highlightColor: 'vec4<f32>'
   },
   defaultUniforms: {
     isActive: false,
     isAttribute: false,
-    useFloatColors: true,
     isHighlightActive: false,
+    useFloatColors: true,
     highlightedObjectColor: new Float32Array([0, 0, 0]),
     highlightColor: DEFAULT_HIGHLIGHT_COLOR
   },
@@ -156,12 +156,8 @@ export const picking = {
 function getUniforms() {
   let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   let prevUniforms = arguments.length > 1 ? arguments[1] : undefined;
-  const uniforms = {
-    ...picking.defaultUniforms
-  };
-  if (opts.highlightedObjectColor === undefined) {
-    delete uniforms.highlightedObjectColor;
-  } else if (opts.highlightedObjectColor === null) {
+  const uniforms = {};
+  if (opts.highlightedObjectColor === undefined) {} else if (opts.highlightedObjectColor === null) {
     uniforms.isHighlightActive = false;
   } else {
     uniforms.isHighlightActive = true;

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

@@ -1 +1 @@
-{"version":3,"file":"picking.js","names":["glsl","DEFAULT_HIGHLIGHT_COLOR","Float32Array","vs","fs","picking","name","uniformTypes","isActive","isAttribute","useFloatColors","isHighlightActive","highlightedObjectColor","highlightColor","defaultUniforms","getUniforms","opts","arguments","length","undefined","prevUniforms","uniforms","slice","color","Array","from","x","Number","isFinite","Boolean"],"sources":["../../../../src/modules/engine/picking/picking.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {NumberArray} from '../../../types';\nimport {glsl} from '../../../lib/glsl-utils/highlight';\nimport {ShaderModule} from '../../../lib/shader-module/shader-module';\n\n// cyan color\nconst DEFAULT_HIGHLIGHT_COLOR = new Float32Array([0, 1, 1, 1]);\n\n/** \n * Props for the picking module, which depending on mode renders picking colors or highlighted item.\n * When active, renders picking colors, assumed to be rendered to off-screen \"picking\" buffer. \n * When inactive, renders normal colors, with the exception of selected object which is rendered with highlight \n */\nexport type PickingProps = {\n  /** Are we picking? I.e. rendering picking colors? */\n  isActive?: boolean;\n  /** Do we have a highlighted item? */\n  isHighlightActive?: boolean;\n  /** Set to true when picking an attribute value instead of object index */\n  isAttribute?: boolean;\n  /** Set to a picking color to visually highlight that item, or `null` to explicitly clear **/\n  highlightedObjectColor?: NumberArray | null;\n  /** Color of visual highlight of \"selected\" item */\n  highlightColor?: NumberArray;\n  /** Color range 0-1 or 0-255 */\n  useFloatColors?: boolean;\n};\n\n// TODO - \nexport type PickingSettings = Omit<PickingUniforms, 'isHighlightActive' | 'highlightedObjectColor'> & {\n  /**\n   * Set to a picking color to visually highlight that item.\n   * The picking module will persist the last highlighted object, unless\n   * `null` is passed to explicitly clear\n   **/\n  highlightedObjectColor?: NumberArray | null;\n  /** Color of visual highlight of \"selected\" item */\n  highlightColor?: NumberArray;\n};\n\n/** \n * Uniforms for the picking module, which renders picking colors and highlighted item. \n * When active, renders picking colors, assumed to be rendered to off-screen \"picking\" buffer. \n * When inactive, renders normal colors, with the exception of selected object which is rendered with highlight \n */\nexport type PickingUniforms = {\n  /** \n   * When true, renders picking colors. Set when rendering to off-screen \"picking\" buffer. \n   * When false, renders normal colors, with the exception of selected object which is rendered with highlight \n   */\n  isActive?: boolean;\n  /** Set to true when picking an attribute value instead of object index */\n  isAttribute?: boolean;\n  /** Color range 0-1 or 0-255 */\n  useFloatColors?: boolean;\n  /** Do we have a highlighted item? */\n  isHighlightActive?: boolean;\n  /** Set to a picking color to visually highlight that item */\n  highlightedObjectColor?: NumberArray;\n  /** Color of visual highlight of \"selected\" item */\n  highlightColor?: NumberArray;\n};\n\nconst vs = glsl`\\\nuniform 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`;\n\nconst fs = glsl`\\\nuniform 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`;\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: ShaderModule<PickingProps, PickingUniforms> = {\n  name: 'picking',\n  vs,\n  fs,\n  uniformTypes: {\n    isActive: 'f32',\n    isAttribute: 'f32',\n    useFloatColors: 'f32',\n    isHighlightActive: 'f32',\n    highlightedObjectColor: 'vec3<f32>',\n    highlightColor: 'vec4<f32>'\n  },\n  defaultUniforms: {\n    isActive: false,\n    isAttribute: false,\n    useFloatColors: true,\n    isHighlightActive: false,\n    highlightedObjectColor: new Float32Array([0, 0, 0]),\n    highlightColor: DEFAULT_HIGHLIGHT_COLOR\n  },\n  getUniforms\n};\n\nfunction getUniforms(opts: PickingProps = {}, prevUniforms?: PickingUniforms): PickingUniforms {\n  const uniforms = {...picking.defaultUniforms};\n\n  if (opts.highlightedObjectColor === undefined) {\n    delete uniforms.highlightedObjectColor;\n  } else if (opts.highlightedObjectColor === null) {\n    uniforms.isHighlightActive = false;\n  } else {\n    uniforms.isHighlightActive = true;\n    const highlightedObjectColor = opts.highlightedObjectColor.slice(0, 3);\n    uniforms.highlightedObjectColor = highlightedObjectColor;\n  }\n\n  if (opts.highlightColor) {\n    const color = Array.from(opts.highlightColor, (x) => x / 255);\n    if (!Number.isFinite(color[3])) {\n      color[3] = 1;\n    }\n    uniforms.highlightColor = color;\n  }\n\n  if (opts.isActive !== undefined) {\n    uniforms.isActive = Boolean(opts.isActive);\n    uniforms.isAttribute = Boolean(opts.isAttribute);\n  }\n\n  if (opts.useFloatColors !== undefined) {\n    uniforms.useFloatColors = Boolean(opts.useFloatColors);\n  }\n\n  return uniforms;\n}\n"],"mappings":"SAIQA,IAAI;AAIZ,MAAMC,uBAAuB,GAAG,IAAIC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAyD9D,MAAMC,EAAE,GAAGH,IAAK;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAED,MAAMI,EAAE,GAAGJ,IAAK;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AASD,OAAO,MAAMK,OAAoD,GAAG;EAClEC,IAAI,EAAE,SAAS;EACfH,EAAE;EACFC,EAAE;EACFG,YAAY,EAAE;IACZC,QAAQ,EAAE,KAAK;IACfC,WAAW,EAAE,KAAK;IAClBC,cAAc,EAAE,KAAK;IACrBC,iBAAiB,EAAE,KAAK;IACxBC,sBAAsB,EAAE,WAAW;IACnCC,cAAc,EAAE;EAClB,CAAC;EACDC,eAAe,EAAE;IACfN,QAAQ,EAAE,KAAK;IACfC,WAAW,EAAE,KAAK;IAClBC,cAAc,EAAE,IAAI;IACpBC,iBAAiB,EAAE,KAAK;IACxBC,sBAAsB,EAAE,IAAIV,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACnDW,cAAc,EAAEZ;EAClB,CAAC;EACDc;AACF,CAAC;AAED,SAASA,WAAWA,CAAA,EAA2E;EAAA,IAA1EC,IAAkB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAAA,IAAEG,YAA8B,GAAAH,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;EAC1E,MAAME,QAAQ,GAAG;IAAC,GAAGhB,OAAO,CAACS;EAAe,CAAC;EAE7C,IAAIE,IAAI,CAACJ,sBAAsB,KAAKO,SAAS,EAAE;IAC7C,OAAOE,QAAQ,CAACT,sBAAsB;EACxC,CAAC,MAAM,IAAII,IAAI,CAACJ,sBAAsB,KAAK,IAAI,EAAE;IAC/CS,QAAQ,CAACV,iBAAiB,GAAG,KAAK;EACpC,CAAC,MAAM;IACLU,QAAQ,CAACV,iBAAiB,GAAG,IAAI;IACjC,MAAMC,sBAAsB,GAAGI,IAAI,CAACJ,sBAAsB,CAACU,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IACtED,QAAQ,CAACT,sBAAsB,GAAGA,sBAAsB;EAC1D;EAEA,IAAII,IAAI,CAACH,cAAc,EAAE;IACvB,MAAMU,KAAK,GAAGC,KAAK,CAACC,IAAI,CAACT,IAAI,CAACH,cAAc,EAAGa,CAAC,IAAKA,CAAC,GAAG,GAAG,CAAC;IAC7D,IAAI,CAACC,MAAM,CAACC,QAAQ,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;MAC9BA,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;IACd;IACAF,QAAQ,CAACR,cAAc,GAAGU,KAAK;EACjC;EAEA,IAAIP,IAAI,CAACR,QAAQ,KAAKW,SAAS,EAAE;IAC/BE,QAAQ,CAACb,QAAQ,GAAGqB,OAAO,CAACb,IAAI,CAACR,QAAQ,CAAC;IAC1Ca,QAAQ,CAACZ,WAAW,GAAGoB,OAAO,CAACb,IAAI,CAACP,WAAW,CAAC;EAClD;EAEA,IAAIO,IAAI,CAACN,cAAc,KAAKS,SAAS,EAAE;IACrCE,QAAQ,CAACX,cAAc,GAAGmB,OAAO,CAACb,IAAI,CAACN,cAAc,CAAC;EACxD;EAEA,OAAOW,QAAQ;AACjB"}
+{"version":3,"file":"picking.js","names":["glsl","DEFAULT_HIGHLIGHT_COLOR","Float32Array","vs","fs","picking","name","uniformTypes","isActive","isAttribute","isHighlightActive","useFloatColors","highlightedObjectColor","highlightColor","defaultUniforms","getUniforms","opts","arguments","length","undefined","prevUniforms","uniforms","slice","color","Array","from","x","Number","isFinite","Boolean"],"sources":["../../../../src/modules/engine/picking/picking.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {NumberArray} from '../../../types';\nimport {glsl} from '../../../lib/glsl-utils/highlight';\nimport {ShaderModule} from '../../../lib/shader-module/shader-module';\n\n// cyan color\nconst DEFAULT_HIGHLIGHT_COLOR = new Float32Array([0, 1, 1, 1]);\n\n/** \n * Props for the picking module, which depending on mode renders picking colors or highlighted item.\n * When active, renders picking colors, assumed to be rendered to off-screen \"picking\" buffer. \n * When inactive, renders normal colors, with the exception of selected object which is rendered with highlight \n */\nexport type PickingProps = {\n  /** Are we picking? I.e. rendering picking colors? */\n  isActive?: boolean;\n  /** Do we have a highlighted item? */\n  isHighlightActive?: boolean;\n  /** Set to true when picking an attribute value instead of object index */\n  isAttribute?: boolean;\n  /** Set to a picking color to visually highlight that item, or `null` to explicitly clear **/\n  highlightedObjectColor?: NumberArray | null;\n  /** Color of visual highlight of \"selected\" item */\n  highlightColor?: NumberArray;\n  /** Color range 0-1 or 0-255 */\n  useFloatColors?: boolean;\n};\n\n// TODO - \nexport type PickingSettings = Omit<PickingUniforms, 'isHighlightActive' | 'highlightedObjectColor'> & {\n  /**\n   * Set to a picking color to visually highlight that item.\n   * The picking module will persist the last highlighted object, unless\n   * `null` is passed to explicitly clear\n   **/\n  highlightedObjectColor?: NumberArray | null;\n  /** Color of visual highlight of \"selected\" item */\n  highlightColor?: NumberArray;\n};\n\n/** \n * Uniforms for the picking module, which renders picking colors and highlighted item. \n * When active, renders picking colors, assumed to be rendered to off-screen \"picking\" buffer. \n * When inactive, renders normal colors, with the exception of selected object which is rendered with highlight \n */\nexport type PickingUniforms = {\n  /** \n   * When true, renders picking colors. Set when rendering to off-screen \"picking\" buffer. \n   * When false, renders normal colors, with the exception of selected object which is rendered with highlight \n   */\n  isActive?: boolean;\n  /** Set to true when picking an attribute value instead of object index */\n  isAttribute?: boolean;\n  /** Color range 0-1 or 0-255 */\n  useFloatColors?: boolean;\n  /** Do we have a highlighted item? */\n  isHighlightActive?: boolean;\n  /** Set to a picking color to visually highlight that item */\n  highlightedObjectColor?: NumberArray;\n  /** Color of visual highlight of \"selected\" item */\n  highlightColor?: NumberArray;\n};\n\nconst vs = glsl`\\\nuniform 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`;\n\nconst fs = glsl`\\\nuniform 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`;\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: ShaderModule<PickingProps, PickingUniforms> = {\n  name: 'picking',\n  vs,\n  fs,\n  uniformTypes: {\n    isActive: 'f32',\n    isAttribute: 'f32',\n    isHighlightActive: 'f32',\n    useFloatColors: 'f32',\n    highlightedObjectColor: 'vec3<f32>',\n    highlightColor: 'vec4<f32>'\n  },\n  defaultUniforms: {\n    isActive: false,\n    isAttribute: false,\n    isHighlightActive: false,\n    useFloatColors: true,\n    highlightedObjectColor: new Float32Array([0, 0, 0]),\n    highlightColor: DEFAULT_HIGHLIGHT_COLOR\n  },\n  getUniforms\n};\n\nfunction getUniforms(opts: PickingProps = {}, prevUniforms?: PickingUniforms): PickingUniforms {\n  const uniforms = {} as PickingUniforms;\n\n  if (opts.highlightedObjectColor === undefined) {\n    // Unless highlightedObjectColor explicitly null or set, do not update state\n  } else if (opts.highlightedObjectColor === null) {\n    uniforms.isHighlightActive = false;\n  } else {\n    uniforms.isHighlightActive = true;\n    const highlightedObjectColor = opts.highlightedObjectColor.slice(0, 3);\n    uniforms.highlightedObjectColor = highlightedObjectColor;\n  }\n\n  if (opts.highlightColor) {\n    const color = Array.from(opts.highlightColor, (x) => x / 255);\n    if (!Number.isFinite(color[3])) {\n      color[3] = 1;\n    }\n    uniforms.highlightColor = color;\n  }\n\n  if (opts.isActive !== undefined) {\n    uniforms.isActive = Boolean(opts.isActive);\n    uniforms.isAttribute = Boolean(opts.isAttribute);\n  }\n\n  if (opts.useFloatColors !== undefined) {\n    uniforms.useFloatColors = Boolean(opts.useFloatColors);\n  }\n\n  return uniforms;\n}\n"],"mappings":"SAIQA,IAAI;AAIZ,MAAMC,uBAAuB,GAAG,IAAIC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAyD9D,MAAMC,EAAE,GAAGH,IAAK;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAED,MAAMI,EAAE,GAAGJ,IAAK;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AASD,OAAO,MAAMK,OAAoD,GAAG;EAClEC,IAAI,EAAE,SAAS;EACfH,EAAE;EACFC,EAAE;EACFG,YAAY,EAAE;IACZC,QAAQ,EAAE,KAAK;IACfC,WAAW,EAAE,KAAK;IAClBC,iBAAiB,EAAE,KAAK;IACxBC,cAAc,EAAE,KAAK;IACrBC,sBAAsB,EAAE,WAAW;IACnCC,cAAc,EAAE;EAClB,CAAC;EACDC,eAAe,EAAE;IACfN,QAAQ,EAAE,KAAK;IACfC,WAAW,EAAE,KAAK;IAClBC,iBAAiB,EAAE,KAAK;IACxBC,cAAc,EAAE,IAAI;IACpBC,sBAAsB,EAAE,IAAIV,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACnDW,cAAc,EAAEZ;EAClB,CAAC;EACDc;AACF,CAAC;AAED,SAASA,WAAWA,CAAA,EAA2E;EAAA,IAA1EC,IAAkB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAAA,IAAEG,YAA8B,GAAAH,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;EAC1E,MAAME,QAAQ,GAAG,CAAC,CAAoB;EAEtC,IAAIL,IAAI,CAACJ,sBAAsB,KAAKO,SAAS,EAAE,CAE/C,CAAC,MAAM,IAAIH,IAAI,CAACJ,sBAAsB,KAAK,IAAI,EAAE;IAC/CS,QAAQ,CAACX,iBAAiB,GAAG,KAAK;EACpC,CAAC,MAAM;IACLW,QAAQ,CAACX,iBAAiB,GAAG,IAAI;IACjC,MAAME,sBAAsB,GAAGI,IAAI,CAACJ,sBAAsB,CAACU,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IACtED,QAAQ,CAACT,sBAAsB,GAAGA,sBAAsB;EAC1D;EAEA,IAAII,IAAI,CAACH,cAAc,EAAE;IACvB,MAAMU,KAAK,GAAGC,KAAK,CAACC,IAAI,CAACT,IAAI,CAACH,cAAc,EAAGa,CAAC,IAAKA,CAAC,GAAG,GAAG,CAAC;IAC7D,IAAI,CAACC,MAAM,CAACC,QAAQ,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;MAC9BA,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;IACd;IACAF,QAAQ,CAACR,cAAc,GAAGU,KAAK;EACjC;EAEA,IAAIP,IAAI,CAACR,QAAQ,KAAKW,SAAS,EAAE;IAC/BE,QAAQ,CAACb,QAAQ,GAAGqB,OAAO,CAACb,IAAI,CAACR,QAAQ,CAAC;IAC1Ca,QAAQ,CAACZ,WAAW,GAAGoB,OAAO,CAACb,IAAI,CAACP,WAAW,CAAC;EAClD;EAEA,IAAIO,IAAI,CAACL,cAAc,KAAKQ,SAAS,EAAE;IACrCE,QAAQ,CAACV,cAAc,GAAGkB,OAAO,CAACb,IAAI,CAACL,cAAc,CAAC;EACxD;EAEA,OAAOU,QAAQ;AACjB"}

package/dist/modules/lighting/lights/lighting-uniforms.js

@@ -78,7 +78,6 @@ function getUniforms(props) {
   if (props.enabled !== undefined) {
     uniforms.enabled = props.enabled ? 1 : 0;
   }
-  console.error(uniforms);
   return uniforms;
 }
 function getLightSourceUniforms(_ref) {

package/dist/modules/lighting/lights/lighting-uniforms.js.map

@@ -1 +1 @@
-{"version":3,"file":"lighting-uniforms.js","names":["lightingUniforms","MAX_LIGHTS","COLOR_FACTOR","LIGHT_TYPE","lighting","name","vs","fs","getUniforms","props","prevUniforms","defines","uniformTypes","enabled","ambientLightColor","numberOfLights","lightType","lightColor","lightPosition","lightDirection","lightAttenuation","defaultUniforms","POINT","arguments","length","undefined","lights","extractLightTypes","ambientLight","pointLights","directionalLights","hasLights","uniforms","getLightSourceUniforms","console","error","_ref","lightSourceUniforms","convertColor","currentLight","pointLight","position","attenuation","directionalLight","DIRECTIONAL","direction","_lightSources$directi","_lightSources$pointLi","lightSources","light","type","push","colorDef","color","intensity","map","component"],"sources":["../../../../src/modules/lighting/lights/lighting-uniforms.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport type {NumberArray} from '@math.gl/types';\nimport {ShaderModule} from '../../../lib/shader-module/shader-module';\nimport {lightingUniforms} from './lighting-uniforms.glsl';\n\n/** Max number of supported lights (in addition to ambient light */\nconst MAX_LIGHTS = 5;\n\n/** Whether to divide */\nconst COLOR_FACTOR = 255.0;\n\n/** Shader type field for lights */\nenum LIGHT_TYPE {\n  POINT = 0,\n  DIRECTIONAL = 1\n}\n\n/** Lighting helper types */\n\nexport type Light = AmbientLight | PointLight | DirectionalLight;\n\nexport type AmbientLight = {\n  type: 'ambient';\n  color?: Readonly<NumberArray>;\n  intensity?: number;\n}\n\nexport type PointLight = {\n  type: 'point';\n  position: Readonly<NumberArray>;\n  color?: Readonly<NumberArray>;\n  intensity?: number;\n  attenuation?: number;\n}\n\nexport type DirectionalLight = {\n  type: 'directional';\n  position: Readonly<NumberArray>;\n  direction: Readonly<NumberArray>;\n  color?: Readonly<NumberArray>;\n  intensity?: number;\n}\n\nexport type LightingProps = {\n  enabled?: boolean;\n  lights?: Light[];\n  /** @deprecated */\n  ambientLight?: AmbientLight;\n  /** @deprecated */\n  pointLights?: PointLight[];\n  /** @deprecated */\n  directionalLights?: DirectionalLight[];\n};\n\nexport type LightingUniforms = {\n  enabled: number;\n  ambientLightColor: Readonly<NumberArray>;\n  numberOfLights: number;\n  lightType: number; // [];\n  lightColor: Readonly<NumberArray>; // [];\n  lightPosition: Readonly<NumberArray>; // [];\n  lightDirection: Readonly<NumberArray>; // [];\n  lightAttenuation: Readonly<NumberArray>; // [];\n};\n\n/** UBO ready lighting module */\nexport const lighting: ShaderModule<LightingProps, LightingUniforms> = {\n  name: 'lighting',\n  vs: lightingUniforms,\n  fs: lightingUniforms,\n\n  getUniforms(props?: LightingProps, prevUniforms?: LightingUniforms): LightingUniforms {\n    return getUniforms(props);\n  },\n\n  defines: {\n    MAX_LIGHTS\n  },\n\n  uniformTypes: {\n    enabled: 'i32',\n    ambientLightColor: 'vec3<f32>',\n    numberOfLights: 'i32', // , array: MAX_LIGHTS,\n    lightType: 'i32', // , array: MAX_LIGHTS,\n    lightColor: 'vec3<f32>', // , array: MAX_LIGHTS,\n    lightPosition: 'vec3<f32>', // , array: MAX_LIGHTS,\n    // TODO - could combine direction and attenuation\n    lightDirection: 'vec3<f32>', // , array: MAX_LIGHTS,\n    lightAttenuation: 'vec3<f32>' // , array: MAX_LIGHTS},\n  },\n\n  defaultUniforms: { \n    enabled: 1,\n    ambientLightColor: [0.1, 0.1, 0.1],\n    numberOfLights: 0,\n    lightType: LIGHT_TYPE.POINT,\n    lightColor: [1, 1, 1],\n    lightPosition: [1, 1, 2],\n    // TODO - could combine direction and attenuation\n    lightDirection: [1, 1, 1],\n    lightAttenuation: [1, 1, 1],\n  }\n};\n\nfunction getUniforms(props?: LightingProps, prevUniforms: Partial<LightingUniforms> = {}): LightingUniforms {\n  // Copy props so we can modify \n  props = props ? {...props} : props;\n\n  // TODO legacy\n  if (!props) {\n    return {...lighting.defaultUniforms};\n  }\n  // Support for array of lights. Type of light is detected by type field\n  if (props.lights) {\n    props = {...props, ...extractLightTypes(props.lights), lights: undefined};\n  }\n\n  // Specify lights separately\n  const {ambientLight, pointLights, directionalLights} = props || {};\n  const hasLights =\n    ambientLight ||\n    (pointLights && pointLights.length > 0) ||\n    (directionalLights && directionalLights.length > 0);\n\n  // TODO - this may not be the correct decision\n  if (!hasLights) {\n    return {...lighting.defaultUniforms, enabled: 0};\n  }\n\n  const uniforms = {\n    ...lighting.defaultUniforms,\n    ...prevUniforms,\n    ...getLightSourceUniforms({ambientLight, pointLights, directionalLights}),\n  };\n\n  if (props.enabled !== undefined) {\n    uniforms.enabled = props.enabled ? 1 : 0;\n  }\n\n  console.error(uniforms)\n  return uniforms;\n}\n\nfunction getLightSourceUniforms({\n  ambientLight,\n  pointLights = [],\n  directionalLights = []\n}: LightingProps): Partial<LightingUniforms> {\n  const lightSourceUniforms: Partial<LightingUniforms> = {\n    // lightType: new Array(MAX_LIGHTS).fill(0),\n    // lightColor: new Array(MAX_LIGHTS).fill([0, 0, 0]),\n    // lightPosition: new Array(MAX_LIGHTS).fill([0, 0, 0]),\n    // lightDirection: new Array(MAX_LIGHTS).fill([0, 0, 0]),\n    // lightAttenuation: new Array(MAX_LIGHTS).fill([0, 0, 0])\n  };\n\n  lightSourceUniforms.ambientLightColor = convertColor(ambientLight);\n\n  let currentLight = 0;\n\n  for (const pointLight of pointLights) {\n    // lightSourceUniforms.lightType[currentLight] = LIGHT_TYPE.POINT;\n    // lightSourceUniforms.lightColor[currentLight] = convertColor(pointLight);\n    // lightSourceUniforms.lightPosition[currentLight] = pointLight.position;\n    // lightSourceUniforms.lightAttenuation[currentLight] = [pointLight.attenuation || 1, 0, 0];\n    lightSourceUniforms.lightType = LIGHT_TYPE.POINT;\n    lightSourceUniforms.lightColor = convertColor(pointLight);\n    lightSourceUniforms.lightPosition = pointLight.position;\n    lightSourceUniforms.lightAttenuation = [pointLight.attenuation || 1, 0, 0];\n    currentLight++;\n  }\n\n  for (const directionalLight of directionalLights) {\n    // lightSourceUniforms.lightType[currentLight] = LIGHT_TYPE.DIRECTIONAL;\n    // lightSourceUniforms.lightColor[currentLight] = convertColor(directionalLight);\n    // lightSourceUniforms.lightPosition[currentLight] = directionalLight.position;\n    // lightSourceUniforms.lightDirection[currentLight] = directionalLight.direction;\n    lightSourceUniforms.lightType = LIGHT_TYPE.DIRECTIONAL;\n    lightSourceUniforms.lightColor = convertColor(directionalLight);\n    lightSourceUniforms.lightPosition = directionalLight.position;\n    lightSourceUniforms.lightDirection = directionalLight.direction;\n    currentLight++;\n  }\n\n  lightSourceUniforms.numberOfLights = currentLight;\n\n  return lightSourceUniforms;\n}\n\nfunction extractLightTypes(lights: Light[]): LightingProps {\n  const lightSources: LightingProps = {pointLights: [], directionalLights: []};\n  for (const light of lights || []) {\n    switch (light.type) {\n      case 'ambient':\n        // Note: Only uses last ambient light\n        // TODO - add ambient light sources on CPU?\n        lightSources.ambientLight = light;\n        break;\n      case 'directional':\n        lightSources.directionalLights?.push(light);\n        break;\n      case 'point':\n        lightSources.pointLights?.push(light);\n        break;\n      default:\n      // eslint-disable-next-line\n      // console.warn(light.type);\n    }\n  }\n  return lightSources;\n}\n\n/** Take color 0-255 and intensity as input and output 0.0-1.0 range */\nfunction convertColor(colorDef: {color?: Readonly<NumberArray>, intensity?: number} = {}): NumberArray {\n  const {color = [0, 0, 0], intensity = 1.0} = colorDef;\n  return color.map((component) => (component * intensity) / COLOR_FACTOR);\n}\n"],"mappings":"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"}
+{"version":3,"file":"lighting-uniforms.js","names":["lightingUniforms","MAX_LIGHTS","COLOR_FACTOR","LIGHT_TYPE","lighting","name","vs","fs","getUniforms","props","prevUniforms","defines","uniformTypes","enabled","ambientLightColor","numberOfLights","lightType","lightColor","lightPosition","lightDirection","lightAttenuation","defaultUniforms","POINT","arguments","length","undefined","lights","extractLightTypes","ambientLight","pointLights","directionalLights","hasLights","uniforms","getLightSourceUniforms","_ref","lightSourceUniforms","convertColor","currentLight","pointLight","position","attenuation","directionalLight","DIRECTIONAL","direction","_lightSources$directi","_lightSources$pointLi","lightSources","light","type","push","colorDef","color","intensity","map","component"],"sources":["../../../../src/modules/lighting/lights/lighting-uniforms.ts"],"sourcesContent":["// luma.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport type {NumberArray} from '@math.gl/types';\nimport {ShaderModule} from '../../../lib/shader-module/shader-module';\nimport {lightingUniforms} from './lighting-uniforms.glsl';\n\n/** Max number of supported lights (in addition to ambient light */\nconst MAX_LIGHTS = 5;\n\n/** Whether to divide */\nconst COLOR_FACTOR = 255.0;\n\n/** Shader type field for lights */\nenum LIGHT_TYPE {\n  POINT = 0,\n  DIRECTIONAL = 1\n}\n\n/** Lighting helper types */\n\nexport type Light = AmbientLight | PointLight | DirectionalLight;\n\nexport type AmbientLight = {\n  type: 'ambient';\n  color?: Readonly<NumberArray>;\n  intensity?: number;\n}\n\nexport type PointLight = {\n  type: 'point';\n  position: Readonly<NumberArray>;\n  color?: Readonly<NumberArray>;\n  intensity?: number;\n  attenuation?: number;\n}\n\nexport type DirectionalLight = {\n  type: 'directional';\n  position: Readonly<NumberArray>;\n  direction: Readonly<NumberArray>;\n  color?: Readonly<NumberArray>;\n  intensity?: number;\n}\n\nexport type LightingProps = {\n  enabled?: boolean;\n  lights?: Light[];\n  /** @deprecated */\n  ambientLight?: AmbientLight;\n  /** @deprecated */\n  pointLights?: PointLight[];\n  /** @deprecated */\n  directionalLights?: DirectionalLight[];\n};\n\nexport type LightingUniforms = {\n  enabled: number;\n  ambientLightColor: Readonly<NumberArray>;\n  numberOfLights: number;\n  lightType: number; // [];\n  lightColor: Readonly<NumberArray>; // [];\n  lightPosition: Readonly<NumberArray>; // [];\n  lightDirection: Readonly<NumberArray>; // [];\n  lightAttenuation: Readonly<NumberArray>; // [];\n};\n\n/** UBO ready lighting module */\nexport const lighting: ShaderModule<LightingProps, LightingUniforms> = {\n  name: 'lighting',\n  vs: lightingUniforms,\n  fs: lightingUniforms,\n\n  getUniforms(props?: LightingProps, prevUniforms?: LightingUniforms): LightingUniforms {\n    return getUniforms(props);\n  },\n\n  defines: {\n    MAX_LIGHTS\n  },\n\n  uniformTypes: {\n    enabled: 'i32',\n    ambientLightColor: 'vec3<f32>',\n    numberOfLights: 'i32', // , array: MAX_LIGHTS,\n    lightType: 'i32', // , array: MAX_LIGHTS,\n    lightColor: 'vec3<f32>', // , array: MAX_LIGHTS,\n    lightPosition: 'vec3<f32>', // , array: MAX_LIGHTS,\n    // TODO - could combine direction and attenuation\n    lightDirection: 'vec3<f32>', // , array: MAX_LIGHTS,\n    lightAttenuation: 'vec3<f32>' // , array: MAX_LIGHTS},\n  },\n\n  defaultUniforms: { \n    enabled: 1,\n    ambientLightColor: [0.1, 0.1, 0.1],\n    numberOfLights: 0,\n    lightType: LIGHT_TYPE.POINT,\n    lightColor: [1, 1, 1],\n    lightPosition: [1, 1, 2],\n    // TODO - could combine direction and attenuation\n    lightDirection: [1, 1, 1],\n    lightAttenuation: [1, 1, 1],\n  }\n};\n\nfunction getUniforms(props?: LightingProps, prevUniforms: Partial<LightingUniforms> = {}): LightingUniforms {\n  // Copy props so we can modify \n  props = props ? {...props} : props;\n\n  // TODO legacy\n  if (!props) {\n    return {...lighting.defaultUniforms};\n  }\n  // Support for array of lights. Type of light is detected by type field\n  if (props.lights) {\n    props = {...props, ...extractLightTypes(props.lights), lights: undefined};\n  }\n\n  // Specify lights separately\n  const {ambientLight, pointLights, directionalLights} = props || {};\n  const hasLights =\n    ambientLight ||\n    (pointLights && pointLights.length > 0) ||\n    (directionalLights && directionalLights.length > 0);\n\n  // TODO - this may not be the correct decision\n  if (!hasLights) {\n    return {...lighting.defaultUniforms, enabled: 0};\n  }\n\n  const uniforms = {\n    ...lighting.defaultUniforms,\n    ...prevUniforms,\n    ...getLightSourceUniforms({ambientLight, pointLights, directionalLights}),\n  };\n\n  if (props.enabled !== undefined) {\n    uniforms.enabled = props.enabled ? 1 : 0;\n  }\n\n  return uniforms;\n}\n\nfunction getLightSourceUniforms({\n  ambientLight,\n  pointLights = [],\n  directionalLights = []\n}: LightingProps): Partial<LightingUniforms> {\n  const lightSourceUniforms: Partial<LightingUniforms> = {\n    // lightType: new Array(MAX_LIGHTS).fill(0),\n    // lightColor: new Array(MAX_LIGHTS).fill([0, 0, 0]),\n    // lightPosition: new Array(MAX_LIGHTS).fill([0, 0, 0]),\n    // lightDirection: new Array(MAX_LIGHTS).fill([0, 0, 0]),\n    // lightAttenuation: new Array(MAX_LIGHTS).fill([0, 0, 0])\n  };\n\n  lightSourceUniforms.ambientLightColor = convertColor(ambientLight);\n\n  let currentLight = 0;\n\n  for (const pointLight of pointLights) {\n    // lightSourceUniforms.lightType[currentLight] = LIGHT_TYPE.POINT;\n    // lightSourceUniforms.lightColor[currentLight] = convertColor(pointLight);\n    // lightSourceUniforms.lightPosition[currentLight] = pointLight.position;\n    // lightSourceUniforms.lightAttenuation[currentLight] = [pointLight.attenuation || 1, 0, 0];\n    lightSourceUniforms.lightType = LIGHT_TYPE.POINT;\n    lightSourceUniforms.lightColor = convertColor(pointLight);\n    lightSourceUniforms.lightPosition = pointLight.position;\n    lightSourceUniforms.lightAttenuation = [pointLight.attenuation || 1, 0, 0];\n    currentLight++;\n  }\n\n  for (const directionalLight of directionalLights) {\n    // lightSourceUniforms.lightType[currentLight] = LIGHT_TYPE.DIRECTIONAL;\n    // lightSourceUniforms.lightColor[currentLight] = convertColor(directionalLight);\n    // lightSourceUniforms.lightPosition[currentLight] = directionalLight.position;\n    // lightSourceUniforms.lightDirection[currentLight] = directionalLight.direction;\n    lightSourceUniforms.lightType = LIGHT_TYPE.DIRECTIONAL;\n    lightSourceUniforms.lightColor = convertColor(directionalLight);\n    lightSourceUniforms.lightPosition = directionalLight.position;\n    lightSourceUniforms.lightDirection = directionalLight.direction;\n    currentLight++;\n  }\n\n  lightSourceUniforms.numberOfLights = currentLight;\n\n  return lightSourceUniforms;\n}\n\nfunction extractLightTypes(lights: Light[]): LightingProps {\n  const lightSources: LightingProps = {pointLights: [], directionalLights: []};\n  for (const light of lights || []) {\n    switch (light.type) {\n      case 'ambient':\n        // Note: Only uses last ambient light\n        // TODO - add ambient light sources on CPU?\n        lightSources.ambientLight = light;\n        break;\n      case 'directional':\n        lightSources.directionalLights?.push(light);\n        break;\n      case 'point':\n        lightSources.pointLights?.push(light);\n        break;\n      default:\n      // eslint-disable-next-line\n      // console.warn(light.type);\n    }\n  }\n  return lightSources;\n}\n\n/** Take color 0-255 and intensity as input and output 0.0-1.0 range */\nfunction convertColor(colorDef: {color?: Readonly<NumberArray>, intensity?: number} = {}): NumberArray {\n  const {color = [0, 0, 0], intensity = 1.0} = colorDef;\n  return color.map((component) => (component * intensity) / COLOR_FACTOR);\n}\n"],"mappings":"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"}