@luma.gl/gltf 9.1.0-alpha.9 → 9.1.0-beta.11

package/dist/pbr/parse-pbr-material.d.ts

@@ -1,5 +1,6 @@
-import type { Device, Texture, Binding, Parameters } from '@luma.gl/core';
+import type { Device, Texture, Parameters } from '@luma.gl/core';
 import { PBREnvironment } from "./pbr-environment.js";
+import { PBRMaterialBindings, PBRMaterialUniforms, PBRProjectionProps } from '@luma.gl/shadertools';
 export type ParsePBRMaterialOptions = {
     /** Debug PBR shader */
     pbrDebug?: boolean;
@@ -12,8 +13,8 @@ export type ParsePBRMaterialOptions = {
 };
 export type ParsedPBRMaterial = {
     readonly defines: Record<string, number | boolean>;
-    readonly bindings: Record<string, Binding>;
-    readonly uniforms: Record<string, any>;
+    readonly bindings: Partial<PBRMaterialBindings>;
+    readonly uniforms: Partial<PBRProjectionProps & PBRMaterialUniforms>;
     readonly parameters: Parameters;
     readonly glParameters: Record<string, any>;
     /** List of all generated textures, makes it easy to destroy them later */

package/dist/pbr/parse-pbr-material.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-pbr-material.d.ts","sourceRoot":"","sources":["../../src/pbr/parse-pbr-material.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAExE,OAAO,EAAC,cAAc,EAAC,6BAA0B;AAIjD,MAAM,MAAM,uBAAuB,GAAG;IACpC,uBAAuB;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,oBAAoB;IACpB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,mBAAmB;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,iEAAiE;IACjE,6BAA6B,CAAC,EAAE,cAAc,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;IACnD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACvC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3C,0EAA0E;IAC1E,QAAQ,CAAC,iBAAiB,EAAE,OAAO,EAAE,CAAC;CACvC,CAAC;AAgBF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,QAAQ,KAAA,EACR,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC/B,OAAO,EAAE,uBAAuB,GAC/B,iBAAiB,CAmDnB"}
+{"version":3,"file":"parse-pbr-material.d.ts","sourceRoot":"","sources":["../../src/pbr/parse-pbr-material.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAE/D,OAAO,EAAC,cAAc,EAAC,6BAA0B;AACjD,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAIlG,MAAM,MAAM,uBAAuB,GAAG;IACpC,uBAAuB;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,oBAAoB;IACpB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,mBAAmB;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,iEAAiE;IACjE,6BAA6B,CAAC,EAAE,cAAc,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;IACnD,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,CAAC;IACrE,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3C,0EAA0E;IAC1E,QAAQ,CAAC,iBAAiB,EAAE,OAAO,EAAE,CAAC;CACvC,CAAC;AAiBF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,QAAQ,KAAA,EACR,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC/B,OAAO,EAAE,uBAAuB,GAC/B,iBAAiB,CAmDnB"}

package/dist/pbr/parse-pbr-material.js

@@ -2,6 +2,7 @@ import { log } from '@luma.gl/core';
 // NOTE: Modules other than `@luma.gl/webgl` should not import `GL` from
 // `@luma.gl/constants`. Locally we use `GLEnum` instead of `GL` to avoid
 // conflicts with the `babel-plugin-inline-webgl-constants` plugin.
+// eslint-disable-next-line no-shadow
 var GLEnum;
 (function (GLEnum) {
     GLEnum[GLEnum["FUNC_ADD"] = 32774] = "FUNC_ADD";
@@ -26,8 +27,8 @@ export function parsePBRMaterial(device, material, attributes, options) {
         bindings: {},
         uniforms: {
             // TODO: find better values?
-            u_Camera: [0, 0, 0], // Model should override
-            u_MetallicRoughnessValues: [1, 1] // Default is 1 and 1
+            camera: [0, 0, 0], // Model should override
+            metallicRoughnessValues: [1, 1] // Default is 1 and 1
         },
         parameters: {},
         glParameters: {},
@@ -37,18 +38,18 @@ export function parsePBRMaterial(device, material, attributes, options) {
     parsedMaterial.defines.USE_TEX_LOD = 1;
     const { imageBasedLightingEnvironment } = options;
     if (imageBasedLightingEnvironment) {
-        parsedMaterial.bindings.u_DiffuseEnvSampler =
+        parsedMaterial.bindings.pbr_diffuseEnvSampler =
             imageBasedLightingEnvironment.diffuseEnvSampler.texture;
-        parsedMaterial.bindings.u_SpecularEnvSampler =
+        parsedMaterial.bindings.pbr_specularEnvSampler =
             imageBasedLightingEnvironment.specularEnvSampler.texture;
-        parsedMaterial.bindings.u_brdfLUT = imageBasedLightingEnvironment.brdfLutTexture.texture;
-        parsedMaterial.uniforms.u_ScaleIBLAmbient = [1, 1];
+        parsedMaterial.bindings.pbr_BrdfLUT = imageBasedLightingEnvironment.brdfLutTexture.texture;
+        parsedMaterial.uniforms.scaleIBLAmbient = [1, 1];
     }
     if (options?.pbrDebug) {
         parsedMaterial.defines.PBR_DEBUG = 1;
         // Override final color for reference app visualization of various parameters in the lighting equation.
-        parsedMaterial.uniforms.u_ScaleDiffBaseMR = [0, 0, 0, 0];
-        parsedMaterial.uniforms.u_ScaleFGDSpec = [0, 0, 0, 0];
+        parsedMaterial.uniforms.scaleDiffBaseMR = [0, 0, 0, 0];
+        parsedMaterial.uniforms.scaleFGDSpec = [0, 0, 0, 0];
     }
     if (attributes.NORMAL)
         parsedMaterial.defines.HAS_NORMALS = 1;
@@ -67,29 +68,29 @@ export function parsePBRMaterial(device, material, attributes, options) {
 }
 /** Parse GLTF material record */
 function parseMaterial(device, material, parsedMaterial) {
-    parsedMaterial.uniforms.pbr_uUnlit = Boolean(material.unlit);
+    parsedMaterial.uniforms.unlit = Boolean(material.unlit);
     if (material.pbrMetallicRoughness) {
         parsePbrMetallicRoughness(device, material.pbrMetallicRoughness, parsedMaterial);
     }
     if (material.normalTexture) {
-        addTexture(device, material.normalTexture, 'u_NormalSampler', 'HAS_NORMALMAP', parsedMaterial);
+        addTexture(device, material.normalTexture, 'pbr_normalSampler', 'HAS_NORMALMAP', parsedMaterial);
         const { scale = 1 } = material.normalTexture;
-        parsedMaterial.uniforms.u_NormalScale = scale;
+        parsedMaterial.uniforms.normalScale = scale;
     }
     if (material.occlusionTexture) {
-        addTexture(device, material.occlusionTexture, 'u_OcclusionSampler', 'HAS_OCCLUSIONMAP', parsedMaterial);
+        addTexture(device, material.occlusionTexture, 'pbr_occlusionSampler', 'HAS_OCCLUSIONMAP', parsedMaterial);
         const { strength = 1 } = material.occlusionTexture;
-        parsedMaterial.uniforms.u_OcclusionStrength = strength;
+        parsedMaterial.uniforms.occlusionStrength = strength;
     }
     if (material.emissiveTexture) {
-        addTexture(device, material.emissiveTexture, 'u_EmissiveSampler', 'HAS_EMISSIVEMAP', parsedMaterial);
-        parsedMaterial.uniforms.u_EmissiveFactor = material.emissiveFactor || [0, 0, 0];
+        addTexture(device, material.emissiveTexture, 'pbr_emissiveSampler', 'HAS_EMISSIVEMAP', parsedMaterial);
+        parsedMaterial.uniforms.emissiveFactor = material.emissiveFactor || [0, 0, 0];
     }
     switch (material.alphaMode) {
         case 'MASK':
             const { alphaCutoff = 0.5 } = material;
             parsedMaterial.defines.ALPHA_CUTOFF = 1;
-            parsedMaterial.uniforms.u_AlphaCutoff = alphaCutoff;
+            parsedMaterial.uniforms.alphaCutoff = alphaCutoff;
             break;
         case 'BLEND':
             log.warn('glTF BLEND alphaMode might not work well because it requires mesh sorting')();
@@ -115,14 +116,14 @@ function parseMaterial(device, material, parsedMaterial) {
 /** Parse GLTF material sub record */
 function parsePbrMetallicRoughness(device, pbrMetallicRoughness, parsedMaterial) {
     if (pbrMetallicRoughness.baseColorTexture) {
-        addTexture(device, pbrMetallicRoughness.baseColorTexture, 'u_BaseColorSampler', 'HAS_BASECOLORMAP', parsedMaterial);
+        addTexture(device, pbrMetallicRoughness.baseColorTexture, 'pbr_baseColorSampler', 'HAS_BASECOLORMAP', parsedMaterial);
     }
-    parsedMaterial.uniforms.u_BaseColorFactor = pbrMetallicRoughness.baseColorFactor || [1, 1, 1, 1];
+    parsedMaterial.uniforms.baseColorFactor = pbrMetallicRoughness.baseColorFactor || [1, 1, 1, 1];
     if (pbrMetallicRoughness.metallicRoughnessTexture) {
-        addTexture(device, pbrMetallicRoughness.metallicRoughnessTexture, 'u_MetallicRoughnessSampler', 'HAS_METALROUGHNESSMAP', parsedMaterial);
+        addTexture(device, pbrMetallicRoughness.metallicRoughnessTexture, 'pbr_metallicRoughnessSampler', 'HAS_METALROUGHNESSMAP', parsedMaterial);
     }
     const { metallicFactor = 1, roughnessFactor = 1 } = pbrMetallicRoughness;
-    parsedMaterial.uniforms.u_MetallicRoughnessValues = [metallicFactor, roughnessFactor];
+    parsedMaterial.uniforms.metallicRoughnessValues = [metallicFactor, roughnessFactor];
 }
 /** Create a texture from a glTF texture/sampler/image combo and add it to bindings */
 function addTexture(device, gltfTexture, uniformName, define = null, parsedMaterial) {
@@ -188,9 +189,9 @@ export class PBRMaterialParser {
 
     this.uniforms = {
       // TODO: find better values?
-      u_Camera: [0, 0, 0], // Model should override
+      camera: [0, 0, 0], // Model should override
 
-      u_MetallicRoughnessValues: [1, 1] // Default is 1 and 1
+      metallicRoughnessValues: [1, 1] // Default is 1 and 1
     };
 
     this.bindings = {};
@@ -199,17 +200,17 @@ export class PBRMaterialParser {
     this.generatedTextures = [];
 
     if (imageBasedLightingEnvironment) {
-      this.bindings.u_DiffuseEnvSampler = imageBasedLightingEnvironment.getDiffuseEnvSampler();
-      this.bindings.u_SpecularEnvSampler = imageBasedLightingEnvironment.getSpecularEnvSampler();
-      this.bindings.u_brdfLUT = imageBasedLightingEnvironment.getBrdfTexture();
-      this.uniforms.u_ScaleIBLAmbient = [1, 1];
+      this.bindings.pbr_diffuseEnvSampler = imageBasedLightingEnvironment.getDiffuseEnvSampler();
+      this.bindings.pbr_specularEnvSampler = imageBasedLightingEnvironment.getSpecularEnvSampler();
+      this.bindings.pbr_BrdfLUT = imageBasedLightingEnvironment.getBrdfTexture();
+      this.uniforms.scaleIBLAmbient = [1, 1];
     }
 
     if (pbrDebug) {
       // Override final color for reference app visualization
       // of various parameters in the lighting equation.
-      this.uniforms.u_ScaleDiffBaseMR = [0, 0, 0, 0];
-      this.uniforms.u_ScaleFGDSpec = [0, 0, 0, 0];
+      this.uniforms.scaleDiffBaseMR = [0, 0, 0, 0];
+      this.uniforms.scaleFGDSpec = [0, 0, 0, 0];
     }
 
     this.defineIfPresent(attributes.NORMAL, 'HAS_NORMALS');
@@ -241,31 +242,31 @@ export class PBRMaterialParser {
 
   /** Parse GLTF material record *
   parseMaterial(material) {
-    this.uniforms.pbr_uUnlit = Boolean(material.unlit);
+    this.uniforms.unlit = Boolean(material.unlit);
 
     if (material.pbrMetallicRoughness) {
       this.parsePbrMetallicRoughness(material.pbrMetallicRoughness);
     }
     if (material.normalTexture) {
-      this.addTexture(material.normalTexture, 'u_NormalSampler', 'HAS_NORMALMAP');
+      this.addTexture(material.normalTexture, 'pbr_normalSampler', 'HAS_NORMALMAP');
 
       const {scale = 1} = material.normalTexture;
-      this.uniforms.u_NormalScale = scale;
+      this.uniforms.normalScale = scale;
     }
     if (material.occlusionTexture) {
-      this.addTexture(material.occlusionTexture, 'u_OcclusionSampler', 'HAS_OCCLUSIONMAP');
+      this.addTexture(material.occlusionTexture, 'pbr_occlusionSampler', 'HAS_OCCLUSIONMAP');
 
       const {strength = 1} = material.occlusionTexture;
-      this.uniforms.u_OcclusionStrength = strength;
+      this.uniforms.occlusionStrength = strength;
     }
     if (material.emissiveTexture) {
-      this.addTexture(material.emissiveTexture, 'u_EmissiveSampler', 'HAS_EMISSIVEMAP');
-      this.uniforms.u_EmissiveFactor = material.emissiveFactor || [0, 0, 0];
+      this.addTexture(material.emissiveTexture, 'pbr_emissiveSampler', 'HAS_EMISSIVEMAP');
+      this.uniforms.emissiveFactor = material.emissiveFactor || [0, 0, 0];
     }
     if (material.alphaMode === 'MASK') {
       const {alphaCutoff = 0.5} = material;
       this.defines.ALPHA_CUTOFF = 1;
-      this.uniforms.u_AlphaCutoff = alphaCutoff;
+      this.uniforms.alphaCutoff = alphaCutoff;
     } else if (material.alphaMode === 'BLEND') {
       log.warn('BLEND alphaMode might not work well because it requires mesh sorting')();
       Object.assign(this.parameters, {
@@ -281,21 +282,21 @@ export class PBRMaterialParser {
     if (pbrMetallicRoughness.baseColorTexture) {
       this.addTexture(
         pbrMetallicRoughness.baseColorTexture,
-        'u_BaseColorSampler',
+        'pbr_baseColorSampler',
         'HAS_BASECOLORMAP'
       );
     }
-    this.uniforms.u_BaseColorFactor = pbrMetallicRoughness.baseColorFactor || [1, 1, 1, 1];
+    this.uniforms.baseColorFactor = pbrMetallicRoughness.baseColorFactor || [1, 1, 1, 1];
 
     if (pbrMetallicRoughness.metallicRoughnessTexture) {
       this.addTexture(
         pbrMetallicRoughness.metallicRoughnessTexture,
-        'u_MetallicRoughnessSampler',
+        'pbr_metallicRoughnessSampler',
         'HAS_METALROUGHNESSMAP'
       );
     }
     const {metallicFactor = 1, roughnessFactor = 1} = pbrMetallicRoughness;
-    this.uniforms.u_MetallicRoughnessValues = [metallicFactor, roughnessFactor];
+    this.uniforms.metallicRoughnessValues = [metallicFactor, roughnessFactor];
   }
 
   /** Create a texture from a glTF texture/sampler/image combo and add it to bindings *
@@ -332,3 +333,4 @@ export class PBRMaterialParser {
   }
 }
 */
+//# sourceMappingURL=parse-pbr-material.js.map

package/dist/pbr/parse-pbr-material.js.map

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

package/dist/pbr/pbr-environment.js

@@ -62,3 +62,4 @@ function makeCube(device, { id, getTextureForFace, sampler }) {
         data
     });
 }
+//# sourceMappingURL=pbr-environment.js.map

package/dist/pbr/pbr-environment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pbr-environment.js","sourceRoot":"","sources":["../../src/pbr/pbr-environment.ts"],"names":[],"mappings":"AAAA,uBAAuB;AAGvB,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAgBtD,yCAAyC;AACzC,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,KAA0B;IAC3E,MAAM,cAAc,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE;QAC9C,EAAE,EAAE,SAAS;QACb,OAAO,EAAE;YACP,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;SACJ;QACjB,2EAA2E;QAC3E,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC;KACzC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,EAAE;QACzC,EAAE,EAAE,mBAAmB;QACvB,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9E,OAAO,EAAE;YACP,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;SACJ;KAClB,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,QAAQ,CAAC,MAAM,EAAE;QAC1C,EAAE,EAAE,oBAAoB;QACxB,iBAAiB,EAAE,CAAC,GAAW,EAAE,EAAE;YACjC,MAAM,UAAU,GAAG,EAAE,CAAC;YACtB,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,KAAK,CAAC,iBAAiB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;gBAC5D,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;YAC3E,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,OAAO,EAAE;YACP,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,QAAQ,EAAE,oDAAoD;YACzE,SAAS,EAAE,QAAQ;SACJ;KAClB,CAAC,CAAC;IAEH,OAAO;QACL,cAAc;QACd,iBAAiB;QACjB,kBAAkB;KACnB,CAAC;AACJ,CAAC;AAED,4BAA4B;AAC5B,MAAM,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjC,SAAS,QAAQ,CACf,MAAc,EACd,EACE,EAAE,EACF,iBAAiB,EACjB,OAAO,EAKR;IAED,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,YAAY,CAAC,MAAM,EAAE;QAC9B,EAAE;QACF,SAAS,EAAE,MAAM;QACjB,OAAO,EAAE,KAAK;QACd,OAAO;QACP,mBAAmB;QACnB,IAAI;KACL,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/gltf",
-  "version": "9.1.0-alpha.9",
+  "version": "9.1.0-beta.11",
   "description": "glTF support for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -40,14 +40,14 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.0.0-beta",
-    "@luma.gl/engine": "^9.0.0-beta"
+    "@luma.gl/core": "^9.1.0-beta.1",
+    "@luma.gl/engine": "^9.1.0-beta.1",
+    "@luma.gl/shadertools": "^9.1.0-beta.1"
   },
   "dependencies": {
     "@loaders.gl/core": "^4.2.0",
     "@loaders.gl/textures": "^4.2.0",
-    "@luma.gl/shadertools": "9.1.0-alpha.9",
-    "@math.gl/core": "^4.0.0"
+    "@math.gl/core": "^4.1.0"
   },
-  "gitHead": "ff05b21269181dbb782ba7c8c1546900288ee6a1"
+  "gitHead": "aab3748ab83360e6ee611f9b4a2d805e5f17fb01"
 }

package/src/gltf/create-gltf-model.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {Device, RenderPipelineParameters, log} from '@luma.gl/core';
-import {pbr} from '@luma.gl/shadertools';
+import {pbrMaterial, ShaderModule} from '@luma.gl/shadertools';
 import {Geometry, Model, ModelNode, ModelProps} from '@luma.gl/engine';
 import {ParsePBRMaterialOptions, parsePBRMaterial} from '../pbr/parse-pbr-material';
 
@@ -94,7 +94,7 @@ const vs = /* glsl */ `\
     #endif
 
     pbr_setPositionNormalTangentUV(positions, _NORMAL, _TANGENT, _TEXCOORD_0);
-    gl_Position = u_MVPMatrix * positions;
+    gl_Position = pbrProjection.modelViewProjectionMatrix * positions;
   }
 `;
 
@@ -145,15 +145,22 @@ export function createGLTFModel(device: Device, options: CreateGLTFModelOptions)
     geometry,
     topology: geometry.topology,
     vertexCount,
-    modules: [pbr],
+    modules: [pbrMaterial as unknown as ShaderModule],
     ...modelOptions,
 
-    bindings: {...parsedMaterial.bindings, ...modelOptions.bindings},
     defines: {...parsedMaterial.defines, ...modelOptions.defines},
-    parameters: {...parameters, ...parsedMaterial.parameters, ...modelOptions.parameters},
-    uniforms: {...parsedMaterial.uniforms, ...modelOptions.uniforms}
+    parameters: {...parameters, ...parsedMaterial.parameters, ...modelOptions.parameters}
   };
 
   const model = new Model(device, modelProps);
+
+  const {camera, ...pbrMaterialProps} = {
+    ...parsedMaterial.uniforms,
+    ...modelOptions.uniforms,
+    ...parsedMaterial.bindings,
+    ...modelOptions.bindings
+  };
+
+  model.shaderInputs.setProps({pbrMaterial: pbrMaterialProps, pbrProjection: {camera}});
   return new ModelNode({managedResources, model});
 }

package/src/gltf/gl-utils.ts

@@ -7,6 +7,7 @@ import {PrimitiveTopology} from '@luma.gl/core';
 // NOTE: Modules other than `@luma.gl/webgl` should not import `GL` from
 // `@luma.gl/constants`. Locally we use `GLEnum` instead of `GL` to avoid
 // conflicts with the `babel-plugin-inline-webgl-constants` plugin.
+// eslint-disable-next-line no-shadow
 export enum GLEnum {
   POINTS = 0x0,
   LINES = 0x1,

package/src/gltf/gltf-instantiator.ts

@@ -42,8 +42,8 @@ export class GLTFInstantiator {
   }
 
   instantiate(gltf: any): GroupNode[] {
-    this.gltf = gltf;
-    const scenes = (gltf.scenes || []).map(scene => this.createScene(scene));
+    this.gltf = deepCopy(gltf);
+    const scenes = (this.gltf.scenes || []).map(scene => this.createScene(scene));
     return scenes;
   }
 
@@ -101,6 +101,10 @@ export class GLTFInstantiator {
       gltfNode._node = node;
     }
 
+    // Copy _node so that gltf-animator can access
+    const topLevelNode = this.gltf.nodes.find(node => node.id === gltfNode.id);
+    topLevelNode._node = gltfNode._node;
+
     return gltfNode._node;
   }
 
@@ -204,3 +208,26 @@ export class GLTFInstantiator {
     return false;
   }
 }
+
+/** Deeply copies a JS data structure */
+function deepCopy(object: any): any {
+  // don't copy binary data
+  if (
+    ArrayBuffer.isView(object) ||
+    object instanceof ArrayBuffer ||
+    object instanceof ImageBitmap
+  ) {
+    return object;
+  }
+  if (Array.isArray(object)) {
+    return object.map(deepCopy);
+  }
+  if (object && typeof object === 'object') {
+    const result = {};
+    for (const key in object) {
+      result[key] = deepCopy(object[key]);
+    }
+    return result;
+  }
+  return object;
+}

package/src/pbr/parse-pbr-material.ts

@@ -1,6 +1,7 @@
-import type {Device, Texture, Binding, Parameters} from '@luma.gl/core';
+import type {Device, Texture, Parameters} from '@luma.gl/core';
 import {log} from '@luma.gl/core';
 import {PBREnvironment} from './pbr-environment';
+import {PBRMaterialBindings, PBRMaterialUniforms, PBRProjectionProps} from '@luma.gl/shadertools';
 
 /* eslint-disable camelcase */
 
@@ -17,8 +18,8 @@ export type ParsePBRMaterialOptions = {
 
 export type ParsedPBRMaterial = {
   readonly defines: Record<string, number | boolean>;
-  readonly bindings: Record<string, Binding>;
-  readonly uniforms: Record<string, any>;
+  readonly bindings: Partial<PBRMaterialBindings>;
+  readonly uniforms: Partial<PBRProjectionProps & PBRMaterialUniforms>;
   readonly parameters: Parameters;
   readonly glParameters: Record<string, any>;
   /** List of all generated textures, makes it easy to destroy them later */
@@ -28,6 +29,7 @@ export type ParsedPBRMaterial = {
 // NOTE: Modules other than `@luma.gl/webgl` should not import `GL` from
 // `@luma.gl/constants`. Locally we use `GLEnum` instead of `GL` to avoid
 // conflicts with the `babel-plugin-inline-webgl-constants` plugin.
+// eslint-disable-next-line no-shadow
 enum GLEnum {
   FUNC_ADD = 0x8006,
   ONE = 1,
@@ -57,9 +59,9 @@ export function parsePBRMaterial(
     bindings: {},
     uniforms: {
       // TODO: find better values?
-      u_Camera: [0, 0, 0], // Model should override
+      camera: [0, 0, 0], // Model should override
 
-      u_MetallicRoughnessValues: [1, 1] // Default is 1 and 1
+      metallicRoughnessValues: [1, 1] // Default is 1 and 1
     },
     parameters: {},
     glParameters: {},
@@ -71,19 +73,19 @@ export function parsePBRMaterial(
 
   const {imageBasedLightingEnvironment} = options;
   if (imageBasedLightingEnvironment) {
-    parsedMaterial.bindings.u_DiffuseEnvSampler =
+    parsedMaterial.bindings.pbr_diffuseEnvSampler =
       imageBasedLightingEnvironment.diffuseEnvSampler.texture;
-    parsedMaterial.bindings.u_SpecularEnvSampler =
+    parsedMaterial.bindings.pbr_specularEnvSampler =
       imageBasedLightingEnvironment.specularEnvSampler.texture;
-    parsedMaterial.bindings.u_brdfLUT = imageBasedLightingEnvironment.brdfLutTexture.texture;
-    parsedMaterial.uniforms.u_ScaleIBLAmbient = [1, 1];
+    parsedMaterial.bindings.pbr_BrdfLUT = imageBasedLightingEnvironment.brdfLutTexture.texture;
+    parsedMaterial.uniforms.scaleIBLAmbient = [1, 1];
   }
 
   if (options?.pbrDebug) {
     parsedMaterial.defines.PBR_DEBUG = 1;
     // Override final color for reference app visualization of various parameters in the lighting equation.
-    parsedMaterial.uniforms.u_ScaleDiffBaseMR = [0, 0, 0, 0];
-    parsedMaterial.uniforms.u_ScaleFGDSpec = [0, 0, 0, 0];
+    parsedMaterial.uniforms.scaleDiffBaseMR = [0, 0, 0, 0];
+    parsedMaterial.uniforms.scaleFGDSpec = [0, 0, 0, 0];
   }
 
   if (attributes.NORMAL) parsedMaterial.defines.HAS_NORMALS = 1;
@@ -102,45 +104,51 @@ export function parsePBRMaterial(
 
 /** Parse GLTF material record */
 function parseMaterial(device: Device, material, parsedMaterial: ParsedPBRMaterial): void {
-  parsedMaterial.uniforms.pbr_uUnlit = Boolean(material.unlit);
+  parsedMaterial.uniforms.unlit = Boolean(material.unlit);
 
   if (material.pbrMetallicRoughness) {
     parsePbrMetallicRoughness(device, material.pbrMetallicRoughness, parsedMaterial);
   }
   if (material.normalTexture) {
-    addTexture(device, material.normalTexture, 'u_NormalSampler', 'HAS_NORMALMAP', parsedMaterial);
+    addTexture(
+      device,
+      material.normalTexture,
+      'pbr_normalSampler',
+      'HAS_NORMALMAP',
+      parsedMaterial
+    );
 
     const {scale = 1} = material.normalTexture;
-    parsedMaterial.uniforms.u_NormalScale = scale;
+    parsedMaterial.uniforms.normalScale = scale;
   }
   if (material.occlusionTexture) {
     addTexture(
       device,
       material.occlusionTexture,
-      'u_OcclusionSampler',
+      'pbr_occlusionSampler',
       'HAS_OCCLUSIONMAP',
       parsedMaterial
     );
 
     const {strength = 1} = material.occlusionTexture;
-    parsedMaterial.uniforms.u_OcclusionStrength = strength;
+    parsedMaterial.uniforms.occlusionStrength = strength;
   }
   if (material.emissiveTexture) {
     addTexture(
       device,
       material.emissiveTexture,
-      'u_EmissiveSampler',
+      'pbr_emissiveSampler',
       'HAS_EMISSIVEMAP',
       parsedMaterial
     );
-    parsedMaterial.uniforms.u_EmissiveFactor = material.emissiveFactor || [0, 0, 0];
+    parsedMaterial.uniforms.emissiveFactor = material.emissiveFactor || [0, 0, 0];
   }
 
   switch (material.alphaMode) {
     case 'MASK':
       const {alphaCutoff = 0.5} = material;
       parsedMaterial.defines.ALPHA_CUTOFF = 1;
-      parsedMaterial.uniforms.u_AlphaCutoff = alphaCutoff;
+      parsedMaterial.uniforms.alphaCutoff = alphaCutoff;
       break;
     case 'BLEND':
       log.warn('glTF BLEND alphaMode might not work well because it requires mesh sorting')();
@@ -178,24 +186,24 @@ function parsePbrMetallicRoughness(
     addTexture(
       device,
       pbrMetallicRoughness.baseColorTexture,
-      'u_BaseColorSampler',
+      'pbr_baseColorSampler',
       'HAS_BASECOLORMAP',
       parsedMaterial
     );
   }
-  parsedMaterial.uniforms.u_BaseColorFactor = pbrMetallicRoughness.baseColorFactor || [1, 1, 1, 1];
+  parsedMaterial.uniforms.baseColorFactor = pbrMetallicRoughness.baseColorFactor || [1, 1, 1, 1];
 
   if (pbrMetallicRoughness.metallicRoughnessTexture) {
     addTexture(
       device,
       pbrMetallicRoughness.metallicRoughnessTexture,
-      'u_MetallicRoughnessSampler',
+      'pbr_metallicRoughnessSampler',
       'HAS_METALROUGHNESSMAP',
       parsedMaterial
     );
   }
   const {metallicFactor = 1, roughnessFactor = 1} = pbrMetallicRoughness;
-  parsedMaterial.uniforms.u_MetallicRoughnessValues = [metallicFactor, roughnessFactor];
+  parsedMaterial.uniforms.metallicRoughnessValues = [metallicFactor, roughnessFactor];
 }
 
 /** Create a texture from a glTF texture/sampler/image combo and add it to bindings */
@@ -270,9 +278,9 @@ export class PBRMaterialParser {
 
     this.uniforms = {
       // TODO: find better values?
-      u_Camera: [0, 0, 0], // Model should override
+      camera: [0, 0, 0], // Model should override
 
-      u_MetallicRoughnessValues: [1, 1] // Default is 1 and 1
+      metallicRoughnessValues: [1, 1] // Default is 1 and 1
     };
 
     this.bindings = {};
@@ -281,17 +289,17 @@ export class PBRMaterialParser {
     this.generatedTextures = [];
 
     if (imageBasedLightingEnvironment) {
-      this.bindings.u_DiffuseEnvSampler = imageBasedLightingEnvironment.getDiffuseEnvSampler();
-      this.bindings.u_SpecularEnvSampler = imageBasedLightingEnvironment.getSpecularEnvSampler();
-      this.bindings.u_brdfLUT = imageBasedLightingEnvironment.getBrdfTexture();
-      this.uniforms.u_ScaleIBLAmbient = [1, 1];
+      this.bindings.pbr_diffuseEnvSampler = imageBasedLightingEnvironment.getDiffuseEnvSampler();
+      this.bindings.pbr_specularEnvSampler = imageBasedLightingEnvironment.getSpecularEnvSampler();
+      this.bindings.pbr_BrdfLUT = imageBasedLightingEnvironment.getBrdfTexture();
+      this.uniforms.scaleIBLAmbient = [1, 1];
     }
 
     if (pbrDebug) {
       // Override final color for reference app visualization
       // of various parameters in the lighting equation.
-      this.uniforms.u_ScaleDiffBaseMR = [0, 0, 0, 0];
-      this.uniforms.u_ScaleFGDSpec = [0, 0, 0, 0];
+      this.uniforms.scaleDiffBaseMR = [0, 0, 0, 0];
+      this.uniforms.scaleFGDSpec = [0, 0, 0, 0];
     }
 
     this.defineIfPresent(attributes.NORMAL, 'HAS_NORMALS');
@@ -323,31 +331,31 @@ export class PBRMaterialParser {
 
   /** Parse GLTF material record *
   parseMaterial(material) {
-    this.uniforms.pbr_uUnlit = Boolean(material.unlit);
+    this.uniforms.unlit = Boolean(material.unlit);
 
     if (material.pbrMetallicRoughness) {
       this.parsePbrMetallicRoughness(material.pbrMetallicRoughness);
     }
     if (material.normalTexture) {
-      this.addTexture(material.normalTexture, 'u_NormalSampler', 'HAS_NORMALMAP');
+      this.addTexture(material.normalTexture, 'pbr_normalSampler', 'HAS_NORMALMAP');
 
       const {scale = 1} = material.normalTexture;
-      this.uniforms.u_NormalScale = scale;
+      this.uniforms.normalScale = scale;
     }
     if (material.occlusionTexture) {
-      this.addTexture(material.occlusionTexture, 'u_OcclusionSampler', 'HAS_OCCLUSIONMAP');
+      this.addTexture(material.occlusionTexture, 'pbr_occlusionSampler', 'HAS_OCCLUSIONMAP');
 
       const {strength = 1} = material.occlusionTexture;
-      this.uniforms.u_OcclusionStrength = strength;
+      this.uniforms.occlusionStrength = strength;
     }
     if (material.emissiveTexture) {
-      this.addTexture(material.emissiveTexture, 'u_EmissiveSampler', 'HAS_EMISSIVEMAP');
-      this.uniforms.u_EmissiveFactor = material.emissiveFactor || [0, 0, 0];
+      this.addTexture(material.emissiveTexture, 'pbr_emissiveSampler', 'HAS_EMISSIVEMAP');
+      this.uniforms.emissiveFactor = material.emissiveFactor || [0, 0, 0];
     }
     if (material.alphaMode === 'MASK') {
       const {alphaCutoff = 0.5} = material;
       this.defines.ALPHA_CUTOFF = 1;
-      this.uniforms.u_AlphaCutoff = alphaCutoff;
+      this.uniforms.alphaCutoff = alphaCutoff;
     } else if (material.alphaMode === 'BLEND') {
       log.warn('BLEND alphaMode might not work well because it requires mesh sorting')();
       Object.assign(this.parameters, {
@@ -363,21 +371,21 @@ export class PBRMaterialParser {
     if (pbrMetallicRoughness.baseColorTexture) {
       this.addTexture(
         pbrMetallicRoughness.baseColorTexture,
-        'u_BaseColorSampler',
+        'pbr_baseColorSampler',
         'HAS_BASECOLORMAP'
       );
     }
-    this.uniforms.u_BaseColorFactor = pbrMetallicRoughness.baseColorFactor || [1, 1, 1, 1];
+    this.uniforms.baseColorFactor = pbrMetallicRoughness.baseColorFactor || [1, 1, 1, 1];
 
     if (pbrMetallicRoughness.metallicRoughnessTexture) {
       this.addTexture(
         pbrMetallicRoughness.metallicRoughnessTexture,
-        'u_MetallicRoughnessSampler',
+        'pbr_metallicRoughnessSampler',
         'HAS_METALROUGHNESSMAP'
       );
     }
     const {metallicFactor = 1, roughnessFactor = 1} = pbrMetallicRoughness;
-    this.uniforms.u_MetallicRoughnessValues = [metallicFactor, roughnessFactor];
+    this.uniforms.metallicRoughnessValues = [metallicFactor, roughnessFactor];
   }
 
   /** Create a texture from a glTF texture/sampler/image combo and add it to bindings *