@luma.gl/shadertools 9.1.0-alpha.16 → 9.1.0-alpha.18

package/dist/dist.dev.js

@@ -347,6 +347,20 @@ ${inject[key]}` : inject[key];
       instance.propValidators = makePropValidators(propTypes);
     }
     module.instance = instance;
+    let defaultProps = {};
+    if (propTypes) {
+      defaultProps = Object.entries(propTypes).reduce(
+        (obj, [key, propType]) => {
+          const value = propType?.value;
+          if (value) {
+            obj[key] = value;
+          }
+          return obj;
+        },
+        {}
+      );
+    }
+    module.defaultUniforms = { ...module.defaultUniforms, ...defaultProps };
   }
   function getShaderModuleUniforms(module, props, oldUniforms) {
     initializeShaderModule(module);
@@ -356,13 +370,13 @@ ${inject[key]}` : inject[key];
     }
     return getValidatedProperties(props, module.instance?.propValidators, module.name);
   }
-  function checkShaderModuleDeprecations(shaderModule, shaderSource, log2) {
+  function checkShaderModuleDeprecations(shaderModule, shaderSource, log3) {
     shaderModule.deprecations?.forEach((def) => {
       if (def.regex?.test(shaderSource)) {
         if (def.deprecated) {
-          log2.deprecated(def.old, def.new)();
+          log3.deprecated(def.old, def.new)();
         } else {
-          log2.removed(def.old, def.new)();
+          log3.removed(def.old, def.new)();
         }
       }
     });
@@ -655,7 +669,7 @@ ${DECLARATION_INJECT_MARKER}
       // defines = {},
       hookFunctions = [],
       inject = {},
-      log: log2
+      log: log3
     } = options;
     assert(typeof source2 === "string", "shader source must be a string");
     const coreSource = source2;
@@ -685,8 +699,8 @@ ${DECLARATION_INJECT_MARKER}
     }
     const modulesToInject = modules;
     for (const module of modulesToInject) {
-      if (log2) {
-        checkShaderModuleDeprecations(module, coreSource, log2);
+      if (log3) {
+        checkShaderModuleDeprecations(module, coreSource, log3);
       }
       const moduleSource = getShaderModuleSource(module, "wgsl");
       assembledSource += moduleSource;
@@ -722,7 +736,7 @@ ${DECLARATION_INJECT_MARKER}
       hookFunctions = [],
       inject = {},
       prologue = true,
-      log: log2
+      log: log3
     } = options;
     assert(typeof source2 === "string", "shader source must be a string");
     const sourceVersion = language === "glsl" ? getShaderInfo(source2).version : -1;
@@ -781,8 +795,8 @@ ${getApplicationDefines(allDefines)}
       }
     }
     for (const module of modules) {
-      if (log2) {
-        checkShaderModuleDeprecations(module, coreSource, log2);
+      if (log3) {
+        checkShaderModuleDeprecations(module, coreSource, log3);
       }
       const moduleSource = getShaderModuleSource(module, stage);
       assembledSource += moduleSource;
@@ -6661,7 +6675,7 @@ float tan_fp32(float a) {
   };
 
   // src/modules/engine/picking/picking.ts
-  var DEFAULT_HIGHLIGHT_COLOR = new Float32Array([0, 1, 1, 1]);
+  var DEFAULT_HIGHLIGHT_COLOR = [0, 1, 1, 1];
   var vs = (
     /* glsl */
     `uniform pickingUniforms {
@@ -6814,7 +6828,7 @@ vec4 picking_filterColor(vec4 color) {
       isAttribute: false,
       isHighlightActive: false,
       useFloatColors: true,
-      highlightedObjectColor: new Float32Array([0, 0, 0]),
+      highlightedObjectColor: [0, 0, 0],
       highlightColor: DEFAULT_HIGHLIGHT_COLOR
     },
     vs,
@@ -6848,6 +6862,9 @@ vec4 picking_filterColor(vec4 color) {
     return uniforms;
   }
 
+  // src/modules/lighting/lights/lighting.ts
+  var import_core3 = __toESM(require_core(), 1);
+
   // src/modules/lighting/lights/lighting-uniforms-glsl.ts
   var lightingUniformsGLSL = (
     /* glsl */
@@ -6871,28 +6888,51 @@ struct DirectionalLight {
 
 uniform lightingUniforms {
   int enabled;
-  int pointLightCount;
+  int lightType;
+
   int directionalLightCount;
+  int pointLightCount;
 
   vec3 ambientColor;
 
-  int lightType;
-  vec3 lightColor;
-  vec3 lightDirection;
-  vec3 lightPosition;
-  vec3 lightAttenuation;
+  vec3 lightColor0;
+  vec3 lightPosition0;
+  vec3 lightDirection0;
+  vec3 lightAttenuation0;
 
-  // AmbientLight ambientLight;
-  // PointLight pointLight[MAX_LIGHTS];
-  // DirectionalLight directionalLight[MAX_LIGHTS];
+  vec3 lightColor1;
+  vec3 lightPosition1;
+  vec3 lightDirection1;
+  vec3 lightAttenuation1;
+
+  vec3 lightColor2;
+  vec3 lightPosition2;
+  vec3 lightDirection2;
+  vec3 lightAttenuation2;
 } lighting;
 
 PointLight lighting_getPointLight(int index) {
-  return PointLight(lighting.lightColor, lighting.lightPosition, lighting.lightAttenuation);
+  switch (index) {
+    case 0:
+      return PointLight(lighting.lightColor0, lighting.lightPosition0, lighting.lightAttenuation0);
+    case 1:
+      return PointLight(lighting.lightColor1, lighting.lightPosition1, lighting.lightAttenuation1);
+    case 2:
+    default:  
+      return PointLight(lighting.lightColor2, lighting.lightPosition2, lighting.lightAttenuation2);
+  }
 }
 
 DirectionalLight lighting_getDirectionalLight(int index) {
-  return DirectionalLight(lighting.lightColor, lighting.lightDirection);
+  switch (index) {
+    case 0:
+      return DirectionalLight(lighting.lightColor0, lighting.lightDirection0);
+    case 1:
+      return DirectionalLight(lighting.lightColor1, lighting.lightDirection1);
+    case 2:
+    default:   
+      return DirectionalLight(lighting.lightColor2, lighting.lightDirection2);
+  }
 } 
 
 float getPointLightAttenuation(PointLight pointLight, float distance) {
@@ -6963,7 +7003,7 @@ fn getPointLightAttenuation(pointLight: PointLight, distance: f32) -> f32 {
   );
 
   // src/modules/lighting/lights/lighting.ts
-  var MAX_LIGHTS = 5;
+  var MAX_LIGHTS = 3;
   var COLOR_FACTOR = 255;
   var lighting = {
     props: {},
@@ -6974,31 +7014,44 @@ fn getPointLightAttenuation(pointLight: PointLight, distance: f32) -> f32 {
     },
     uniformTypes: {
       enabled: "i32",
-      ambientLightColor: "vec3<f32>",
-      numberOfLights: "i32",
-      // , array: MAX_LIGHTS,
       lightType: "i32",
-      // , array: MAX_LIGHTS,
-      lightColor: "vec3<f32>",
-      // , array: MAX_LIGHTS,
-      lightPosition: "vec3<f32>",
-      // , array: MAX_LIGHTS,
+      directionalLightCount: "i32",
+      pointLightCount: "i32",
+      ambientLightColor: "vec3<f32>",
+      // TODO define as arrays once we have appropriate uniformTypes
+      lightColor0: "vec3<f32>",
+      lightPosition0: "vec3<f32>",
       // TODO - could combine direction and attenuation
-      lightDirection: "vec3<f32>",
-      // , array: MAX_LIGHTS,
-      lightAttenuation: "vec3<f32>"
-      // , array: MAX_LIGHTS},
+      lightDirection0: "vec3<f32>",
+      lightAttenuation0: "vec3<f32>",
+      lightColor1: "vec3<f32>",
+      lightPosition1: "vec3<f32>",
+      lightDirection1: "vec3<f32>",
+      lightAttenuation1: "vec3<f32>",
+      lightColor2: "vec3<f32>",
+      lightPosition2: "vec3<f32>",
+      lightDirection2: "vec3<f32>",
+      lightAttenuation2: "vec3<f32>"
     },
     defaultUniforms: {
       enabled: 1,
-      ambientLightColor: [0.1, 0.1, 0.1],
-      numberOfLights: 0,
       lightType: 0 /* POINT */,
-      lightColor: [1, 1, 1],
-      lightPosition: [1, 1, 2],
+      directionalLightCount: 0,
+      pointLightCount: 0,
+      ambientLightColor: [0.1, 0.1, 0.1],
+      lightColor0: [1, 1, 1],
+      lightPosition0: [1, 1, 2],
       // TODO - could combine direction and attenuation
-      lightDirection: [1, 1, 1],
-      lightAttenuation: [1, 1, 1]
+      lightDirection0: [1, 1, 1],
+      lightAttenuation0: [1, 0, 0],
+      lightColor1: [1, 1, 1],
+      lightPosition1: [1, 1, 2],
+      lightDirection1: [1, 1, 1],
+      lightAttenuation1: [1, 0, 0],
+      lightColor2: [1, 1, 1],
+      lightPosition2: [1, 1, 2],
+      lightDirection2: [1, 1, 1],
+      lightAttenuation2: [1, 0, 0]
     },
     source: lightingUniformsWGSL,
     vs: lightingUniformsGLSL,
@@ -7033,30 +7086,29 @@ fn getPointLightAttenuation(pointLight: PointLight, distance: f32) -> f32 {
     pointLights = [],
     directionalLights = []
   }) {
-    const lightSourceUniforms = {
-      // lightType: new Array(MAX_LIGHTS).fill(0),
-      // lightColor: new Array(MAX_LIGHTS).fill([0, 0, 0]),
-      // lightPosition: new Array(MAX_LIGHTS).fill([0, 0, 0]),
-      // lightDirection: new Array(MAX_LIGHTS).fill([0, 0, 0]),
-      // lightAttenuation: new Array(MAX_LIGHTS).fill([0, 0, 0])
-    };
+    const lightSourceUniforms = {};
     lightSourceUniforms.ambientLightColor = convertColor(ambientLight);
     let currentLight = 0;
     for (const pointLight of pointLights) {
       lightSourceUniforms.lightType = 0 /* POINT */;
-      lightSourceUniforms.lightColor = convertColor(pointLight);
-      lightSourceUniforms.lightPosition = pointLight.position;
-      lightSourceUniforms.lightAttenuation = [pointLight.attenuation || 1, 0, 0];
+      const i = currentLight;
+      lightSourceUniforms[`lightColor${i}`] = convertColor(pointLight);
+      lightSourceUniforms[`lightPosition${i}`] = pointLight.position;
+      lightSourceUniforms[`lightAttenuation${i}`] = pointLight.attenuation || [1, 0, 0];
       currentLight++;
     }
     for (const directionalLight of directionalLights) {
       lightSourceUniforms.lightType = 1 /* DIRECTIONAL */;
-      lightSourceUniforms.lightColor = convertColor(directionalLight);
-      lightSourceUniforms.lightPosition = directionalLight.position;
-      lightSourceUniforms.lightDirection = directionalLight.direction;
+      const i = currentLight;
+      lightSourceUniforms[`lightColor${i}`] = convertColor(directionalLight);
+      lightSourceUniforms[`lightDirection${i}`] = directionalLight.direction;
       currentLight++;
     }
-    lightSourceUniforms.numberOfLights = currentLight;
+    if (currentLight > MAX_LIGHTS) {
+      import_core3.log.warn("MAX_LIGHTS exceeded")();
+    }
+    lightSourceUniforms.directionalLightCount = directionalLights.length;
+    lightSourceUniforms.pointLightCount = pointLights.length;
     return lightSourceUniforms;
   }
   function extractLightTypes(lights2) {
@@ -7155,7 +7207,7 @@ vec4 dirlight_filterColor(vec4 color) {
       lightDirection: "vec3<f32>"
     },
     defaultUniforms: {
-      lightDirection: new Float32Array([1, 1, 2])
+      lightDirection: [1, 1, 2]
     },
     getUniforms: getUniforms3
   };
@@ -7167,10 +7219,10 @@ vec4 dirlight_filterColor(vec4 color) {
     return uniforms;
   }
 
-  // src/modules/lighting/gouraud-material/gouraud-shaders-glsl.ts
-  var GOURAUD_VS = (
+  // src/modules/lighting/phong-material/phong-shaders-glsl.ts
+  var PHONG_VS = (
     /* glsl */
-    `uniform materialUniforms {
+    `uniform phongMaterialUniforms {
   uniform float ambient;
   uniform float diffuse;
   uniform float shininess;
@@ -7178,9 +7230,9 @@ vec4 dirlight_filterColor(vec4 color) {
 } material;
 `
   );
-  var GOURAUD_FS = (
+  var PHONG_FS = (
     /* glsl */
-    `uniform materialUniforms {
+    `uniform phongMaterialUniforms {
   uniform float ambient;
   uniform float diffuse;
   uniform float shininess;
@@ -7202,63 +7254,27 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_d
 vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
   vec3 lightColor = surfaceColor;
 
-  if (lighting.enabled) {
-    vec3 view_direction = normalize(cameraPosition - position_worldspace);
-    lightColor = material.ambient * surfaceColor * lighting.ambientColor;
-
-    if (lighting.lightType == 0) {
-      PointLight pointLight = lighting_getPointLight(0);
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-    } else if (lighting.lightType == 1) {
-      DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-    }
-    /*
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.pointLightCount) {
-        break;
-      }
-      PointLight pointLight = lighting.pointLight[i];
-      vec3 light_position_worldspace = pointLight.position;
-      vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-      lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-    }
-
-    for (int i = 0; i < MAX_LIGHTS; i++) {
-      if (i >= lighting.directionalLightCount) {
-        break;
-      }
-      DirectionalLight directionalLight = lighting.directionalLight[i];
-      lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-    }
-    */
+  if (lighting.enabled == 0) {
+    return lightColor;
   }
-  return lightColor;
-}
 
-vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
-  vec3 lightColor = vec3(0, 0, 0);
-  vec3 surfaceColor = vec3(0, 0, 0);
-
-  if (lighting.enabled) {
-    vec3 view_direction = normalize(cameraPosition - position_worldspace);
+  vec3 view_direction = normalize(cameraPosition - position_worldspace);
+  lightColor = material.ambient * surfaceColor * lighting.ambientColor;
 
-    switch (lighting.lightType) {
-      case 0:
-        PointLight pointLight = lighting_getPointLight(0);
-        vec3 light_position_worldspace = pointLight.position;
-        vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-        lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-        break;
+  for (int i = 0; i < lighting.pointLightCount; i++) {
+    PointLight pointLight = lighting_getPointLight(i);
+    vec3 light_position_worldspace = pointLight.position;
+    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
+    float light_attenuation = getPointLightAttenuation(pointLight, distance(light_position_worldspace, position_worldspace));
+    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color / light_attenuation);
+  }
 
-      case 1:
-        DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-        lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-        break;
-    }
+  int totalLights = min(MAX_LIGHTS, lighting.pointLightCount + lighting.directionalLightCount);
+  for (int i = lighting.pointLightCount; i < totalLights; i++) {
+    DirectionalLight directionalLight = lighting_getDirectionalLight(i);
+    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
   }
+  
   return lightColor;
 }
 `
@@ -7267,11 +7283,10 @@ vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspac
   // src/modules/lighting/gouraud-material/gouraud-material.ts
   var gouraudMaterial = {
     props: {},
-    uniforms: {},
-    name: "gouraud-lighting",
+    name: "gouraudMaterial",
     // Note these are switched between phong and gouraud
-    vs: GOURAUD_VS,
-    fs: GOURAUD_FS,
+    vs: PHONG_FS.replace("phongMaterial", "gouraudMaterial"),
+    fs: PHONG_VS.replace("phongMaterial", "gouraudMaterial"),
     defines: {
       LIGHTING_VERTEX: 1
     },
@@ -7289,7 +7304,11 @@ vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspac
       specularColor: [0.15, 0.15, 0.15]
     },
     getUniforms(props) {
-      return { ...gouraudMaterial.defaultUniforms, ...props };
+      const uniforms = { ...props };
+      if (uniforms.specularColor) {
+        uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
+      }
+      return { ...gouraudMaterial.defaultUniforms, ...uniforms };
     }
   };
 
@@ -7384,111 +7403,9 @@ fn lighting_getSpecularLightColor(cameraPosition: vec3<f32>, position_worldspace
 `
   );
 
-  // src/modules/lighting/phong-material/phong-shaders-glsl.ts
-  var PHONG_VS = (
-    /* glsl */
-    `uniform phongMaterialUniforms {
-  uniform float ambient;
-  uniform float diffuse;
-  uniform float shininess;
-  uniform vec3  specularColor;
-} material;
-`
-  );
-  var PHONG_FS = (
-    /* glsl */
-    `uniform phongMaterialUniforms {
-  uniform float ambient;
-  uniform float diffuse;
-  uniform float shininess;
-  uniform vec3  specularColor;
-} material;
-
-vec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {
-  vec3 halfway_direction = normalize(light_direction + view_direction);
-  float lambertian = dot(light_direction, normal_worldspace);
-  float specular = 0.0;
-  if (lambertian > 0.0) {
-    float specular_angle = max(dot(normal_worldspace, halfway_direction), 0.0);
-    specular = pow(specular_angle, material.shininess);
-  }
-  lambertian = max(lambertian, 0.0);
-  return (lambertian * material.diffuse * surfaceColor + specular * material.specularColor) * color;
-}
-
-vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
-  vec3 lightColor = surfaceColor;
-
-  if (lighting.enabled == 0) {
-    return lightColor;
-  }
-
-  vec3 view_direction = normalize(cameraPosition - position_worldspace);
-  lightColor = material.ambient * surfaceColor * lighting.ambientColor;
-
-  if (lighting.lightType == 0) {
-    PointLight pointLight = lighting_getPointLight(0);
-    vec3 light_position_worldspace = pointLight.position;
-    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-  } else if (lighting.lightType == 1) {
-    DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-  }
-  
-  /*
-  for (int i = 0; i < MAX_LIGHTS; i++) {
-    if (i >= lighting.pointLightCount) {
-      break;
-    }
-    PointLight pointLight = lighting.pointLight[i];
-    vec3 light_position_worldspace = pointLight.position;
-    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-  }
-
-  for (int i = 0; i < MAX_LIGHTS; i++) {
-    if (i >= lighting.directionalLightCount) {
-      break;
-    }
-    DirectionalLight directionalLight = lighting.directionalLight[i];
-    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-  }
-  */
-  return lightColor;
-}
-
-vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
-  vec3 lightColor = vec3(0, 0, 0);
-  vec3 surfaceColor = vec3(0, 0, 0);
-
-  if (lighting.enabled == 0) {
-    vec3 view_direction = normalize(cameraPosition - position_worldspace);
-
-    switch (lighting.lightType) {
-      case 0:
-        PointLight pointLight = lighting_getPointLight(0);
-        vec3 light_position_worldspace = pointLight.position;
-        vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-        lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-        break;
-
-      case 1:
-        DirectionalLight directionalLight = lighting_getDirectionalLight(0);
-        lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-        break;
-    }
-  }
-  return lightColor;
-}
-`
-  );
-
   // src/modules/lighting/phong-material/phong-material.ts
   var phongMaterial = {
-    props: {},
-    uniforms: {},
-    name: "phong-lighting",
+    name: "phongMaterial",
     dependencies: [lighting],
     // Note these are switched between phong and gouraud
     source: PHONG_WGSL,
@@ -7510,45 +7427,41 @@ vec3 lighting_getSpecularLightColor(vec3 cameraPosition, vec3 position_worldspac
       specularColor: [0.15, 0.15, 0.15]
     },
     getUniforms(props) {
-      return { ...phongMaterial.defaultUniforms, ...props };
+      const uniforms = { ...props };
+      if (uniforms.specularColor) {
+        uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
+      }
+      return { ...phongMaterial.defaultUniforms, ...uniforms };
     }
   };
 
   // src/modules/lighting/pbr-material/pbr-vertex-glsl.ts
   var vs2 = (
     /* glsl */
-    `uniform projection {
-  mat4 u_MVPMatrix;
-  mat4 u_ModelMatrix;
-  mat4 u_NormalMatrix;
-  // Projection
-  vec3 u_Camera;
-}
-
-varying vec3 pbr_vPosition;
-varying vec2 pbr_vUV;
+    `out vec3 pbr_vPosition;
+out vec2 pbr_vUV;
 
 #ifdef HAS_NORMALS
 # ifdef HAS_TANGENTS
-varying mat3 pbr_vTBN;
+out mat3 pbr_vTBN;
 # else
-varying vec3 pbr_vNormal;
+out vec3 pbr_vNormal;
 # endif
 #endif
 
 void pbr_setPositionNormalTangentUV(vec4 position, vec4 normal, vec4 tangent, vec2 uv)
 {
-  vec4 pos = u_ModelMatrix * position;
+  vec4 pos = pbrProjection.modelMatrix * position;
   pbr_vPosition = vec3(pos.xyz) / pos.w;
 
 #ifdef HAS_NORMALS
 #ifdef HAS_TANGENTS
-  vec3 normalW = normalize(vec3(u_NormalMatrix * vec4(normal.xyz, 0.0)));
-  vec3 tangentW = normalize(vec3(u_ModelMatrix * vec4(tangent.xyz, 0.0)));
+  vec3 normalW = normalize(vec3(pbrProjection.normalMatrix * vec4(normal.xyz, 0.0)));
+  vec3 tangentW = normalize(vec3(pbrProjection.modelMatrix * vec4(tangent.xyz, 0.0)));
   vec3 bitangentW = cross(normalW, tangentW) * tangent.w;
   pbr_vTBN = mat3(tangentW, bitangentW, normalW);
 #else // HAS_TANGENTS != 1
-  pbr_vNormal = normalize(vec3(u_ModelMatrix * vec4(normal.xyz, 0.0)));
+  pbr_vNormal = normalize(vec3(pbrProjection.modelMatrix * vec4(normal.xyz, 0.0)));
 #endif
 #endif
 
@@ -7566,12 +7479,7 @@ void pbr_setPositionNormalTangentUV(vec4 position, vec4 normal, vec4 tangent, ve
     /* glsl */
     `precision highp float;
 
-uniform Projection {
-  // Projection
-  uniform vec3 u_Camera;
-};
-
-uniform pbrMaterial {
+uniform pbrMaterialUniforms {
   // Material is unlit
   bool unlit;
 
@@ -7603,40 +7511,40 @@ uniform pbrMaterial {
   vec4 scaleDiffBaseMR;
   vec4 scaleFGDSpec;
   // #endif
-} u_pbrMaterial;
+} pbrMaterial;
 
 // Samplers
 #ifdef HAS_BASECOLORMAP
-uniform sampler2D u_BaseColorSampler;
+uniform sampler2D pbr_baseColorSampler;
 #endif
 #ifdef HAS_NORMALMAP
-uniform sampler2D u_NormalSampler;
+uniform sampler2D pbr_normalSampler;
 #endif
 #ifdef HAS_EMISSIVEMAP
-uniform sampler2D u_EmissiveSampler;
+uniform sampler2D pbr_emissiveSampler;
 #endif
 #ifdef HAS_METALROUGHNESSMAP
-uniform sampler2D u_MetallicRoughnessSampler;
+uniform sampler2D pbr_metallicRoughnessSampler;
 #endif
 #ifdef HAS_OCCLUSIONMAP
-uniform sampler2D u_OcclusionSampler;
+uniform sampler2D pbr_occlusionSampler;
 #endif
 #ifdef USE_IBL
-uniform samplerCube u_DiffuseEnvSampler;
-uniform samplerCube u_SpecularEnvSampler;
-uniform sampler2D u_brdfLUT;
+uniform samplerCube pbr_diffuseEnvSampler;
+uniform samplerCube pbr_specularEnvSampler;
+uniform sampler2D pbr_brdfLUT;
 #endif
 
 // Inputs from vertex shader
 
-varying vec3 pbr_vPosition;
-varying vec2 pbr_vUV;
+in vec3 pbr_vPosition;
+in vec2 pbr_vUV;
 
 #ifdef HAS_NORMALS
 #ifdef HAS_TANGENTS
-varying mat3 pbr_vTBN;
+in mat3 pbr_vTBN;
 #else
-varying vec3 pbr_vNormal;
+in vec3 pbr_vNormal;
 #endif
 #endif
 
@@ -7704,8 +7612,8 @@ vec3 getNormal()
 #endif
 
 #ifdef HAS_NORMALMAP
-  vec3 n = texture2D(u_NormalSampler, pbr_vUV).rgb;
-  n = normalize(tbn * ((2.0 * n - 1.0) * vec3(u_pbrMaterial.normalScale, u_pbrMaterial.normalScale, 1.0)));
+  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);
@@ -7723,22 +7631,22 @@ vec3 getIBLContribution(PBRInfo pbrInfo, vec3 n, vec3 reflection)
   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(texture2D(u_brdfLUT,
+  vec3 brdf = SRGBtoLINEAR(texture(pbr_brdfLUT,
     vec2(pbrInfo.NdotV, 1.0 - pbrInfo.perceptualRoughness))).rgb;
-  vec3 diffuseLight = SRGBtoLINEAR(textureCube(u_DiffuseEnvSampler, n)).rgb;
+  vec3 diffuseLight = SRGBtoLINEAR(texture(pbr_diffuseEnvSampler, n)).rgb;
 
 #ifdef USE_TEX_LOD
-  vec3 specularLight = SRGBtoLINEAR(textureCubeLod(u_SpecularEnvSampler, reflection, lod)).rgb;
+  vec3 specularLight = SRGBtoLINEAR(texture(pbr_specularEnvSampler, reflection, lod)).rgb;
 #else
-  vec3 specularLight = SRGBtoLINEAR(textureCube(u_SpecularEnvSampler, reflection)).rgb;
+  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 *= u_pbrMaterial.scaleIBLAmbient.x;
-  specular *= u_pbrMaterial.scaleIBLAmbient.y;
+  diffuse *= pbrMaterial.scaleIBLAmbient.x;
+  specular *= pbrMaterial.scaleIBLAmbient.y;
 
   return diffuse + specular;
 }
@@ -7830,32 +7738,32 @@ vec4 pbr_filterColor(vec4 colorUnused)
 {
   // The albedo may be defined from a base texture or a flat color
 #ifdef HAS_BASECOLORMAP
-  vec4 baseColor = SRGBtoLINEAR(texture2D(u_BaseColorSampler, pbr_vUV)) * u_pbrMaterial.baseColorFactor;
+  vec4 baseColor = SRGBtoLINEAR(texture(pbr_baseColorSampler, pbr_vUV)) * pbrMaterial.baseColorFactor;
 #else
-  vec4 baseColor = u_pbrMaterial.baseColorFactor;
+  vec4 baseColor = pbrMaterial.baseColorFactor;
 #endif
 
 #ifdef ALPHA_CUTOFF
-  if (baseColor.a < u_pbrMaterial.alphaCutoff) {
+  if (baseColor.a < pbrMaterial.alphaCutoff) {
     discard;
   }
 #endif
 
   vec3 color = vec3(0, 0, 0);
 
-  if(u_pbrMaterial.unlit){
+  if(pbrMaterial.unlit){
     color.rgb = 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
-    float perceptualRoughness = u_pbrMaterial.metallicRoughnessValues.y;
-    float metallic = u_pbrMaterial.metallicRoughnessValues.x;
+    float perceptualRoughness = pbrMaterial.metallicRoughnessValues.y;
+    float 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
-    vec4 mrSample = texture2D(u_MetallicRoughnessSampler, pbr_vUV);
+    vec4 mrSample = texture(pbr_metallicRoughnessSampler, pbr_vUV);
     perceptualRoughness = mrSample.g * perceptualRoughness;
     metallic = mrSample.b * metallic;
 #endif
@@ -7882,7 +7790,7 @@ vec4 pbr_filterColor(vec4 colorUnused)
     vec3 specularEnvironmentR90 = vec3(1.0, 1.0, 1.0) * reflectance90;
 
     vec3 n = getNormal();                          // normal at surface point
-    vec3 v = normalize(u_Camera - pbr_vPosition);  // Vector from surface point to camera
+    vec3 v = normalize(pbrProjection.camera - pbr_vPosition);  // Vector from surface point to camera
 
     float NdotV = clamp(abs(dot(n, v)), 0.001, 1.0);
     vec3 reflection = -normalize(reflect(v, n));
@@ -7904,47 +7812,48 @@ vec4 pbr_filterColor(vec4 colorUnused)
       v
     );
 
+
 #ifdef USE_LIGHTS
     // Apply ambient light
     PBRInfo_setAmbientLight(pbrInfo);
-    color += calculateFinalColor(pbrInfo, lighting_uAmbientLight.color);
+    color += calculateFinalColor(pbrInfo, lighting.ambientColor);
 
     // Apply directional light
-    for(int i = 0; i < lighting_uDirectionalLightCount; i++) {
-      if (i < lighting_uDirectionalLightCount) {
-        PBRInfo_setDirectionalLight(pbrInfo, lighting_uDirectionalLight[i].direction);
-        color += calculateFinalColor(pbrInfo, lighting_uDirectionalLight[i].color);
+    for(int 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(int i = 0; i < lighting_uPointLightCount; i++) {
-      if (i < lighting_uPointLightCount) {
-        PBRInfo_setPointLight(pbrInfo, lighting_uPointLight[i]);
-        float attenuation = getPointLightAttenuation(lighting_uPointLight[i], distance(lighting_uPointLight[i].position, pbr_vPosition));
-        color += calculateFinalColor(pbrInfo, lighting_uPointLight[i].color / attenuation);
+    for(int i = 0; i < lighting.pointLightCount; i++) {
+      if (i < lighting.pointLightCount) {
+        PBRInfo_setPointLight(pbrInfo, lighting_getPointLight(i));
+        float 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 (u_pbrMateral.IBLEnabled) {
+    if (pbrMaterial.IBLenabled) {
       color += getIBLContribution(pbrInfo, n, reflection);
     }
 #endif
 
-    // Apply optional PBR terms for additional (optional) shading
+ // Apply optional PBR terms for additional (optional) shading
 #ifdef HAS_OCCLUSIONMAP
-    if (u_pbrMaterial.occlusionMapEnabled) {
-      float ao = texture2D(u_OcclusionSampler, pbr_vUV).r;
-      color = mix(color, color * ao, u_pbrMaterial.occlusionStrength);
+    if (pbrMaterial.occlusionMapEnabled) {
+      float ao = texture(pbr_occlusionSampler, pbr_vUV).r;
+      color = mix(color, color * ao, pbrMaterial.occlusionStrength);
     }
 #endif
 
 #ifdef HAS_EMISSIVEMAP
-    if (u_pbrMaterial.emmissiveMapEnabled) {
-      vec3 emissive = SRGBtoLINEAR(texture2D(u_EmissiveSampler, pbr_vUV)).rgb * u_pbrMaterial.emissiveFactor;
+    if (pbrMaterial.emissiveMapEnabled) {
+      vec3 emissive = SRGBtoLINEAR(texture(pbr_emissiveSampler, pbr_vUV)).rgb * pbrMaterial.emissiveFactor;
       color += emissive;
     }
 #endif
@@ -7954,15 +7863,15 @@ vec4 pbr_filterColor(vec4 colorUnused)
 #ifdef PBR_DEBUG
     // TODO: Figure out how to debug multiple lights
 
-    // color = mix(color, F, u_ScaleFGDSpec.x);
-    // color = mix(color, vec3(G), u_ScaleFGDSpec.y);
-    // color = mix(color, vec3(D), u_ScaleFGDSpec.z);
-    // color = mix(color, specContrib, u_ScaleFGDSpec.w);
+    // 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, u_ScaleDiffBaseMR.x);
-    color = mix(color, baseColor.rgb, u_pbrMaterial.scaleDiffBaseMR.y);
-    color = mix(color, vec3(metallic), u_pbrMaterial.scaleDiffBaseMR.z);
-    color = mix(color, vec3(perceptualRoughness), u_pbrMaterial.scaleDiffBaseMR.w);
+    // color = mix(color, diffuseContrib, pbr_scaleDiffBaseMR.x);
+    color = mix(color, baseColor.rgb, pbrMaterial.scaleDiffBaseMR.y);
+    color = mix(color, vec3(metallic), pbrMaterial.scaleDiffBaseMR.z);
+    color = mix(color, vec3(perceptualRoughness), pbrMaterial.scaleDiffBaseMR.w);
 #endif
 
   }
@@ -7972,25 +7881,52 @@ vec4 pbr_filterColor(vec4 colorUnused)
 `
   );
 
+  // src/modules/lighting/pbr-material/pbr-projection.ts
+  var uniformBlock = (
+    /* glsl */
+    `uniform pbrProjectionUniforms {
+  mat4 modelViewProjectionMatrix;
+  mat4 modelMatrix;
+  mat4 normalMatrix;
+  vec3 camera;
+} pbrProjection;
+`
+  );
+  var pbrProjection = {
+    name: "pbrProjection",
+    vs: uniformBlock,
+    fs: uniformBlock,
+    // TODO why is this needed?
+    getUniforms: (props) => props,
+    uniformTypes: {
+      modelViewProjectionMatrix: "mat4x4<f32>",
+      modelMatrix: "mat4x4<f32>",
+      normalMatrix: "mat4x4<f32>",
+      camera: "vec3<i32>"
+    }
+  };
+
   // src/modules/lighting/pbr-material/pbr-material.ts
   var pbrMaterial = {
     props: {},
     uniforms: {},
-    name: "pbr",
-    dependencies: [lighting],
+    name: "pbrMaterial",
+    dependencies: [lighting, pbrProjection],
     vs: vs2,
     fs: fs3,
     defines: {
-      LIGHTING_FRAGMENT: 1,
-      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: 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
     },
+    getUniforms: (props) => props,
     uniformTypes: {
       // Material is unlit
       unlit: "i32",
@@ -8019,25 +7955,6 @@ vec4 pbr_filterColor(vec4 colorUnused)
       // #ifdef PBR_DEBUG
       scaleDiffBaseMR: "vec4<f32>",
       scaleFGDSpec: "vec4<f32>"
-    },
-    bindings: {
-      baseColorSampler: { type: "texture", location: 8 },
-      // #ifdef HAS_BASECOLORMAP
-      normalSampler: { type: "texture", location: 9 },
-      // #ifdef HAS_NORMALMAP
-      emissiveSampler: { type: "texture", location: 10 },
-      // #ifdef HAS_EMISSIVEMAP
-      metallicRoughnessSampler: { type: "texture", location: 11 },
-      // #ifdef HAS_METALROUGHNESSMAP
-      occlusionSampler: { type: "texture", location: 12 },
-      // #ifdef HAS_OCCLUSIONMAP
-      // IBL Samplers
-      diffuseEnvSampler: { type: "texture", location: 13 },
-      // #ifdef USE_IBL (samplerCube)
-      specularEnvSampler: { type: "texture", location: 14 },
-      // #ifdef USE_IBL (samplerCube)
-      brdfLUT: { type: "texture", location: 15 }
-      // #ifdef USE_IBL
     }
   };
 
@@ -8087,7 +8004,6 @@ vec4 brightnessContrast_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord)
   );
   var brightnessContrast = {
     props: {},
-    uniforms: {},
     name: "brightnessContrast",
     uniformTypes: {
       brightness: "f32",
@@ -8186,7 +8102,6 @@ vec4 hueSaturation_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
   );
   var hueSaturation = {
     props: {},
-    uniforms: {},
     name: "hueSaturation",
     fs: fs6,
     uniformTypes: {
@@ -8297,6 +8212,9 @@ vec4 vibrance_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
     props: {},
     uniforms: {},
     name: "vibrance",
+    uniformTypes: {
+      amount: "f32"
+    },
     propTypes: {
       amount: { value: 0, min: -1, max: 1 }
     },
@@ -8630,11 +8548,11 @@ vec4 dotScreen_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
     /* glsl */
     `uniform edgeWorkUniforms {
   float radius;
-  vec2 delta;
+  int mode;
 } edgeWork;
 
-vec4 edgeWork_sampleColor1(sampler2D source, vec2 texSize, vec2 texCoord) {
-  vec2 relativeDelta = edgeWork.radius * edgeWork.delta / texSize;
+vec4 edgeWork_sampleColorRGB(sampler2D source, vec2 texSize, vec2 texCoord, vec2 delta) {
+  vec2 relativeDelta = edgeWork.radius * delta / texSize;
 
   vec2 color = vec2(0.0);
   vec2 total = vec2(0.0);
@@ -8658,8 +8576,8 @@ vec4 edgeWork_sampleColor1(sampler2D source, vec2 texSize, vec2 texCoord) {
   return vec4(color / total, 0.0, 1.0);
 }
 
-vec4 edgeWork_sampleColor2(sampler2D source, vec2 texSize, vec2 texCoord) {
-  vec2 relativeDelta = edgeWork.radius * edgeWork.delta / texSize;
+vec4 edgeWork_sampleColorXY(sampler2D source, vec2 texSize, vec2 texCoord, vec2 delta) {
+  vec2 relativeDelta = edgeWork.radius * delta / texSize;
 
   vec2 color = vec2(0.0);
   vec2 total = vec2(0.0);
@@ -8682,6 +8600,16 @@ vec4 edgeWork_sampleColor2(sampler2D source, vec2 texSize, vec2 texCoord) {
   float c = clamp(10000.0 * (color.y / total.y - color.x / total.x) + 0.5, 0.0, 1.0);
   return vec4(c, c, c, 1.0);
 }
+
+vec4 edgeWork_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
+  switch (edgeWork.mode) {
+    case 0: 
+    return edgeWork_sampleColorRGB(source, texSize, texCoord, vec2(1., 0.));
+    case 1: 
+    default:
+      return edgeWork_sampleColorXY(source, texSize, texCoord, vec2(0., 1.));
+  }
+}
 `
   );
   var edgeWork = {
@@ -8690,20 +8618,22 @@ vec4 edgeWork_sampleColor2(sampler2D source, vec2 texSize, vec2 texCoord) {
     name: "edgeWork",
     dependencies: [random],
     fs: fs16,
+    uniformTypes: {
+      radius: "f32",
+      mode: "i32"
+    },
     propTypes: {
       radius: { value: 2, min: 1, softMax: 50 },
-      delta: { value: [1, 0], private: true }
+      mode: { value: 0, private: true }
     },
     passes: [
       {
-        // @ts-expect-error
-        sampler: "edgeWork_sampleColor1",
-        propTypes: { delta: [1, 0] }
+        sampler: true,
+        uniforms: { mode: 0 }
       },
       {
-        // @ts-expect-error
-        sampler: "edgeWork_sampleColor2",
-        propTypes: { delta: [0, 1] }
+        sampler: true,
+        uniforms: { mode: 1 }
       }
     ]
   };
@@ -8989,7 +8919,9 @@ vec4 swirl_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
   };
 
   // src/passes/postprocessing/fxaa/fxaa.ts
-  var fs23 = `
+  var fs23 = (
+    /* glsl */
+    `
 #define FXAA_QUALITY_PRESET 29
 
 #if (FXAA_QUALITY_PRESET == 10)
@@ -9569,7 +9501,8 @@ vec4 fxaa_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
         fxaa_QualityEdgeThresholdMin
     );
 }
-`;
+`
+  );
   var fxaa = {
     name: "fxaa",
     propTypes: {},