@luma.gl/shadertools 9.0.21 → 9.0.24

package/dist/index.d.ts

@@ -33,6 +33,8 @@ export type { GouraudMaterialProps } from "./modules/lighting/gouraud-material/g
 export { gouraudMaterial } from "./modules/lighting/gouraud-material/gouraud-material.js";
 export type { PhongMaterialProps } from "./modules/lighting/phong-material/phong-material.js";
 export { phongMaterial } from "./modules/lighting/phong-material/phong-material.js";
+export type { PBRMaterialBindings, PBRMaterialProps, PBRMaterialUniforms } from "./modules/lighting/pbr-material/pbr-material.js";
+export type { PBRProjectionProps } from "./modules/lighting/pbr-material/pbr-projection.js";
 export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
 export type { BrightnessContrastProps } from "./modules/postprocessing/image-adjust-filters/brightnesscontrast.js";
 export { brightnessContrast } from "./modules/postprocessing/image-adjust-filters/brightnesscontrast.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -35,7 +35,6 @@ export { lighting } from "./modules/lighting/lights/lighting-uniforms.js";
 export { dirlight } from "./modules/lighting/no-material/dirlight.js";
 export { gouraudMaterial } from "./modules/lighting/gouraud-material/gouraud-material.js";
 export { phongMaterial } from "./modules/lighting/phong-material/phong-material.js";
-// export type {PBRMaterialSettings, PBRMaterialUniforms} from './modules/lighting/pbr-material/pbr';
 export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
 export { brightnessContrast } from "./modules/postprocessing/image-adjust-filters/brightnesscontrast.js";
 export { denoise } from "./modules/postprocessing/image-adjust-filters/denoise.js";

package/dist/modules/lighting/gouraud-material/gouraud-material.js

@@ -30,6 +30,6 @@ export const gouraudMaterial = {
         if (uniforms.specularColor) {
             uniforms.specularColor = uniforms.specularColor.map(x => x / 255);
         }
-        return { ...gouraudMaterial.defaultUniforms, ...props };
+        return { ...gouraudMaterial.defaultUniforms, ...uniforms };
     }
 };

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

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

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

@@ -9,10 +9,7 @@
 import { glsl } from "../../../lib/glsl-utils/highlight.js";
 export const fs = `\
 precision highp float;
-uniform Projection {
-uniform vec3 u_Camera;
-};
-uniform pbrMaterial {
+uniform pbrMaterialUniforms {
 bool unlit;
 bool baseColorMapEnabled;
 vec4 baseColorFactor;
@@ -30,34 +27,34 @@ bool IBLenabled;
 vec2 scaleIBLAmbient;
 vec4 scaleDiffBaseMR;
 vec4 scaleFGDSpec;
-} u_pbrMaterial;
+} pbrMaterial;
 #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
-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
 struct PBRInfo {
@@ -112,8 +109,8 @@ mat3 tbn = mat3(t, b, ng);
 mat3 tbn = pbr_vTBN;
 #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
 vec3 n = normalize(tbn[2].xyz);
 #endif
@@ -124,18 +121,18 @@ vec3 getIBLContribution(PBRInfo pbrInfo, vec3 n, vec3 reflection)
 {
 float mipCount = 9.0;
 float lod = (pbrInfo.perceptualRoughness * mipCount);
-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);
-diffuse *= u_pbrMaterial.scaleIBLAmbient.x;
-specular *= u_pbrMaterial.scaleIBLAmbient.y;
+diffuse *= pbrMaterial.scaleIBLAmbient.x;
+specular *= pbrMaterial.scaleIBLAmbient.y;
 return diffuse + specular;
 }
 #endif
@@ -195,24 +192,24 @@ return pbrInfo.NdotL * lightColor * (diffuseContrib + specContrib);
 vec4 pbr_filterColor(vec4 colorUnused)
 {
 #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{
-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
-vec4 mrSample = texture2D(u_MetallicRoughnessSampler, pbr_vUV);
+vec4 mrSample = texture(pbr_metallicRoughnessSampler, pbr_vUV);
 perceptualRoughness = mrSample.g * perceptualRoughness;
 metallic = mrSample.b * metallic;
 #endif
@@ -228,7 +225,7 @@ float reflectance90 = clamp(reflectance * 25.0, 0.0, 1.0);
 vec3 specularEnvironmentR0 = specularColor.rgb;
 vec3 specularEnvironmentR90 = vec3(1.0, 1.0, 1.0) * reflectance90;
 vec3 n = getNormal();
-vec3 v = normalize(u_Camera - pbr_vPosition);
+vec3 v = normalize(pbrProjection.camera - pbr_vPosition);
 float NdotV = clamp(abs(dot(n, v)), 0.001, 1.0);
 vec3 reflection = -normalize(reflect(v, n));
 PBRInfo pbrInfo = PBRInfo(
@@ -249,42 +246,42 @@ v
 );
 #ifdef USE_LIGHTS
 PBRInfo_setAmbientLight(pbrInfo);
-color += calculateFinalColor(pbrInfo, lighting_uAmbientLight.color);
-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);
+color += calculateFinalColor(pbrInfo, lighting.ambientColor);
+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);
 }
 }
-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
 #ifdef USE_IBL
-if (u_pbrMateral.IBLEnabled) {
+if (pbrMaterial.IBLenabled) {
 color += getIBLContribution(pbrInfo, n, reflection);
 }
 #endif
 #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
 #ifdef PBR_DEBUG
-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, baseColor.rgb, pbrMaterial.scaleDiffBaseMR.y);
+color = mix(color, vec3(metallic), pbrMaterial.scaleDiffBaseMR.z);
+color = mix(color, vec3(perceptualRoughness), pbrMaterial.scaleDiffBaseMR.w);
 #endif
 }
 return vec4(pow(color,vec3(1.0/2.2)), baseColor.a);

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

@@ -2,35 +2,16 @@ import type { Texture } from '@luma.gl/core';
 import type { Vector2, Vector3, Vector4 } from '@math.gl/core';
 import type { NumberArray2, NumberArray3, NumberArray4 } from "../../../lib/utils/uniform-types.js";
 import { ShaderModule } from "../../../lib/shader-module/shader-module.js";
-export type PBRMaterialProps = PBRMaterialBindings & {
-    unlit: boolean;
-    baseColorMapEnabled: boolean;
-    baseColorFactor: Readonly<Vector4 | NumberArray4>;
-    normalMapEnabled: boolean;
-    normalScale: number;
-    emissiveMapEnabled: boolean;
-    emissiveFactor: Readonly<Vector3 | NumberArray3>;
-    metallicRoughnessValues: Readonly<Vector2 | NumberArray2>;
-    metallicRoughnessMapEnabled: boolean;
-    occlusionMapEnabled: boolean;
-    occlusionStrength: number;
-    alphaCutoffEnabled: boolean;
-    alphaCutoff: number;
-    IBLenabled: boolean;
-    scaleIBLAmbient: Readonly<Vector2 | NumberArray2>;
-    scaleDiffBaseMR: Readonly<Vector4 | NumberArray4>;
-    scaleFGDSpec: Readonly<Vector4 | NumberArray4>;
-};
 /** Non-uniform block bindings for pbr module */
-type PBRMaterialBindings = {
-    baseColorSampler?: Texture | null;
-    normalSampler?: Texture | null;
-    emissiveSampler?: Texture | null;
-    metallicRoughnessSampler?: Texture | null;
-    occlusionSampler?: Texture | null;
-    diffuseEnvSampler: Texture | null;
-    specularEnvSampler: Texture | null;
-    brdfLUT?: Texture | null;
+export type PBRMaterialBindings = {
+    pbr_baseColorSampler?: Texture | null;
+    pbr_normalSampler?: Texture | null;
+    pbr_emissiveSampler?: Texture | null;
+    pbr_metallicRoughnessSampler?: Texture | null;
+    pbr_occlusionSampler?: Texture | null;
+    pbr_diffuseEnvSampler?: Texture | null;
+    pbr_specularEnvSampler?: Texture | null;
+    pbr_BrdfLUT?: Texture | null;
 };
 export type PBRMaterialUniforms = {
     unlit: boolean;
@@ -51,10 +32,10 @@ export type PBRMaterialUniforms = {
     scaleDiffBaseMR: Readonly<Vector4 | NumberArray4>;
     scaleFGDSpec: Readonly<Vector4 | NumberArray4>;
 };
+export type PBRMaterialProps = PBRMaterialBindings & PBRMaterialUniforms;
 /**
  * An implementation of PBR (Physically-Based Rendering).
  * Physically Based Shading of a microfacet surface defined by a glTF material.
  */
 export declare const pbrMaterial: ShaderModule<PBRMaterialProps, PBRMaterialUniforms>;
-export {};
 //# sourceMappingURL=pbr-material.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pbr-material.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-material.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAC,4CAAyC;AAE/F,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAMtE,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG;IACnD,KAAK,EAAE,OAAO,CAAC;IAGf,mBAAmB,EAAE,OAAO,CAAC;IAC7B,eAAe,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAElD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IAEpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAEjD,uBAAuB,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAC1D,2BAA2B,EAAE,OAAO,CAAC;IAErC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAE1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IAGpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAIlD,eAAe,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAClD,YAAY,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;CAChD,CAAC;AAEF,gDAAgD;AAChD,KAAK,mBAAmB,GAAG;IAEzB,gBAAgB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAClC,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACjC,wBAAwB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1C,gBAAgB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAGlC,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAC;IAClC,kBAAkB,EAAE,OAAO,GAAG,IAAI,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,OAAO,CAAC;IAGf,mBAAmB,EAAE,OAAO,CAAC;IAC7B,eAAe,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAElD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IAEpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAEjD,uBAAuB,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAC1D,2BAA2B,EAAE,OAAO,CAAC;IAErC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAE1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IAGpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAIlD,eAAe,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAClD,YAAY,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;CAChD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,gBAAgB,EAAE,mBAAmB,CAgD3E,CAAC"}
+{"version":3,"file":"pbr-material.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-material.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAC,4CAAyC;AAE/F,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAOtE,gDAAgD;AAChD,MAAM,MAAM,mBAAmB,GAAG;IAEhC,oBAAoB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACtC,iBAAiB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACnC,mBAAmB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACrC,4BAA4B,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9C,oBAAoB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAGtC,qBAAqB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACvC,sBAAsB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACxC,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,OAAO,CAAC;IAGf,mBAAmB,EAAE,OAAO,CAAC;IAC7B,eAAe,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAElD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IAEpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAEjD,uBAAuB,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAC1D,2BAA2B,EAAE,OAAO,CAAC;IAErC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAE1B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IAGpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAIlD,eAAe,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;IAClD,YAAY,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AAEzE;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,gBAAgB,EAAE,mBAAmB,CAkD3E,CAAC"}

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

@@ -4,25 +4,28 @@
 import { lighting } from "../lights/lighting-uniforms.js";
 import { vs } from "./pbr-vertex-glsl.js";
 import { fs } from "./pbr-fragment-glsl.js";
+import { pbrProjection } from "./pbr-projection.js";
 /**
  * An implementation of PBR (Physically-Based Rendering).
  * Physically Based Shading of a microfacet surface defined by a glTF material.
  */
 export const pbrMaterial = {
-    name: 'pbr',
+    name: 'pbrMaterial',
     vs,
     fs,
     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',
@@ -47,5 +50,5 @@ export const pbrMaterial = {
         scaleDiffBaseMR: 'vec4<f32>',
         scaleFGDSpec: 'vec4<f32>'
     },
-    dependencies: [lighting]
+    dependencies: [lighting, pbrProjection]
 };

package/dist/modules/lighting/pbr-material/pbr-projection.d.ts

@@ -0,0 +1,10 @@
+import type { NumberArray3, NumberArray16 } from "../../../lib/utils/uniform-types.js";
+import { ShaderModule } from "../../../lib/shader-module/shader-module.js";
+export type PBRProjectionProps = {
+    modelViewProjectionMatrix: NumberArray16;
+    modelMatrix: NumberArray16;
+    normalMatrix: NumberArray16;
+    camera: NumberArray3;
+};
+export declare const pbrProjection: ShaderModule<PBRProjectionProps>;
+//# sourceMappingURL=pbr-projection.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"pbr-projection.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/pbr-material/pbr-projection.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,4CAAyC;AAElF,OAAO,EAAC,YAAY,EAAC,oDAAiD;AAatE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yBAAyB,EAAE,aAAa,CAAC;IACzC,WAAW,EAAE,aAAa,CAAC;IAC3B,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,kBAAkB,CAY1D,CAAC"}

package/dist/modules/lighting/pbr-material/pbr-projection.js

@@ -0,0 +1,25 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { glsl } from "../../../lib/glsl-utils/highlight.js";
+const uniformBlock = `\
+uniform pbrProjectionUniforms {
+mat4 modelViewProjectionMatrix;
+mat4 modelMatrix;
+mat4 normalMatrix;
+vec3 camera;
+} pbrProjection;
+`;
+export const 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>'
+    }
+};

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

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

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

@@ -3,33 +3,27 @@
 // Copyright (c) vis.gl contributors
 import { glsl } from "../../../lib/glsl-utils/highlight.js";
 export const vs = `\
-uniform projection {
-mat4 u_MVPMatrix;
-mat4 u_ModelMatrix;
-mat4 u_NormalMatrix;
-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
-pbr_vNormal = normalize(vec3(u_ModelMatrix * vec4(normal.xyz, 0.0)));
+pbr_vNormal = normalize(vec3(pbrProjection.modelMatrix * vec4(normal.xyz, 0.0)));
 #endif
 #endif
 #ifdef HAS_UV

package/dist/modules/lighting/phong-material/phong-material.js

@@ -30,6 +30,6 @@ export const phongMaterial = {
         if (uniforms.specularColor) {
             uniforms.specularColor = uniforms.specularColor.map(x => x / 255);
         }
-        return { ...phongMaterial.defaultUniforms, ...props };
+        return { ...phongMaterial.defaultUniforms, ...uniforms };
     }
 };

package/dist/modules/lighting/phong-material/phong-shaders-glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"phong-shaders-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-shaders-glsl.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,QAAQ,QAOpB,CAAC;AAEF,eAAO,MAAM,QAAQ,QA+CpB,CAAC"}
+{"version":3,"file":"phong-shaders-glsl.d.ts","sourceRoot":"","sources":["../../../../src/modules/lighting/phong-material/phong-shaders-glsl.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,QAAQ,QAOpB,CAAC;AAEF,eAAO,MAAM,QAAQ,QA8CpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/shadertools",
-  "version": "9.0.21",
+  "version": "9.0.24",
   "description": "Shader module system for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -53,5 +53,5 @@
     "@math.gl/types": "^4.0.0",
     "wgsl_reflect": "^1.0.1"
   },
-  "gitHead": "9d7d29778581c2408fc3f37723f6868983d0dab2"
+  "gitHead": "7fa4bc29cb5b4eb1997ac33a37139d2186c0a7f0"
 }

package/src/index.ts

@@ -75,7 +75,13 @@ export type {GouraudMaterialProps} from './modules/lighting/gouraud-material/gou
 export {gouraudMaterial} from './modules/lighting/gouraud-material/gouraud-material';
 export type {PhongMaterialProps} from './modules/lighting/phong-material/phong-material';
 export {phongMaterial} from './modules/lighting/phong-material/phong-material';
-// export type {PBRMaterialSettings, PBRMaterialUniforms} from './modules/lighting/pbr-material/pbr';
+export type {
+  PBRMaterialBindings,
+  PBRMaterialProps,
+  PBRMaterialUniforms
+} from './modules/lighting/pbr-material/pbr-material';
+export type {PBRProjectionProps} from './modules/lighting/pbr-material/pbr-projection';
+
 export {pbrMaterial} from './modules/lighting/pbr-material/pbr-material';
 
 // POST PROCESSING / SHADER PASS MODULES

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

@@ -42,6 +42,6 @@ export const gouraudMaterial: ShaderModule<GouraudMaterialProps> = {
     if (uniforms.specularColor) {
       uniforms.specularColor = uniforms.specularColor.map(x => x / 255) as NumberArray3;
     }
-    return {...gouraudMaterial.defaultUniforms, ...props};
+    return {...gouraudMaterial.defaultUniforms, ...uniforms};
   }
 };