@luma.gl/gltf 9.3.0-alpha.6 → 9.3.0-alpha.8

package/dist/pbr/pbr-environment.js

@@ -5,6 +5,7 @@ import { DynamicTexture } from '@luma.gl/engine';
 import { loadImageTexture } from '@loaders.gl/textures';
 /** Loads textures for PBR environment */
 export function loadPBREnvironment(device, props) {
+    const specularMipLevels = props.specularMipLevels ?? 1;
     const brdfLutTexture = new DynamicTexture(device, {
         id: 'brdfLUT',
         sampler: {
@@ -18,7 +19,7 @@ export function loadPBREnvironment(device, props) {
     });
     const diffuseEnvSampler = makeCube(device, {
         id: 'DiffuseEnvSampler',
-        getTextureForFace: dir => loadImageTexture(props.getTexUrl('diffuse', dir, 0)),
+        getTextureForFace: face => loadImageTexture(props.getTexUrl('diffuse', FACES.indexOf(face), 0)),
         sampler: {
             addressModeU: 'clamp-to-edge',
             addressModeV: 'clamp-to-edge',
@@ -28,13 +29,13 @@ export function loadPBREnvironment(device, props) {
     });
     const specularEnvSampler = makeCube(device, {
         id: 'SpecularEnvSampler',
-        getTextureForFace: (dir) => {
+        getTextureForFace: (face) => {
             const imageArray = [];
-            // @ts-ignore
-            for (let lod = 0; lod <= props.specularMipLevels - 1; lod++) {
-                imageArray.push(loadImageTexture(props.getTexUrl('specular', dir, lod)));
+            const direction = FACES.indexOf(face);
+            for (let lod = 0; lod < specularMipLevels; lod++) {
+                imageArray.push(loadImageTexture(props.getTexUrl('specular', direction, lod)));
             }
-            return imageArray;
+            return Promise.all(imageArray);
         },
         sampler: {
             addressModeU: 'clamp-to-edge',
@@ -50,20 +51,21 @@ export function loadPBREnvironment(device, props) {
     };
 }
 // TODO put somewhere common
-const FACES = [0, 1, 2, 3, 4, 5];
+const FACES = ['+X', '-X', '+Y', '-Y', '+Z', '-Z'];
 /** Construction props for an asynchronously loaded cubemap. */
 function makeCube(device, { id, getTextureForFace, sampler }) {
-    const data = {};
-    FACES.forEach(face => {
-        // @ts-ignore TODO
-        data[String(face)] = getTextureForFace(face);
+    const data = Promise.all(FACES.map(face => getTextureForFace(face))).then(faceDataArray => {
+        const cubeData = {};
+        FACES.forEach((face, index) => {
+            cubeData[face] = faceDataArray[index];
+        });
+        return cubeData;
     });
     return new DynamicTexture(device, {
         id,
         dimension: 'cube',
         mipmaps: false,
         sampler,
-        // @ts-expect-error
         data
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"pbr-environment.js","sourceRoot":"","sources":["../../src/pbr/pbr-environment.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAsBtD,yCAAyC;AACzC,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,KAA0B;IAC3E,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,EAAE;QAChD,EAAE,EAAE,SAAS;QACb,OAAO,EAAE;YACP,YAAY,EAAE,eAAe;YAC7B,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;SACY;QACjC,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,YAAY,EAAE,eAAe;YAC7B,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;SACY;KAClC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,QAAQ,CAAC,MAAM,EAAE;QAC1C,EAAE,EAAE,oBAAoB;QACxB,iBAAiB,EAAE,CAAC,GAAW,EAAE,EAAE;YACjC,MAAM,UAAU,GAAmB,EAAE,CAAC;YACtC,aAAa;YACb,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,YAAY,EAAE,eAAe;YAC7B,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ,EAAE,oDAAoD;YACzE,SAAS,EAAE,QAAQ;SACY;KAClC,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,+DAA+D;AAC/D,SAAS,QAAQ,CACf,MAAc,EACd,EACE,EAAE,EACF,iBAAiB,EACjB,OAAO,EAQR;IAED,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,kBAAkB;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,cAAc,CAAC,MAAM,EAAE;QAChC,EAAE;QACF,SAAS,EAAE,MAAM;QACjB,OAAO,EAAE,KAAK;QACd,OAAO;QACP,mBAAmB;QACnB,IAAI;KACL,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"pbr-environment.js","sourceRoot":"","sources":["../../src/pbr/pbr-environment.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,17 @@
 import type { Texture, Parameters } from '@luma.gl/core';
-import { PBRMaterialBindings, PBRMaterialUniforms, PBRProjectionProps } from '@luma.gl/shadertools';
+import { IBLBindings, PBRMaterialBindings, PBRMaterialUniforms, PBRProjectionProps } from '@luma.gl/shadertools';
+type ParsedPBRMaterialUniforms = Partial<PBRProjectionProps & PBRMaterialUniforms> & {
+    clearcoatRoughnessMapEnabled?: boolean;
+    sheenRoughnessMapEnabled?: boolean;
+};
 /** Material state extracted from a glTF primitive for consumption by the PBR shader module. */
 export type ParsedPBRMaterial = {
     /** Shader defines inferred from geometry and material features. */
     readonly defines: Record<string, boolean>;
     /** Texture and sampler bindings for the PBR shader module. */
-    readonly bindings: Partial<PBRMaterialBindings>;
+    readonly bindings: Partial<PBRMaterialBindings & IBLBindings>;
     /** Uniform values for the projection and PBR shader modules. */
-    readonly uniforms: Partial<PBRProjectionProps & PBRMaterialUniforms>;
+    readonly uniforms: ParsedPBRMaterialUniforms;
     /** Render pipeline parameters derived from the glTF material. */
     readonly parameters: Parameters;
     /** @deprecated Use parameters */
@@ -15,4 +19,5 @@ export type ParsedPBRMaterial = {
     /** List of all generated textures, makes it easy to destroy them later */
     readonly generatedTextures: Texture[];
 };
+export {};
 //# sourceMappingURL=pbr-material.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pbr-material.d.ts","sourceRoot":"","sources":["../../src/pbr/pbr-material.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAElG,+FAA+F;AAC/F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,mEAAmE;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,8DAA8D;IAC9D,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAChD,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,CAAC;IACrE,iEAAiE;IACjE,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,iCAAiC;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3C,0EAA0E;IAC1E,QAAQ,CAAC,iBAAiB,EAAE,OAAO,EAAE,CAAC;CACvC,CAAC"}
+{"version":3,"file":"pbr-material.d.ts","sourceRoot":"","sources":["../../src/pbr/pbr-material.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EACL,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAE9B,KAAK,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,GAAG;IACnF,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,+FAA+F;AAC/F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,mEAAmE;IACnE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,8DAA8D;IAC9D,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,mBAAmB,GAAG,WAAW,CAAC,CAAC;IAC9D,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,EAAE,yBAAyB,CAAC;IAC7C,iEAAiE;IACjE,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,iCAAiC;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3C,0EAA0E;IAC1E,QAAQ,CAAC,iBAAiB,EAAE,OAAO,EAAE,CAAC;CACvC,CAAC"}

package/dist/webgl-to-webgpu/convert-webgl-sampler.d.ts

@@ -1,15 +1,15 @@
 import type { SamplerProps } from '@luma.gl/core';
-import { GL } from '@luma.gl/constants';
+import { GLEnum } from "./gltf-webgl-constants.js";
 /** Minimal glTF sampler representation used during conversion. */
 type GLTFSampler = {
     /** Horizontal wrap mode. */
-    wrapS?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
+    wrapS?: GLEnum.CLAMP_TO_EDGE | GLEnum.REPEAT | GLEnum.MIRRORED_REPEAT;
     /** Vertical wrap mode. */
-    wrapT?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
+    wrapT?: GLEnum.CLAMP_TO_EDGE | GLEnum.REPEAT | GLEnum.MIRRORED_REPEAT;
     /** Magnification filter. */
-    magFilter?: GL.NEAREST | GL.LINEAR;
+    magFilter?: GLEnum.NEAREST | GLEnum.LINEAR;
     /** Minification and mip filter combination. */
-    minFilter?: GL.NEAREST | GL.LINEAR | GL.NEAREST_MIPMAP_NEAREST | GL.LINEAR_MIPMAP_NEAREST | GL.NEAREST_MIPMAP_LINEAR | GL.LINEAR_MIPMAP_LINEAR;
+    minFilter?: GLEnum.NEAREST | GLEnum.LINEAR | GLEnum.NEAREST_MIPMAP_NEAREST | GLEnum.LINEAR_MIPMAP_NEAREST | GLEnum.NEAREST_MIPMAP_LINEAR | GLEnum.LINEAR_MIPMAP_LINEAR;
 };
 /** Converts a glTF sampler into luma.gl sampler props. */
 export declare function convertSampler(gltfSampler: GLTFSampler): SamplerProps;

package/dist/webgl-to-webgpu/convert-webgl-sampler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-webgl-sampler.d.ts","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-sampler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAEtC,kEAAkE;AAClE,KAAK,WAAW,GAAG;IACjB,4BAA4B;IAC5B,KAAK,CAAC,EAAE,EAAE,CAAC,aAAa,GAAG,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,eAAe,CAAC;IAC1D,0BAA0B;IAC1B,KAAK,CAAC,EAAE,EAAE,CAAC,aAAa,GAAG,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,eAAe,CAAC;IAC1D,4BAA4B;IAC5B,SAAS,CAAC,EAAE,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC;IACnC,+CAA+C;IAC/C,SAAS,CAAC,EACN,EAAE,CAAC,OAAO,GACV,EAAE,CAAC,MAAM,GACT,EAAE,CAAC,sBAAsB,GACzB,EAAE,CAAC,qBAAqB,GACxB,EAAE,CAAC,qBAAqB,GACxB,EAAE,CAAC,oBAAoB,CAAC;CAC7B,CAAC;AAEF,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,YAAY,CAOrE"}
+{"version":3,"file":"convert-webgl-sampler.d.ts","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-sampler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,MAAM,EAAC,kCAA+B;AAE9C,kEAAkE;AAClE,KAAK,WAAW,GAAG;IACjB,4BAA4B;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC;IACtE,0BAA0B;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC;IACtE,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3C,+CAA+C;IAC/C,SAAS,CAAC,EACN,MAAM,CAAC,OAAO,GACd,MAAM,CAAC,MAAM,GACb,MAAM,CAAC,sBAAsB,GAC7B,MAAM,CAAC,qBAAqB,GAC5B,MAAM,CAAC,qBAAqB,GAC5B,MAAM,CAAC,oBAAoB,CAAC;CACjC,CAAC;AAEF,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,YAAY,CAOrE"}

package/dist/webgl-to-webgpu/convert-webgl-sampler.js

@@ -1,7 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { GL } from '@luma.gl/constants';
+import { GLEnum } from "./gltf-webgl-constants.js";
 /** Converts a glTF sampler into luma.gl sampler props. */
 export function convertSampler(gltfSampler) {
     return {
@@ -14,11 +14,11 @@ export function convertSampler(gltfSampler) {
 /** Converts a glTF wrap enum into a luma.gl address mode. */
 function convertSamplerWrapMode(mode) {
     switch (mode) {
-        case 33071:
+        case GLEnum.CLAMP_TO_EDGE:
             return 'clamp-to-edge';
-        case 10497:
+        case GLEnum.REPEAT:
             return 'repeat';
-        case 33648:
+        case GLEnum.MIRRORED_REPEAT:
             return 'mirror-repeat';
         default:
             return undefined;
@@ -27,9 +27,9 @@ function convertSamplerWrapMode(mode) {
 /** Converts a glTF mag filter enum into a luma.gl mag filter. */
 function convertSamplerMagFilter(mode) {
     switch (mode) {
-        case 9728:
+        case GLEnum.NEAREST:
             return 'nearest';
-        case 9729:
+        case GLEnum.LINEAR:
             return 'linear';
         default:
             return undefined;
@@ -38,17 +38,17 @@ function convertSamplerMagFilter(mode) {
 /** Converts a glTF min filter enum into luma.gl minification and mipmap filters. */
 function convertSamplerMinFilter(mode) {
     switch (mode) {
-        case 9728:
+        case GLEnum.NEAREST:
             return { minFilter: 'nearest' };
-        case 9729:
+        case GLEnum.LINEAR:
             return { minFilter: 'linear' };
-        case 9984:
+        case GLEnum.NEAREST_MIPMAP_NEAREST:
             return { minFilter: 'nearest', mipmapFilter: 'nearest' };
-        case 9985:
+        case GLEnum.LINEAR_MIPMAP_NEAREST:
             return { minFilter: 'linear', mipmapFilter: 'nearest' };
-        case 9986:
+        case GLEnum.NEAREST_MIPMAP_LINEAR:
             return { minFilter: 'nearest', mipmapFilter: 'linear' };
-        case 9987:
+        case GLEnum.LINEAR_MIPMAP_LINEAR:
             return { minFilter: 'linear', mipmapFilter: 'linear' };
         default:
             return {};

package/dist/webgl-to-webgpu/convert-webgl-sampler.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert-webgl-sampler.js","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-sampler.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAoBtC,0DAA0D;AAC1D,MAAM,UAAU,cAAc,CAAC,WAAwB;IACrD,OAAO;QACL,YAAY,EAAE,sBAAsB,CAAC,WAAW,CAAC,KAAK,CAAC;QACvD,YAAY,EAAE,sBAAsB,CAAC,WAAW,CAAC,KAAK,CAAC;QACvD,SAAS,EAAE,uBAAuB,CAAC,WAAW,CAAC,SAAS,CAAC;QACzD,GAAG,uBAAuB,CAAC,WAAW,CAAC,SAAS,CAAC;KAClD,CAAC;AACJ,CAAC;AAED,6DAA6D;AAC7D,SAAS,sBAAsB,CAC7B,IAAmE;IAEnE,QAAQ,IAAI,EAAE,CAAC;QACb;YACE,OAAO,eAAe,CAAC;QACzB;YACE,OAAO,QAAQ,CAAC;QAClB;YACE,OAAO,eAAe,CAAC;QACzB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,iEAAiE;AACjE,SAAS,uBAAuB,CAC9B,IAAwC;IAExC,QAAQ,IAAI,EAAE,CAAC;QACb;YACE,OAAO,SAAS,CAAC;QACnB;YACE,OAAO,QAAQ,CAAC;QAClB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,oFAAoF;AACpF,SAAS,uBAAuB,CAC9B,IAOa;IAEb,QAAQ,IAAI,EAAE,CAAC;QACb;YACE,OAAO,EAAC,SAAS,EAAE,SAAS,EAAC,CAAC;QAChC;YACE,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAC,CAAC;QAC/B;YACE,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAC,CAAC;QACzD;YACE,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,CAAC;QACxD;YACE,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAC,CAAC;QACxD;YACE,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAC,CAAC;QACvD;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"convert-webgl-sampler.js","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-sampler.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,OAAO,EAAC,MAAM,EAAC,kCAA+B;AAoB9C,0DAA0D;AAC1D,MAAM,UAAU,cAAc,CAAC,WAAwB;IACrD,OAAO;QACL,YAAY,EAAE,sBAAsB,CAAC,WAAW,CAAC,KAAK,CAAC;QACvD,YAAY,EAAE,sBAAsB,CAAC,WAAW,CAAC,KAAK,CAAC;QACvD,SAAS,EAAE,uBAAuB,CAAC,WAAW,CAAC,SAAS,CAAC;QACzD,GAAG,uBAAuB,CAAC,WAAW,CAAC,SAAS,CAAC;KAClD,CAAC;AACJ,CAAC;AAED,6DAA6D;AAC7D,SAAS,sBAAsB,CAC7B,IAA+E;IAE/E,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,MAAM,CAAC,aAAa;YACvB,OAAO,eAAe,CAAC;QACzB,KAAK,MAAM,CAAC,MAAM;YAChB,OAAO,QAAQ,CAAC;QAClB,KAAK,MAAM,CAAC,eAAe;YACzB,OAAO,eAAe,CAAC;QACzB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,iEAAiE;AACjE,SAAS,uBAAuB,CAC9B,IAAgD;IAEhD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,MAAM,CAAC,OAAO;YACjB,OAAO,SAAS,CAAC;QACnB,KAAK,MAAM,CAAC,MAAM;YAChB,OAAO,QAAQ,CAAC;QAClB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,oFAAoF;AACpF,SAAS,uBAAuB,CAC9B,IAOa;IAEb,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,MAAM,CAAC,OAAO;YACjB,OAAO,EAAC,SAAS,EAAE,SAAS,EAAC,CAAC;QAChC,KAAK,MAAM,CAAC,MAAM;YAChB,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAC,CAAC;QAC/B,KAAK,MAAM,CAAC,sBAAsB;YAChC,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAC,CAAC;QACzD,KAAK,MAAM,CAAC,qBAAqB;YAC/B,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,CAAC;QACxD,KAAK,MAAM,CAAC,qBAAqB;YAC/B,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAC,CAAC;QACxD,KAAK,MAAM,CAAC,oBAAoB;YAC9B,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAC,CAAC;QACvD;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/webgl-to-webgpu/convert-webgl-topology.d.ts

@@ -1,14 +1,5 @@
 import { PrimitiveTopology } from '@luma.gl/core';
-/** Minimal WebGL draw-mode enum subset used by the glTF converter. */
-export declare enum GLEnum {
-    POINTS = 0,
-    LINES = 1,
-    LINE_LOOP = 2,
-    LINE_STRIP = 3,
-    TRIANGLES = 4,
-    TRIANGLE_STRIP = 5,
-    TRIANGLE_FAN = 6
-}
+import { GLEnum } from "./gltf-webgl-constants.js";
 /** Converts a WebGL draw mode into a luma.gl primitive topology string. */
 export declare function convertGLDrawModeToTopology(drawMode: GLEnum.POINTS | GLEnum.LINES | GLEnum.LINE_STRIP | GLEnum.LINE_LOOP | GLEnum.TRIANGLES | GLEnum.TRIANGLE_STRIP | GLEnum.TRIANGLE_FAN): PrimitiveTopology;
 //# sourceMappingURL=convert-webgl-topology.d.ts.map

package/dist/webgl-to-webgpu/convert-webgl-topology.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-webgl-topology.d.ts","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-topology.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAMhD,sEAAsE;AACtE,oBAAY,MAAM;IAChB,MAAM,IAAM;IACZ,KAAK,IAAM;IACX,SAAS,IAAM;IACf,UAAU,IAAM;IAChB,SAAS,IAAM;IACf,cAAc,IAAM;IACpB,YAAY,IAAM;CACnB;AAED,2EAA2E;AAC3E,wBAAgB,2BAA2B,CACzC,QAAQ,EACJ,MAAM,CAAC,MAAM,GACb,MAAM,CAAC,KAAK,GACZ,MAAM,CAAC,UAAU,GACjB,MAAM,CAAC,SAAS,GAChB,MAAM,CAAC,SAAS,GAChB,MAAM,CAAC,cAAc,GACrB,MAAM,CAAC,YAAY,GACtB,iBAAiB,CAUnB"}
+{"version":3,"file":"convert-webgl-topology.d.ts","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-topology.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,MAAM,EAAC,kCAA+B;AAE9C,2EAA2E;AAC3E,wBAAgB,2BAA2B,CACzC,QAAQ,EACJ,MAAM,CAAC,MAAM,GACb,MAAM,CAAC,KAAK,GACZ,MAAM,CAAC,UAAU,GACjB,MAAM,CAAC,SAAS,GAChB,MAAM,CAAC,SAAS,GAChB,MAAM,CAAC,cAAc,GACrB,MAAM,CAAC,YAAY,GACtB,iBAAiB,CAUnB"}

package/dist/webgl-to-webgpu/convert-webgl-topology.js

@@ -1,21 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-// 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
-/** Minimal WebGL draw-mode enum subset used by the glTF converter. */
-export var GLEnum;
-(function (GLEnum) {
-    GLEnum[GLEnum["POINTS"] = 0] = "POINTS";
-    GLEnum[GLEnum["LINES"] = 1] = "LINES";
-    GLEnum[GLEnum["LINE_LOOP"] = 2] = "LINE_LOOP";
-    GLEnum[GLEnum["LINE_STRIP"] = 3] = "LINE_STRIP";
-    GLEnum[GLEnum["TRIANGLES"] = 4] = "TRIANGLES";
-    GLEnum[GLEnum["TRIANGLE_STRIP"] = 5] = "TRIANGLE_STRIP";
-    GLEnum[GLEnum["TRIANGLE_FAN"] = 6] = "TRIANGLE_FAN";
-})(GLEnum || (GLEnum = {}));
+import { GLEnum } from "./gltf-webgl-constants.js";
 /** Converts a WebGL draw mode into a luma.gl primitive topology string. */
 export function convertGLDrawModeToTopology(drawMode) {
     // prettier-ignore

package/dist/webgl-to-webgpu/convert-webgl-topology.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert-webgl-topology.js","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-topology.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,wEAAwE;AACxE,yEAAyE;AACzE,mEAAmE;AACnE,qCAAqC;AACrC,sEAAsE;AACtE,MAAM,CAAN,IAAY,MAQX;AARD,WAAY,MAAM;IAChB,uCAAY,CAAA;IACZ,qCAAW,CAAA;IACX,6CAAe,CAAA;IACf,+CAAgB,CAAA;IAChB,6CAAe,CAAA;IACf,uDAAoB,CAAA;IACpB,mDAAkB,CAAA;AACpB,CAAC,EARW,MAAM,KAAN,MAAM,QAQjB;AAED,2EAA2E;AAC3E,MAAM,UAAU,2BAA2B,CACzC,QAOuB;IAEvB,kBAAkB;IAClB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,YAAY,CAAC;QACxC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,WAAW,CAAC;QACtC,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,YAAY,CAAC;QAC5C,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,eAAe,CAAC;QAC9C,KAAK,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,gBAAgB,CAAC;QACpD,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC"}
+{"version":3,"file":"convert-webgl-topology.js","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-topology.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,MAAM,EAAC,kCAA+B;AAE9C,2EAA2E;AAC3E,MAAM,UAAU,2BAA2B,CACzC,QAOuB;IAEvB,kBAAkB;IAClB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,YAAY,CAAC;QACxC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,WAAW,CAAC;QACtC,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,YAAY,CAAC;QAC5C,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,eAAe,CAAC;QAC9C,KAAK,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,gBAAgB,CAAC;QACpD,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC"}

package/dist/webgl-to-webgpu/gltf-webgl-constants.d.ts

@@ -0,0 +1,27 @@
+export declare enum GLEnum {
+    POINTS = 0,
+    LINES = 1,
+    LINE_LOOP = 2,
+    LINE_STRIP = 3,
+    TRIANGLES = 4,
+    TRIANGLE_STRIP = 5,
+    TRIANGLE_FAN = 6,
+    ONE = 1,
+    SRC_ALPHA = 770,
+    ONE_MINUS_SRC_ALPHA = 771,
+    FUNC_ADD = 32774,
+    LINEAR = 9729,
+    NEAREST = 9728,
+    NEAREST_MIPMAP_NEAREST = 9984,
+    LINEAR_MIPMAP_NEAREST = 9985,
+    NEAREST_MIPMAP_LINEAR = 9986,
+    LINEAR_MIPMAP_LINEAR = 9987,
+    TEXTURE_MIN_FILTER = 10241,
+    TEXTURE_WRAP_S = 10242,
+    TEXTURE_WRAP_T = 10243,
+    REPEAT = 10497,
+    CLAMP_TO_EDGE = 33071,
+    MIRRORED_REPEAT = 33648,
+    UNPACK_FLIP_Y_WEBGL = 37440
+}
+//# sourceMappingURL=gltf-webgl-constants.d.ts.map

package/dist/webgl-to-webgpu/gltf-webgl-constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gltf-webgl-constants.d.ts","sourceRoot":"","sources":["../../src/webgl-to-webgpu/gltf-webgl-constants.ts"],"names":[],"mappings":"AAOA,oBAAY,MAAM;IAChB,MAAM,IAAM;IACZ,KAAK,IAAM;IACX,SAAS,IAAM;IACf,UAAU,IAAM;IAChB,SAAS,IAAM;IACf,cAAc,IAAM;IACpB,YAAY,IAAM;IAElB,GAAG,IAAI;IACP,SAAS,MAAS;IAClB,mBAAmB,MAAS;IAC5B,QAAQ,QAAS;IAEjB,MAAM,OAAS;IACf,OAAO,OAAS;IAChB,sBAAsB,OAAS;IAC/B,qBAAqB,OAAS;IAC9B,qBAAqB,OAAS;IAC9B,oBAAoB,OAAS;IAC7B,kBAAkB,QAAS;IAC3B,cAAc,QAAS;IACvB,cAAc,QAAS;IACvB,MAAM,QAAS;IACf,aAAa,QAAS;IACtB,eAAe,QAAS;IACxB,mBAAmB,QAAS;CAC7B"}

package/dist/webgl-to-webgpu/gltf-webgl-constants.js

@@ -0,0 +1,34 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+// NOTE: `@luma.gl/gltf` intentionally keeps this as a local enum subset so it
+// does not need to depend on `@luma.gl/webgl` for a handful of stable WebGL values.
+// eslint-disable-next-line no-shadow
+export var GLEnum;
+(function (GLEnum) {
+    GLEnum[GLEnum["POINTS"] = 0] = "POINTS";
+    GLEnum[GLEnum["LINES"] = 1] = "LINES";
+    GLEnum[GLEnum["LINE_LOOP"] = 2] = "LINE_LOOP";
+    GLEnum[GLEnum["LINE_STRIP"] = 3] = "LINE_STRIP";
+    GLEnum[GLEnum["TRIANGLES"] = 4] = "TRIANGLES";
+    GLEnum[GLEnum["TRIANGLE_STRIP"] = 5] = "TRIANGLE_STRIP";
+    GLEnum[GLEnum["TRIANGLE_FAN"] = 6] = "TRIANGLE_FAN";
+    GLEnum[GLEnum["ONE"] = 1] = "ONE";
+    GLEnum[GLEnum["SRC_ALPHA"] = 770] = "SRC_ALPHA";
+    GLEnum[GLEnum["ONE_MINUS_SRC_ALPHA"] = 771] = "ONE_MINUS_SRC_ALPHA";
+    GLEnum[GLEnum["FUNC_ADD"] = 32774] = "FUNC_ADD";
+    GLEnum[GLEnum["LINEAR"] = 9729] = "LINEAR";
+    GLEnum[GLEnum["NEAREST"] = 9728] = "NEAREST";
+    GLEnum[GLEnum["NEAREST_MIPMAP_NEAREST"] = 9984] = "NEAREST_MIPMAP_NEAREST";
+    GLEnum[GLEnum["LINEAR_MIPMAP_NEAREST"] = 9985] = "LINEAR_MIPMAP_NEAREST";
+    GLEnum[GLEnum["NEAREST_MIPMAP_LINEAR"] = 9986] = "NEAREST_MIPMAP_LINEAR";
+    GLEnum[GLEnum["LINEAR_MIPMAP_LINEAR"] = 9987] = "LINEAR_MIPMAP_LINEAR";
+    GLEnum[GLEnum["TEXTURE_MIN_FILTER"] = 10241] = "TEXTURE_MIN_FILTER";
+    GLEnum[GLEnum["TEXTURE_WRAP_S"] = 10242] = "TEXTURE_WRAP_S";
+    GLEnum[GLEnum["TEXTURE_WRAP_T"] = 10243] = "TEXTURE_WRAP_T";
+    GLEnum[GLEnum["REPEAT"] = 10497] = "REPEAT";
+    GLEnum[GLEnum["CLAMP_TO_EDGE"] = 33071] = "CLAMP_TO_EDGE";
+    GLEnum[GLEnum["MIRRORED_REPEAT"] = 33648] = "MIRRORED_REPEAT";
+    GLEnum[GLEnum["UNPACK_FLIP_Y_WEBGL"] = 37440] = "UNPACK_FLIP_Y_WEBGL";
+})(GLEnum || (GLEnum = {}));
+//# sourceMappingURL=gltf-webgl-constants.js.map

package/dist/webgl-to-webgpu/gltf-webgl-constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gltf-webgl-constants.js","sourceRoot":"","sources":["../../src/webgl-to-webgpu/gltf-webgl-constants.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,8EAA8E;AAC9E,oFAAoF;AACpF,qCAAqC;AACrC,MAAM,CAAN,IAAY,MA2BX;AA3BD,WAAY,MAAM;IAChB,uCAAY,CAAA;IACZ,qCAAW,CAAA;IACX,6CAAe,CAAA;IACf,+CAAgB,CAAA;IAChB,6CAAe,CAAA;IACf,uDAAoB,CAAA;IACpB,mDAAkB,CAAA;IAElB,iCAAO,CAAA;IACP,+CAAkB,CAAA;IAClB,mEAA4B,CAAA;IAC5B,+CAAiB,CAAA;IAEjB,0CAAe,CAAA;IACf,4CAAgB,CAAA;IAChB,0EAA+B,CAAA;IAC/B,wEAA8B,CAAA;IAC9B,wEAA8B,CAAA;IAC9B,sEAA6B,CAAA;IAC7B,mEAA2B,CAAA;IAC3B,2DAAuB,CAAA;IACvB,2DAAuB,CAAA;IACvB,2CAAe,CAAA;IACf,yDAAsB,CAAA;IACtB,6DAAwB,CAAA;IACxB,qEAA4B,CAAA;AAC9B,CAAC,EA3BW,MAAM,KAAN,MAAM,QA2BjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/gltf",
-  "version": "9.3.0-alpha.6",
+  "version": "9.3.0-alpha.8",
   "description": "glTF support for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -40,10 +40,9 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/constants": "9.2.0-alpha.6",
-    "@luma.gl/core": "9.2.0-alpha.6",
-    "@luma.gl/engine": "9.2.0-alpha.6",
-    "@luma.gl/shadertools": "9.2.0-alpha.6"
+    "@luma.gl/core": "9.3.0-alpha.6",
+    "@luma.gl/engine": "9.3.0-alpha.6",
+    "@luma.gl/shadertools": "9.3.0-alpha.6"
   },
   "dependencies": {
     "@loaders.gl/core": "4.4.0-alpha.18",
@@ -51,5 +50,5 @@
     "@loaders.gl/textures": "4.4.0-alpha.18",
     "@math.gl/core": "^4.1.0"
   },
-  "gitHead": "59fda5480c4d0bb3d64545d4621175221f2b6c7c"
+  "gitHead": "371f0979c1cd01563badc36118f314365a66e1a1"
 }

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

@@ -2,9 +2,26 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Device, type RenderPipelineParameters, log} from '@luma.gl/core';
+import {
+  Buffer,
+  Device,
+  Sampler,
+  Texture,
+  TextureView,
+  type Binding,
+  type RenderPipelineParameters,
+  log
+} from '@luma.gl/core';
+import {DynamicTexture} from '@luma.gl/engine';
 import {pbrMaterial, skin} from '@luma.gl/shadertools';
-import {Geometry, Model, ModelNode, type ModelProps} from '@luma.gl/engine';
+import {
+  Geometry,
+  Material,
+  MaterialFactory,
+  Model,
+  ModelNode,
+  type ModelProps
+} from '@luma.gl/engine';
 import {type ParsedPBRMaterial} from '../pbr/pbr-material';
 
 const SHADER = /* WGSL */ `
@@ -170,10 +187,42 @@ export type CreateGLTFModelOptions = {
   geometry: Geometry;
   /** Parsed PBR material state for the primitive. */
   parsedPPBRMaterial: ParsedPBRMaterial;
+  /** Pre-created material aligned with the source glTF material entry, when available. */
+  material?: Material | null;
   /** Additional model props merged into the generated model. */
   modelOptions?: Partial<ModelProps>;
 };
 
+export type CreateGLTFMaterialOptions = {
+  id?: string;
+  parsedPPBRMaterial: ParsedPBRMaterial;
+  materialFactory?: MaterialFactory;
+};
+
+export function createGLTFMaterial(device: Device, options: CreateGLTFMaterialOptions): Material {
+  const materialFactory =
+    options.materialFactory || new MaterialFactory(device, {modules: [pbrMaterial]});
+
+  const pbrMaterialProps = {...options.parsedPPBRMaterial.uniforms};
+  delete pbrMaterialProps.camera;
+  const materialBindings = Object.fromEntries(
+    Object.entries({
+      ...pbrMaterialProps,
+      ...options.parsedPPBRMaterial.bindings
+    }).filter(
+      ([name, value]) => materialFactory.ownsBinding(name) && isMaterialBindingResource(value)
+    )
+  ) as Record<string, Binding | DynamicTexture>;
+
+  const material = materialFactory.createMaterial({
+    id: options.id,
+    bindings: materialBindings
+  });
+  material.setProps({pbrMaterial: pbrMaterialProps});
+
+  return material;
+}
+
 /** Creates a luma.gl Model from GLTF data*/
 export function createGLTFModel(device: Device, options: CreateGLTFModelOptions): ModelNode {
   const {id, geometry, parsedPPBRMaterial, vertexCount, modelOptions = {}} = options;
@@ -209,15 +258,74 @@ export function createGLTFModel(device: Device, options: CreateGLTFModelOptions)
     parameters: {...parameters, ...parsedPPBRMaterial.parameters, ...modelOptions.parameters}
   };
 
+  const material =
+    options.material ||
+    createGLTFMaterial(device, {
+      id: id ? `${id}-material` : undefined,
+      parsedPPBRMaterial
+    });
+  modelProps.material = material;
+
   const model = new Model(device, modelProps);
 
-  const {camera, ...pbrMaterialProps} = {
+  const sceneShaderInputValues = {
     ...parsedPPBRMaterial.uniforms,
     ...modelOptions.uniforms,
     ...parsedPPBRMaterial.bindings,
     ...modelOptions.bindings
   };
-
-  model.shaderInputs.setProps({pbrMaterial: pbrMaterialProps, pbrProjection: {camera}});
+  const sceneShaderInputProps = getSceneShaderInputProps(
+    model.shaderInputs.getModules(),
+    material,
+    sceneShaderInputValues
+  );
+  model.shaderInputs.setProps(sceneShaderInputProps);
   return new ModelNode({managedResources, model});
 }
+
+function isMaterialBindingResource(value: unknown): boolean {
+  return (
+    value instanceof Buffer ||
+    value instanceof DynamicTexture ||
+    value instanceof Sampler ||
+    value instanceof Texture ||
+    value instanceof TextureView
+  );
+}
+
+function getSceneShaderInputProps(
+  modules: Array<{
+    name: string;
+    uniformTypes?: Readonly<Record<string, unknown>>;
+    bindingLayout?: ReadonlyArray<{name: string}>;
+  }>,
+  material: Material,
+  shaderInputValues: Record<string, unknown>
+): Record<string, Record<string, unknown>> {
+  const propertyToModuleNameMap = new Map<string, string>();
+  for (const module of modules) {
+    for (const uniformName of Object.keys(module.uniformTypes || {})) {
+      propertyToModuleNameMap.set(uniformName, module.name);
+    }
+    for (const binding of module.bindingLayout || []) {
+      propertyToModuleNameMap.set(binding.name, module.name);
+    }
+  }
+
+  const sceneShaderInputProps: Record<string, Record<string, unknown>> = {};
+  for (const [propertyName, value] of Object.entries(shaderInputValues)) {
+    if (value === undefined) {
+      continue;
+    }
+
+    const moduleName = propertyToModuleNameMap.get(propertyName);
+    if (!moduleName || material.ownsModule(moduleName)) {
+      continue;
+    }
+
+    sceneShaderInputProps[moduleName] ||= {};
+    sceneShaderInputProps[moduleName][propertyName] = value;
+  }
+
+  return sceneShaderInputProps;
+}