@luma.gl/shadertools 9.1.9 → 9.2.0-alpha.2

package/src/modules/lighting/pbr-material/pbr-material-wgsl.ts

@@ -0,0 +1,490 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+// Attribution:
+// MIT license, Copyright (c) 2016-2017 Mohamad Moneimne and Contributors
+// This fragment shader defines a reference implementation for Physically Based Shading of
+// a microfacet surface material defined by a glTF model.
+
+// TODO - better do the checks outside of shader
+
+export const pbrMaterialUniforms = /* wgsl */ `\
+uniform Projection {
+  // Projection
+  vec3 u_Camera;
+};
+
+uniform pbrMaterialUniforms {
+  // Material is unlit
+  bool unlit;
+
+  // Base color map
+  bool baseColorMapEnabled;
+  vec4 baseColorFactor;
+
+  bool normalMapEnabled;  
+  float normalScale; // #ifdef HAS_NORMALMAP
+
+  bool emissiveMapEnabled;
+  vec3 emissiveFactor; // #ifdef HAS_EMISSIVEMAP
+
+  vec2 metallicRoughnessValues;
+  bool metallicRoughnessMapEnabled;
+
+  bool occlusionMapEnabled;
+  float occlusionStrength; // #ifdef HAS_OCCLUSIONMAP
+  
+  bool alphaCutoffEnabled;
+  float alphaCutoff; // #ifdef ALPHA_CUTOFF
+  
+  // IBL
+  bool IBLenabled;
+  vec2 scaleIBLAmbient; // #ifdef USE_IBL
+  
+  // debugging flags used for shader output of intermediate PBR variables
+  // #ifdef PBR_DEBUG
+  vec4 scaleDiffBaseMR;
+  vec4 scaleFGDSpec;
+  // #endif
+};
+
+// Samplers
+#ifdef HAS_BASECOLORMAP
+uniform sampler2D u_BaseColorSampler;
+#endif
+#ifdef HAS_NORMALMAP
+uniform sampler2D u_NormalSampler;
+#endif
+#ifdef HAS_EMISSIVEMAP
+uniform sampler2D u_EmissiveSampler;
+#endif
+#ifdef HAS_METALROUGHNESSMAP
+uniform sampler2D u_MetallicRoughnessSampler;
+#endif
+#ifdef HAS_OCCLUSIONMAP
+uniform sampler2D u_OcclusionSampler;
+#endif
+#ifdef USE_IBL
+uniform samplerCube u_DiffuseEnvSampler;
+uniform samplerCube u_SpecularEnvSampler;
+uniform sampler2D u_brdfLUT;
+#endif
+
+`;
+
+export const source = /* wgsl */ `\
+struct PBRFragmentInputs {
+  pbr_vPosition: vec3f,
+  pbr_vUV: vec2f,
+  pbr_vTBN: mat3f,
+  pbr_vNormal: vec3f
+};
+
+var fragmentInputs: PBRFragmentInputs;
+
+fn pbr_setPositionNormalTangentUV(position: vec4f, normal: vec4f, tangent: vec4f, uv: vec2f)
+{
+  var pos: vec4f = pbrProjection.modelMatrix * position;
+  pbr_vPosition = vec3(pos.xyz) / pos.w;
+
+#ifdef HAS_NORMALS
+#ifdef HAS_TANGENTS
+  let normalW: vec3f = normalize(vec3(pbrProjection.normalMatrix * vec4(normal.xyz, 0.0)));
+  let tangentW: vec3f = normalize(vec3(pbrProjection.modelMatrix * vec4(tangent.xyz, 0.0)));
+  let bitangentW: vec3f = cross(normalW, tangentW) * tangent.w;
+  fragmentInputs,pbr_vTBN = mat3(tangentW, bitangentW, normalW);
+#else // HAS_TANGENTS != 1
+  fragmentInputs.pbr_vNormal = normalize(vec3(pbrProjection.modelMatrix * vec4(normal.xyz, 0.0)));
+#endif
+#endif
+
+#ifdef HAS_UV
+  pbr_vUV = uv;
+#else
+  pbr_vUV = vec2(0.,0.);
+#endif
+}
+
+struct pbrMaterialUniforms {
+  // Material is unlit
+  unlit: uint32,
+
+  // Base color map
+  baseColorMapEnabled: uint32,
+  baseColorFactor: vec4f,
+
+  normalMapEnabled : uint32,
+  normalScale: f32,  // #ifdef HAS_NORMALMAP
+
+  emissiveMapEnabled: uint32,
+  emissiveFactor: vec3f, // #ifdef HAS_EMISSIVEMAP
+
+  metallicRoughnessValues: vec2f,
+  metallicRoughnessMapEnabled: uint32,
+
+  occlusionMapEnabled: i32,
+  occlusionStrength: f32, // #ifdef HAS_OCCLUSIONMAP
+  
+  alphaCutoffEnabled: i32,
+  alphaCutoff: f32, // #ifdef ALPHA_CUTOFF
+  
+  // IBL
+  IBLenabled: i32,
+  scaleIBLAmbient: vec2f, // #ifdef USE_IBL
+  
+  // debugging flags used for shader output of intermediate PBR variables
+  // #ifdef PBR_DEBUG
+  scaleDiffBaseMR: vec4f,
+  scaleFGDSpec: vec4f
+  // #endif
+} 
+  
+@binding(2) @group(0) var<uniform> material : pbrMaterialUniforms;
+
+// Samplers
+#ifdef HAS_BASECOLORMAP
+uniform sampler2D pbr_baseColorSampler;
+#endif
+#ifdef HAS_NORMALMAP
+uniform sampler2D pbr_normalSampler;
+#endif
+#ifdef HAS_EMISSIVEMAP
+uniform sampler2D pbr_emissiveSampler;
+#endif
+#ifdef HAS_METALROUGHNESSMAP
+uniform sampler2D pbr_metallicRoughnessSampler;
+#endif
+#ifdef HAS_OCCLUSIONMAP
+uniform sampler2D pbr_occlusionSampler;
+#endif
+#ifdef USE_IBL
+uniform samplerCube pbr_diffuseEnvSampler;
+uniform samplerCube pbr_specularEnvSampler;
+uniform sampler2D pbr_brdfLUT;
+#endif
+
+// Encapsulate the various inputs used by the various functions in the shading equation
+// We store values in this struct to simplify the integration of alternative implementations
+// of the shading terms, outlined in the Readme.MD Appendix.
+struct PBRInfo {
+  NdotL: f32,                  // cos angle between normal and light direction
+  NdotV: f32,                  // cos angle between normal and view direction
+  NdotH: f32,                  // cos angle between normal and half vector
+  LdotH: f32,                  // cos angle between light direction and half vector
+  VdotH: f32,                  // cos angle between view direction and half vector
+  perceptualRoughness: f32,    // roughness value, as authored by the model creator (input to shader)
+  metalness: f32,              // metallic value at the surface
+  reflectance0: vec3f,            // full reflectance color (normal incidence angle)
+  reflectance90: vec3f,           // reflectance color at grazing angle
+  alphaRoughness: f32,         // roughness mapped to a more linear change in the roughness (proposed by [2])
+  diffuseColor: vec3f,            // color contribution from diffuse lighting
+  specularColor: vec3f,           // color contribution from specular lighting
+  n: vec3f,                       // normal at surface point
+  v: vec3f,                       // vector from surface point to camera
+};
+
+const M_PI = 3.141592653589793;
+const c_MinRoughness = 0.04;
+
+fn SRGBtoLINEAR(srgbIn: vec4f ) -> vec4f
+{
+#ifdef MANUAL_SRGB
+#ifdef SRGB_FAST_APPROXIMATION
+  var linOut: vec3f = pow(srgbIn.xyz,vec3(2.2));
+#else // SRGB_FAST_APPROXIMATION
+  var bLess: vec3f = step(vec3(0.04045),srgbIn.xyz);
+  var linOut: vec3f = mix( srgbIn.xyz/vec3(12.92), pow((srgbIn.xyz+vec3(0.055))/vec3(1.055),vec3(2.4)), bLess );
+#endif //SRGB_FAST_APPROXIMATION
+  return vec4f(linOut,srgbIn.w);;
+#else //MANUAL_SRGB
+  return srgbIn;
+#endif //MANUAL_SRGB
+}
+
+// Find the normal for this fragment, pulling either from a predefined normal map
+// or from the interpolated mesh normal and tangent attributes.
+fn getNormal() -> vec3f
+{
+  // Retrieve the tangent space matrix
+#ifndef HAS_TANGENTS
+  var pos_dx: vec3f = dFdx(pbr_vPosition);
+  var pos_dy: vec3f = dFdy(pbr_vPosition);
+  var tex_dx: vec3f = dFdx(vec3(pbr_vUV, 0.0));
+  var tex_dy: vec3f = dFdy(vec3(pbr_vUV, 0.0));
+  var t: vec3f = (tex_dy.t * pos_dx - tex_dx.t * pos_dy) / (tex_dx.s * tex_dy.t - tex_dy.s * tex_dx.t);
+
+#ifdef HAS_NORMALS
+  var ng: vec3f = normalize(pbr_vNormal);
+#else
+  var ng: vec3f = cross(pos_dx, pos_dy);
+#endif
+
+  t = normalize(t - ng * dot(ng, t));
+  var b: vec3f = normalize(cross(ng, t));
+  var tbn: mat3f = mat3f(t, b, ng);
+#else // HAS_TANGENTS
+  var tbn: mat3f = pbr_vTBN;
+#endif
+
+#ifdef HAS_NORMALMAP
+  vec3 n = texture(pbr_normalSampler, pbr_vUV).rgb;
+  n = normalize(tbn * ((2.0 * n - 1.0) * vec3(pbrMaterial.normalScale, pbrMaterial.normalScale, 1.0)));
+#else
+  // The tbn matrix is linearly interpolated, so we need to re-normalize
+  vec3 n = normalize(tbn[2].xyz);
+#endif
+
+  return n;
+}
+
+// Calculation of the lighting contribution from an optional Image Based Light source.
+// Precomputed Environment Maps are required uniform inputs and are computed as outlined in [1].
+// See our README.md on Environment Maps [3] for additional discussion.
+#ifdef USE_IBL
+fn getIBLContribution(PBRInfo pbrInfo, vec3 n, vec3 reflection) -> vec3f
+{
+  float mipCount = 9.0; // resolution of 512x512
+  float lod = (pbrInfo.perceptualRoughness * mipCount);
+  // retrieve a scale and bias to F0. See [1], Figure 3
+  vec3 brdf = SRGBtoLINEAR(texture(pbr_brdfLUT,
+    vec2(pbrInfo.NdotV, 1.0 - pbrInfo.perceptualRoughness))).rgb;
+  vec3 diffuseLight = SRGBtoLINEAR(texture(pbr_diffuseEnvSampler, n)).rgb;
+
+#ifdef USE_TEX_LOD
+  vec3 specularLight = SRGBtoLINEAR(texture(pbr_specularEnvSampler, reflection, lod)).rgb;
+#else
+  vec3 specularLight = SRGBtoLINEAR(texture(pbr_specularEnvSampler, reflection)).rgb;
+#endif
+
+  vec3 diffuse = diffuseLight * pbrInfo.diffuseColor;
+  vec3 specular = specularLight * (pbrInfo.specularColor * brdf.x + brdf.y);
+
+  // For presentation, this allows us to disable IBL terms
+  diffuse *= pbrMaterial.scaleIBLAmbient.x;
+  specular *= pbrMaterial.scaleIBLAmbient.y;
+
+  return diffuse + specular;
+}
+#endif
+
+// Basic Lambertian diffuse
+// Implementation from Lambert's Photometria https://archive.org/details/lambertsphotome00lambgoog
+// See also [1], Equation 1
+fn diffuse(pbrInfo: PBRInfo) -> vec3<f32> {
+  return pbrInfo.diffuseColor / PI;
+}
+
+// The following equation models the Fresnel reflectance term of the spec equation (aka F())
+// Implementation of fresnel from [4], Equation 15
+fn specularReflection(pbrInfo: PBRInfo) -> vec3<f32> {
+  return pbrInfo.reflectance0 +
+    (pbrInfo.reflectance90 - pbrInfo.reflectance0) *
+    pow(clamp(1.0 - pbrInfo.VdotH, 0.0, 1.0), 5.0);
+}
+
+// This calculates the specular geometric attenuation (aka G()),
+// where rougher material will reflect less light back to the viewer.
+// This implementation is based on [1] Equation 4, and we adopt their modifications to
+// alphaRoughness as input as originally proposed in [2].
+fn geometricOcclusion(pbrInfo: PBRInfo) -> f32 {
+  let NdotL: f32 = pbrInfo.NdotL;
+  let NdotV: f32 = pbrInfo.NdotV;
+  let r: f32 = pbrInfo.alphaRoughness;
+
+  let attenuationL = 2.0 * NdotL / (NdotL + sqrt(r * r + (1.0 - r * r) * (NdotL * NdotL)));
+  let attenuationV = 2.0 * NdotV / (NdotV + sqrt(r * r + (1.0 - r * r) * (NdotV * NdotV)));
+  return attenuationL * attenuationV;
+}
+
+// The following equation(s) model the distribution of microfacet normals across
+// the area being drawn (aka D())
+// Implementation from "Average Irregularity Representation of a Roughened Surface
+// for Ray Reflection" by T. S. Trowbridge, and K. P. Reitz
+// Follows the distribution function recommended in the SIGGRAPH 2013 course notes
+// from EPIC Games [1], Equation 3.
+fn microfacetDistribution(pbrInfo: PBRInfo) -> f32 {
+  let roughnessSq = pbrInfo.alphaRoughness * pbrInfo.alphaRoughness;
+  let f = (pbrInfo.NdotH * roughnessSq - pbrInfo.NdotH) * pbrInfo.NdotH + 1.0;
+  return roughnessSq / (PI * f * f);
+}
+
+fn PBRInfo_setAmbientLight(pbrInfo: ptr<function, PBRInfo>) {
+  (*pbrInfo).NdotL = 1.0;
+  (*pbrInfo).NdotH = 0.0;
+  (*pbrInfo).LdotH = 0.0;
+  (*pbrInfo).VdotH = 1.0;
+}
+
+fn PBRInfo_setDirectionalLight(pbrInfo: ptr<function, PBRInfo>, lightDirection: vec3<f32>) {
+  let n = (*pbrInfo).n;
+  let v = (*pbrInfo).v;
+  let l = normalize(lightDirection);             // Vector from surface point to light
+  let h = normalize(l + v);                      // Half vector between both l and v
+
+  (*pbrInfo).NdotL = clamp(dot(n, l), 0.001, 1.0);
+  (*pbrInfo).NdotH = clamp(dot(n, h), 0.0, 1.0);
+  (*pbrInfo).LdotH = clamp(dot(l, h), 0.0, 1.0);
+  (*pbrInfo).VdotH = clamp(dot(v, h), 0.0, 1.0);
+}
+
+fn PBRInfo_setPointLight(pbrInfo: ptr<function, PBRInfo>, pointLight: PointLight) {
+  let light_direction = normalize(pointLight.position - pbr_vPosition);
+  PBRInfo_setDirectionalLight(pbrInfo, light_direction);
+}
+
+fn calculateFinalColor(pbrInfo: PBRInfo, lightColor: vec3<f32>) -> vec3<f32> {
+  // Calculate the shading terms for the microfacet specular shading model
+  let F = specularReflection(pbrInfo);
+  let G = geometricOcclusion(pbrInfo);
+  let D = microfacetDistribution(pbrInfo);
+
+  // Calculation of analytical lighting contribution
+  let diffuseContrib = (1.0 - F) * diffuse(pbrInfo);
+  let specContrib = F * G * D / (4.0 * pbrInfo.NdotL * pbrInfo.NdotV);
+  // Obtain final intensity as reflectance (BRDF) scaled by the energy of the light (cosine law)
+  return pbrInfo.NdotL * lightColor * (diffuseContrib + specContrib);
+}
+
+fn pbr_filterColor(colorUnused: vec4<f32>) -> vec4<f32> {
+  // The albedo may be defined from a base texture or a flat color
+  var baseColor: vec4<f32>;
+  #ifdef HAS_BASECOLORMAP
+  baseColor = SRGBtoLINEAR(textureSample(pbr_baseColorSampler, pbr_baseColorSampler, pbr_vUV)) * pbrMaterial.baseColorFactor;
+  #else
+  baseColor = pbrMaterial.baseColorFactor;
+  #endif
+
+  #ifdef ALPHA_CUTOFF
+  if (baseColor.a < pbrMaterial.alphaCutoff) {
+    discard;
+  }
+  #endif
+
+  var color = vec3<f32>(0.0, 0.0, 0.0);
+
+  if (pbrMaterial.unlit) {
+    color = baseColor.rgb;
+  } else {
+    // Metallic and Roughness material properties are packed together
+    // In glTF, these factors can be specified by fixed scalar values
+    // or from a metallic-roughness map
+    var perceptualRoughness = pbrMaterial.metallicRoughnessValues.y;
+    var metallic = pbrMaterial.metallicRoughnessValues.x;
+    #ifdef HAS_METALROUGHNESSMAP
+    // Roughness is stored in the 'g' channel, metallic is stored in the 'b' channel.
+    // This layout intentionally reserves the 'r' channel for (optional) occlusion map data
+    let mrSample = textureSample(pbr_metallicRoughnessSampler, pbr_metallicRoughnessSampler, pbr_vUV);
+    perceptualRoughness = mrSample.g * perceptualRoughness;
+    metallic = mrSample.b * metallic;
+    #endif
+    perceptualRoughness = clamp(perceptualRoughness, c_MinRoughness, 1.0);
+    metallic = clamp(metallic, 0.0, 1.0);
+    // Roughness is authored as perceptual roughness; as is convention,
+    // convert to material roughness by squaring the perceptual roughness [2].
+    let alphaRoughness = perceptualRoughness * perceptualRoughness;
+
+    let f0 = vec3<f32>(0.04);
+    var diffuseColor = baseColor.rgb * (vec3<f32>(1.0) - f0);
+    diffuseColor *= 1.0 - metallic;
+    let specularColor = mix(f0, baseColor.rgb, metallic);
+
+    // Compute reflectance.
+    let reflectance = max(max(specularColor.r, specularColor.g), specularColor.b);
+
+    // For typical incident reflectance range (between 4% to 100%) set the grazing
+    // reflectance to 100% for typical fresnel effect.
+    // For very low reflectance range on highly diffuse objects (below 4%),
+    // incrementally reduce grazing reflectance to 0%.
+    let reflectance90 = clamp(reflectance * 25.0, 0.0, 1.0);
+    let specularEnvironmentR0 = specularColor;
+    let specularEnvironmentR90 = vec3<f32>(1.0, 1.0, 1.0) * reflectance90;
+
+    let n = getNormal();                          // normal at surface point
+    let v = normalize(pbrProjection.camera - pbr_vPosition);  // Vector from surface point to camera
+
+    let NdotV = clamp(abs(dot(n, v)), 0.001, 1.0);
+    let reflection = -normalize(reflect(v, n));
+
+    var pbrInfo = PBRInfo(
+      0.0, // NdotL
+      NdotV,
+      0.0, // NdotH
+      0.0, // LdotH
+      0.0, // VdotH
+      perceptualRoughness,
+      metallic,
+      specularEnvironmentR0,
+      specularEnvironmentR90,
+      alphaRoughness,
+      diffuseColor,
+      specularColor,
+      n,
+      v
+    );
+
+    #ifdef USE_LIGHTS
+    // Apply ambient light
+    PBRInfo_setAmbientLight(&pbrInfo);
+    color += calculateFinalColor(pbrInfo, lighting.ambientColor);
+
+    // Apply directional light
+    for (var i = 0; i < lighting.directionalLightCount; i++) {
+      if (i < lighting.directionalLightCount) {
+        PBRInfo_setDirectionalLight(&pbrInfo, lighting_getDirectionalLight(i).direction);
+        color += calculateFinalColor(pbrInfo, lighting_getDirectionalLight(i).color);
+      }
+    }
+
+    // Apply point light
+    for (var i = 0; i < lighting.pointLightCount; i++) {
+      if (i < lighting.pointLightCount) {
+        PBRInfo_setPointLight(&pbrInfo, lighting_getPointLight(i));
+        let attenuation = getPointLightAttenuation(lighting_getPointLight(i), distance(lighting_getPointLight(i).position, pbr_vPosition));
+        color += calculateFinalColor(pbrInfo, lighting_getPointLight(i).color / attenuation);
+      }
+    }
+    #endif
+
+    // Calculate lighting contribution from image based lighting source (IBL)
+    #ifdef USE_IBL
+    if (pbrMaterial.IBLenabled) {
+      color += getIBLContribution(pbrInfo, n, reflection);
+    }
+    #endif
+
+    // Apply optional PBR terms for additional (optional) shading
+    #ifdef HAS_OCCLUSIONMAP
+    if (pbrMaterial.occlusionMapEnabled) {
+      let ao = textureSample(pbr_occlusionSampler, pbr_occlusionSampler, pbr_vUV).r;
+      color = mix(color, color * ao, pbrMaterial.occlusionStrength);
+    }
+    #endif
+
+    #ifdef HAS_EMISSIVEMAP
+    if (pbrMaterial.emissiveMapEnabled) {
+      let emissive = SRGBtoLINEAR(textureSample(pbr_emissiveSampler, pbr_emissiveSampler, pbr_vUV)).rgb * pbrMaterial.emissiveFactor;
+      color += emissive;
+    }
+    #endif
+
+    // This section uses mix to override final color for reference app visualization
+    // of various parameters in the lighting equation.
+    #ifdef PBR_DEBUG
+    // TODO: Figure out how to debug multiple lights
+
+    // color = mix(color, F, pbr_scaleFGDSpec.x);
+    // color = mix(color, vec3(G), pbr_scaleFGDSpec.y);
+    // color = mix(color, vec3(D), pbr_scaleFGDSpec.z);
+    // color = mix(color, specContrib, pbr_scaleFGDSpec.w);
+
+    // color = mix(color, diffuseContrib, pbr_scaleDiffBaseMR.x);
+    color = mix(color, baseColor.rgb, pbrMaterial.scaleDiffBaseMR.y);
+    color = mix(color, vec3<f32>(metallic), pbrMaterial.scaleDiffBaseMR.z);
+    color = mix(color, vec3<f32>(perceptualRoughness), pbrMaterial.scaleDiffBaseMR.w);
+    #endif
+  }
+
+  return vec4<f32>(pow(color, vec3<f32>(1.0 / 2.2)), baseColor.a);
+}
+`;

package/src/modules/lighting/pbr-material/pbr-material.ts

@@ -17,8 +17,8 @@ import type {
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
 import {lighting} from '../lights/lighting';
 
-import {vs} from './pbr-vertex-glsl';
-import {fs} from './pbr-fragment-glsl';
+import {vs, fs} from './pbr-material-glsl';
+import {source} from './pbr-material-wgsl';
 import {pbrProjection} from './pbr-projection';
 
 /** Non-uniform block bindings for pbr module */
@@ -80,20 +80,20 @@ export const pbrMaterial = {
 
   name: 'pbrMaterial',
   dependencies: [lighting, pbrProjection],
+  source,
   vs,
   fs,
 
   defines: {
-    LIGHTING_FRAGMENT: 1
-    // TODO defining these as 0 breaks shader
-    // HAS_NORMALMAP: 0
-    // HAS_EMISSIVEMAP: 0,
-    // HAS_OCCLUSIONMAP: 0,
-    // HAS_BASECOLORMAP: 0,
-    // HAS_METALROUGHNESSMAP: 0,
-    // ALPHA_CUTOFF: 0
-    // USE_IBL: 0
-    // PBR_DEBUG: 0
+    LIGHTING_FRAGMENT: true,
+    HAS_NORMALMAP: false,
+    HAS_EMISSIVEMAP: false,
+    HAS_OCCLUSIONMAP: false,
+    HAS_BASECOLORMAP: false,
+    HAS_METALROUGHNESSMAP: false,
+    ALPHA_CUTOFF: false,
+    USE_IBL: false,
+    PBR_DEBUG: false
   },
   getUniforms: props => props,
   uniformTypes: {

package/src/modules/lighting/pbr-material/pbr-projection.ts

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-/* eslint-disable camelcase */
-
 import type {NumberArray3, NumberArray16} from '@math.gl/core';
 
 import {ShaderModule} from '../../../lib/shader-module/shader-module';

package/src/modules/lighting/phong-material/phong-material.ts

@@ -25,7 +25,7 @@ export const phongMaterial: ShaderModule<PhongMaterialProps> = {
   vs: PHONG_VS,
   fs: PHONG_FS,
   defines: {
-    LIGHTING_FRAGMENT: 1
+    LIGHTING_FRAGMENT: true
   },
   uniformTypes: {
     ambient: 'f32',

package/src/modules/lighting/phong-material/phong-shaders-glsl.ts

@@ -12,6 +12,8 @@ uniform phongMaterialUniforms {
 `;
 
 export const PHONG_FS = /* glsl */ `\
+#define MAX_LIGHTS 1
+
 uniform phongMaterialUniforms {
   uniform float ambient;
   uniform float diffuse;

package/src/modules/math/random/random.ts

@@ -4,6 +4,13 @@
 
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
 
+const source = /* wgsl */ `\
+fn random(scale: vec3f, seed: float) -> f32 {
+  /* use the fragment position for a different seed per-pixel */
+  return fract(sin(dot(gl_FragCoord.xyz + seed, scale)) * 43758.5453 + seed);
+}
+`;
+
 const fs = /* glsl */ `\
 float random(vec3 scale, float seed) {
   /* use the fragment position for a different seed per-pixel */
@@ -14,5 +21,6 @@ float random(vec3 scale, float seed) {
 /** Quick random generator for fragment shaders */
 export const random = {
   name: 'random',
+  source,
   fs
 } as const satisfies ShaderModule<{}, {}>;

package/dist/modules/lighting/lights/lighting-uniforms-glsl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"lighting-uniforms-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-uniforms-glsl.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,g3DA2EhC,CAAC"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"lighting-uniforms-glsl.js","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-uniforms-glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2E9C,CAAC"}

package/dist/modules/lighting/lights/lighting-uniforms-wgsl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"lighting-uniforms-wgsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-uniforms-wgsl.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,gjDAoDhC,CAAC"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"lighting-uniforms-wgsl.js","sourceRoot":"","sources":["../../../../src/modules/lighting/lights/lighting-uniforms-wgsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoD9C,CAAC"}

package/dist/modules/lighting/pbr-material/pbr-fragment-glsl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pbr-fragment-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-fragment-glsl.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,EAAE,wwcAkZd,CAAC"}

package/dist/modules/lighting/pbr-material/pbr-fragment-glsl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pbr-fragment-glsl.js","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-fragment-glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,eAAe;AACf,yEAAyE;AAEzE,0FAA0F;AAC1F,yDAAyD;AAEzD,gDAAgD;AAEhD,MAAM,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkZ5B,CAAC"}

package/dist/modules/lighting/pbr-material/pbr-uniforms-glsl.d.ts

@@ -1,2 +0,0 @@
-export declare const pbrMaterialUniforms = "uniform Projection {\n  // Projection\n  vec3 u_Camera;\n};\n\nuniform pbrMaterialUniforms {\n  // Material is unlit\n  bool unlit;\n\n  // Base color map\n  bool baseColorMapEnabled;\n  vec4 baseColorFactor;\n\n  bool normalMapEnabled;  \n  float normalScale; // #ifdef HAS_NORMALMAP\n\n  bool emissiveMapEnabled;\n  vec3 emissiveFactor; // #ifdef HAS_EMISSIVEMAP\n\n  vec2 metallicRoughnessValues;\n  bool metallicRoughnessMapEnabled;\n\n  bool occlusionMapEnabled;\n  float occlusionStrength; // #ifdef HAS_OCCLUSIONMAP\n  \n  bool alphaCutoffEnabled;\n  float alphaCutoff; // #ifdef ALPHA_CUTOFF\n  \n  // IBL\n  bool IBLenabled;\n  vec2 scaleIBLAmbient; // #ifdef USE_IBL\n  \n  // debugging flags used for shader output of intermediate PBR variables\n  // #ifdef PBR_DEBUG\n  vec4 scaleDiffBaseMR;\n  vec4 scaleFGDSpec;\n  // #endif\n};\n\n// Samplers\n#ifdef HAS_BASECOLORMAP\nuniform sampler2D u_BaseColorSampler;\n#endif\n#ifdef HAS_NORMALMAP\nuniform sampler2D u_NormalSampler;\n#endif\n#ifdef HAS_EMISSIVEMAP\nuniform sampler2D u_EmissiveSampler;\n#endif\n#ifdef HAS_METALROUGHNESSMAP\nuniform sampler2D u_MetallicRoughnessSampler;\n#endif\n#ifdef HAS_OCCLUSIONMAP\nuniform sampler2D u_OcclusionSampler;\n#endif\n#ifdef USE_IBL\nuniform samplerCube u_DiffuseEnvSampler;\nuniform samplerCube u_SpecularEnvSampler;\nuniform sampler2D u_brdfLUT;\n#endif\n\n";
-//# sourceMappingURL=pbr-uniforms-glsl.d.ts.map

package/dist/modules/lighting/pbr-material/pbr-uniforms-glsl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pbr-uniforms-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-uniforms-glsl.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB,01CA8D/B,CAAC"}

package/dist/modules/lighting/pbr-material/pbr-uniforms-glsl.js

@@ -1,67 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-export const pbrMaterialUniforms = /* glsl */ `\
-uniform Projection {
-  // Projection
-  vec3 u_Camera;
-};
-
-uniform pbrMaterialUniforms {
-  // Material is unlit
-  bool unlit;
-
-  // Base color map
-  bool baseColorMapEnabled;
-  vec4 baseColorFactor;
-
-  bool normalMapEnabled;  
-  float normalScale; // #ifdef HAS_NORMALMAP
-
-  bool emissiveMapEnabled;
-  vec3 emissiveFactor; // #ifdef HAS_EMISSIVEMAP
-
-  vec2 metallicRoughnessValues;
-  bool metallicRoughnessMapEnabled;
-
-  bool occlusionMapEnabled;
-  float occlusionStrength; // #ifdef HAS_OCCLUSIONMAP
-  
-  bool alphaCutoffEnabled;
-  float alphaCutoff; // #ifdef ALPHA_CUTOFF
-  
-  // IBL
-  bool IBLenabled;
-  vec2 scaleIBLAmbient; // #ifdef USE_IBL
-  
-  // debugging flags used for shader output of intermediate PBR variables
-  // #ifdef PBR_DEBUG
-  vec4 scaleDiffBaseMR;
-  vec4 scaleFGDSpec;
-  // #endif
-};
-
-// Samplers
-#ifdef HAS_BASECOLORMAP
-uniform sampler2D u_BaseColorSampler;
-#endif
-#ifdef HAS_NORMALMAP
-uniform sampler2D u_NormalSampler;
-#endif
-#ifdef HAS_EMISSIVEMAP
-uniform sampler2D u_EmissiveSampler;
-#endif
-#ifdef HAS_METALROUGHNESSMAP
-uniform sampler2D u_MetallicRoughnessSampler;
-#endif
-#ifdef HAS_OCCLUSIONMAP
-uniform sampler2D u_OcclusionSampler;
-#endif
-#ifdef USE_IBL
-uniform samplerCube u_DiffuseEnvSampler;
-uniform samplerCube u_SpecularEnvSampler;
-uniform sampler2D u_brdfLUT;
-#endif
-
-`;
-//# sourceMappingURL=pbr-uniforms-glsl.js.map

package/dist/modules/lighting/pbr-material/pbr-uniforms-glsl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pbr-uniforms-glsl.js","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-uniforms-glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8D7C,CAAC"}