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

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

@@ -1,6 +1,7 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+/** Maps glTF accessor type strings to their component counts. */
 export const ATTRIBUTE_TYPE_TO_COMPONENTS = {
     SCALAR: 1,
     VEC2: 2,
@@ -10,6 +11,7 @@ export const ATTRIBUTE_TYPE_TO_COMPONENTS = {
     MAT3: 9,
     MAT4: 16
 };
+/** Maps glTF accessor component-type enums to typed-array constructors. */
 export const ATTRIBUTE_COMPONENT_TYPE_TO_ARRAY = {
     5120: Int8Array,
     5121: Uint8Array,
@@ -18,6 +20,7 @@ export const ATTRIBUTE_COMPONENT_TYPE_TO_ARRAY = {
     5125: Uint32Array,
     5126: Float32Array
 };
+/** Converts a glTF accessor into a typed array plus its component count. */
 export function accessorToTypedArray(accessor) {
     const ArrayType = ATTRIBUTE_COMPONENT_TYPE_TO_ARRAY[accessor.componentType];
     const components = ATTRIBUTE_TYPE_TO_COMPONENTS[accessor.type];

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

@@ -1 +1 @@
-{"version":3,"file":"convert-webgl-attribute.js","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-attribute.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,MAAM,CAAC,MAAM,4BAA4B,GAA2B;IAClE,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,EAAE;CACT,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAwB;IACpE,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,YAAY;CACnB,CAAC;AAUF,MAAM,UAAU,oBAAoB,CAAC,QAAsB;IAIzD,MAAM,SAAS,GAAG,iCAAiC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC5E,MAAM,UAAU,GAAG,4BAA4B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC3C,MAAM,EAAC,MAAM,EAAE,UAAU,GAAG,CAAC,EAAC,GAAG,QAAQ,CAAC,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC;IAEjE,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAE1F,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,CAAC;AAClC,CAAC"}
+{"version":3,"file":"convert-webgl-attribute.js","sourceRoot":"","sources":["../../src/webgl-to-webgpu/convert-webgl-attribute.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAKpC,iEAAiE;AACjE,MAAM,CAAC,MAAM,4BAA4B,GAA2B;IAClE,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,EAAE;CACT,CAAC;AAEF,2EAA2E;AAC3E,MAAM,CAAC,MAAM,iCAAiC,GAAwB;IACpE,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,YAAY;CACnB,CAAC;AAgBF,4EAA4E;AAC5E,MAAM,UAAU,oBAAoB,CAAC,QAAsB;IAMzD,MAAM,SAAS,GAAG,iCAAiC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC5E,MAAM,UAAU,GAAG,4BAA4B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC3C,MAAM,EAAC,MAAM,EAAE,UAAU,GAAG,CAAC,EAAC,GAAG,QAAQ,CAAC,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC;IAEjE,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAE1F,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,CAAC;AAClC,CAAC"}

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

@@ -1,11 +1,17 @@
 import type { SamplerProps } from '@luma.gl/core';
 import { GL } from '@luma.gl/constants';
+/** Minimal glTF sampler representation used during conversion. */
 type GLTFSampler = {
+    /** Horizontal wrap mode. */
     wrapS?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
+    /** Vertical wrap mode. */
     wrapT?: GL.CLAMP_TO_EDGE | GL.REPEAT | GL.MIRRORED_REPEAT;
+    /** Magnification filter. */
     magFilter?: GL.NEAREST | GL.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;
 };
+/** Converts a glTF sampler into luma.gl sampler props. */
 export declare function convertSampler(gltfSampler: GLTFSampler): SamplerProps;
 export {};
 //# sourceMappingURL=convert-webgl-sampler.d.ts.map

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,KAAK,WAAW,GAAG;IACjB,KAAK,CAAC,EAAE,EAAE,CAAC,aAAa,GAAG,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,eAAe,CAAC;IAC1D,KAAK,CAAC,EAAE,EAAE,CAAC,aAAa,GAAG,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,eAAe,CAAC;IAC1D,SAAS,CAAC,EAAE,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC;IACnC,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,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,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"}

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { GL } from '@luma.gl/constants';
+/** Converts a glTF sampler into luma.gl sampler props. */
 export function convertSampler(gltfSampler) {
     return {
         addressModeU: convertSamplerWrapMode(gltfSampler.wrapS),
@@ -10,6 +11,7 @@ export function convertSampler(gltfSampler) {
         ...convertSamplerMinFilter(gltfSampler.minFilter)
     };
 }
+/** Converts a glTF wrap enum into a luma.gl address mode. */
 function convertSamplerWrapMode(mode) {
     switch (mode) {
         case 33071:
@@ -22,6 +24,7 @@ function convertSamplerWrapMode(mode) {
             return undefined;
     }
 }
+/** Converts a glTF mag filter enum into a luma.gl mag filter. */
 function convertSamplerMagFilter(mode) {
     switch (mode) {
         case 9728:
@@ -32,6 +35,7 @@ function convertSamplerMagFilter(mode) {
             return undefined;
     }
 }
+/** Converts a glTF min filter enum into luma.gl minification and mipmap filters. */
 function convertSamplerMinFilter(mode) {
     switch (mode) {
         case 9728:

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;AAetC,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,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,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,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,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"}

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

@@ -1,4 +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,
@@ -8,5 +9,6 @@ export declare enum GLEnum {
     TRIANGLE_STRIP = 5,
     TRIANGLE_FAN = 6
 }
+/** 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,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,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;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"}

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

@@ -5,6 +5,7 @@
 // `@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";
@@ -15,6 +16,7 @@ export var GLEnum;
     GLEnum[GLEnum["TRIANGLE_STRIP"] = 5] = "TRIANGLE_STRIP";
     GLEnum[GLEnum["TRIANGLE_FAN"] = 6] = "TRIANGLE_FAN";
 })(GLEnum || (GLEnum = {}));
+/** Converts a WebGL draw mode into a luma.gl primitive topology string. */
 export function convertGLDrawModeToTopology(drawMode) {
     // prettier-ignore
     switch (drawMode) {

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,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,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;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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/gltf",
-  "version": "9.3.0-alpha.4",
+  "version": "9.3.0-alpha.6",
   "description": "glTF support for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -46,10 +46,10 @@
     "@luma.gl/shadertools": "9.2.0-alpha.6"
   },
   "dependencies": {
-    "@loaders.gl/core": "^4.2.0",
-    "@loaders.gl/gltf": "^4.2.0",
-    "@loaders.gl/textures": "^4.2.0",
+    "@loaders.gl/core": "4.4.0-alpha.18",
+    "@loaders.gl/gltf": "4.4.0-alpha.18",
+    "@loaders.gl/textures": "4.4.0-alpha.18",
     "@math.gl/core": "^4.1.0"
   },
-  "gitHead": "7486e7b0377fb6ab961b4499828681bede60f3b1"
+  "gitHead": "59fda5480c4d0bb3d64545d4621175221f2b6c7c"
 }

package/src/gltf/animations/animations.ts

@@ -2,21 +2,33 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {GLTFNodePostprocessed} from '@loaders.gl/gltf';
-
+/** Parsed glTF animation definition. */
 export type GLTFAnimation = {
+  /** Application-visible animation name. */
   name: string;
+  /** Channels that drive individual node properties. */
   channels: GLTFAnimationChannel[];
 };
 
+/** Supported glTF animation target paths. */
+export type GLTFAnimationPath = 'translation' | 'rotation' | 'scale' | 'weights';
+
+/** Parsed glTF animation channel. */
 export type GLTFAnimationChannel = {
-  path: 'translation' | 'rotation' | 'scale' | 'weights';
+  /** Node property written by this channel. */
+  path: GLTFAnimationPath;
+  /** Time/value sampler used to evaluate the channel. */
   sampler: GLTFAnimationSampler;
-  target: GLTFNodePostprocessed;
+  /** Target node identifier in the generated scenegraph. */
+  targetNodeId: string;
 };
 
+/** Parsed glTF animation sampler. */
 export type GLTFAnimationSampler = {
+  /** Keyframe times in seconds. */
   input: number[];
+  /** glTF interpolation mode. */
   interpolation: string;
-  output: number[] | number[][];
+  /** Keyframe values, already expanded into JS arrays. */
+  output: number[][];
 };

package/src/gltf/animations/interpolate.ts

@@ -1,15 +1,36 @@
-import {GLTFNodePostprocessed} from '@loaders.gl/gltf';
 import {log} from '@luma.gl/core';
 import {Quaternion} from '@math.gl/core';
-import {GLTFAnimationChannel, GLTFAnimationSampler} from './animations';
+import {GLTFAnimationPath, GLTFAnimationSampler} from './animations';
+import {GroupNode} from '@luma.gl/engine';
 
-const scratchQuaternion = new Quaternion();
+/** Applies an evaluated animation value to a scenegraph node. */
+function updateTargetPath(
+  target: GroupNode,
+  path: GLTFAnimationPath,
+  newValue: number[]
+): GroupNode | null {
+  switch (path) {
+    case 'translation':
+      return target.setPosition(newValue).updateMatrix();
 
+    case 'rotation':
+      return target.setRotation(newValue).updateMatrix();
+
+    case 'scale':
+      return target.setScale(newValue).updateMatrix();
+
+    default:
+      log.warn(`Bad animation path ${path}`)();
+      return null;
+  }
+}
+
+/** Evaluates a glTF animation sampler at the supplied time and applies the result to a node. */
 export function interpolate(
   time: number,
   {input, interpolation, output}: GLTFAnimationSampler,
-  target: GLTFNodePostprocessed,
-  path: GLTFAnimationChannel['path']
+  target: GroupNode,
+  path: GLTFAnimationPath
 ) {
   const maxTime = input[input.length - 1];
   const animationTime = time % maxTime;
@@ -17,44 +38,18 @@ export function interpolate(
   const nextIndex = input.findIndex(t => t >= animationTime);
   const previousIndex = Math.max(0, nextIndex - 1);
 
-  if (!Array.isArray(target[path])) {
-    switch (path) {
-      case 'translation':
-        target[path] = [0, 0, 0];
-        break;
-
-      case 'rotation':
-        target[path] = [0, 0, 0, 1];
-        break;
-
-      case 'scale':
-        target[path] = [1, 1, 1];
-        break;
-
-      default:
-        log.warn(`Bad animation path ${path}`)();
-    }
-  }
-
-  // assert(target[path].length === output[previousIndex].length);
   const previousTime = input[previousIndex];
   const nextTime = input[nextIndex];
 
   switch (interpolation) {
     case 'STEP':
-      stepInterpolate(target, path, output[previousIndex] as number[]);
+      stepInterpolate(target, path, output[previousIndex]);
       break;
 
     case 'LINEAR':
       if (nextTime > previousTime) {
         const ratio = (animationTime - previousTime) / (nextTime - previousTime);
-        linearInterpolate(
-          target,
-          path,
-          output[previousIndex] as number[],
-          output[nextIndex] as number[],
-          ratio
-        );
+        linearInterpolate(target, path, output[previousIndex], output[nextIndex], ratio);
       }
       break;
 
@@ -63,10 +58,10 @@ export function interpolate(
         const ratio = (animationTime - previousTime) / (nextTime - previousTime);
         const tDiff = nextTime - previousTime;
 
-        const p0 = output[3 * previousIndex + 1] as number[];
-        const outTangent0 = output[3 * previousIndex + 2] as number[];
-        const inTangent1 = output[3 * nextIndex + 0] as number[];
-        const p1 = output[3 * nextIndex + 1] as number[];
+        const p0 = output[3 * previousIndex + 1];
+        const outTangent0 = output[3 * previousIndex + 2];
+        const inTangent1 = output[3 * nextIndex + 0];
+        const p1 = output[3 * nextIndex + 1];
 
         cubicsplineInterpolate(target, path, {p0, outTangent0, inTangent1, p1, tDiff, ratio});
       }
@@ -78,34 +73,31 @@ export function interpolate(
   }
 }
 
+/** Applies linear interpolation between two keyframes. */
 function linearInterpolate(
-  target: GLTFNodePostprocessed,
-  path: GLTFAnimationChannel['path'],
+  target: GroupNode,
+  path: GLTFAnimationPath,
   start: number[],
   stop: number[],
   ratio: number
 ) {
-  if (!target[path]) {
-    throw new Error();
-  }
-
   if (path === 'rotation') {
     // SLERP when path is rotation
-    scratchQuaternion.slerp({start, target: stop, ratio});
-    for (let i = 0; i < scratchQuaternion.length; i++) {
-      target[path][i] = scratchQuaternion[i];
-    }
+    updateTargetPath(target, path, new Quaternion().slerp({start, target: stop, ratio}));
   } else {
     // regular interpolation
+    const newVal = [];
     for (let i = 0; i < start.length; i++) {
-      target[path][i] = ratio * stop[i] + (1 - ratio) * start[i];
+      newVal[i] = ratio * stop[i] + (1 - ratio) * start[i];
     }
+    updateTargetPath(target, path, newVal);
   }
 }
 
+/** Applies glTF cubic spline interpolation between two keyframes. */
 function cubicsplineInterpolate(
-  target: GLTFNodePostprocessed,
-  path: GLTFAnimationChannel['path'],
+  target: GroupNode,
+  path: GLTFAnimationPath,
   {
     p0,
     outTangent0,
@@ -122,32 +114,21 @@ function cubicsplineInterpolate(
     ratio: number;
   }
 ) {
-  if (!target[path]) {
-    throw new Error();
-  }
-
   // TODO: Quaternion might need normalization
-  for (let i = 0; i < target[path].length; i++) {
+  const newVal = [];
+  for (let i = 0; i < p0.length; i++) {
     const m0 = outTangent0[i] * tDiff;
     const m1 = inTangent1[i] * tDiff;
-    target[path][i] =
+    newVal[i] =
       (2 * Math.pow(t, 3) - 3 * Math.pow(t, 2) + 1) * p0[i] +
       (Math.pow(t, 3) - 2 * Math.pow(t, 2) + t) * m0 +
       (-2 * Math.pow(t, 3) + 3 * Math.pow(t, 2)) * p1[i] +
       (Math.pow(t, 3) - Math.pow(t, 2)) * m1;
   }
+  updateTargetPath(target, path, newVal);
 }
 
-function stepInterpolate(
-  target: GLTFNodePostprocessed,
-  path: GLTFAnimationChannel['path'],
-  value: number[]
-) {
-  if (!target[path]) {
-    throw new Error();
-  }
-
-  for (let i = 0; i < value.length; i++) {
-    target[path][i] = value[i];
-  }
+/** Applies step interpolation by copying the current keyframe value. */
+function stepInterpolate(target: GroupNode, path: GLTFAnimationPath, value: number[]) {
+  updateTargetPath(target, path, value);
 }

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

@@ -3,55 +3,93 @@
 // Copyright (c) vis.gl contributors
 
 import {Device, type RenderPipelineParameters, log} from '@luma.gl/core';
-import {pbrMaterial, ShaderModule} from '@luma.gl/shadertools';
+import {pbrMaterial, skin} from '@luma.gl/shadertools';
 import {Geometry, Model, ModelNode, type ModelProps} from '@luma.gl/engine';
 import {type ParsedPBRMaterial} from '../pbr/pbr-material';
 
 const SHADER = /* WGSL */ `
-layout(0) positions: vec4; // in vec4 POSITION;
-
-  #ifdef HAS_NORMALS
-    in vec4 normals; // in vec4 NORMAL;
-  #endif
-
-  #ifdef HAS_TANGENTS
-    in vec4 TANGENT;
-  #endif
+struct VertexInputs {
+  @location(0) positions: vec3f,
+#ifdef HAS_NORMALS
+  @location(1) normals: vec3f,
+#endif
+#ifdef HAS_TANGENTS
+  @location(2) TANGENT: vec4f,
+#endif
+#ifdef HAS_UV
+  @location(3) texCoords: vec2f,
+#endif
+#ifdef HAS_SKIN
+  @location(4) JOINTS_0: vec4u,
+  @location(5) WEIGHTS_0: vec4f,
+#endif
+};
 
-  #ifdef HAS_UV
-    // in vec2 TEXCOORD_0;
-    in vec2 texCoords;
-  #endif
+struct FragmentInputs {
+  @builtin(position) position: vec4f,
+  @location(0) pbrPosition: vec3f,
+  @location(1) pbrUV: vec2f,
+  @location(2) pbrNormal: vec3f,
+#ifdef HAS_TANGENTS
+  @location(3) pbrTangent: vec4f,
+#endif
+};
 
 @vertex
-  void main(void) {
-    vec4 _NORMAL = vec4(0.);
-    vec4 _TANGENT = vec4(0.);
-    vec2 _TEXCOORD_0 = vec2(0.);
-
-    #ifdef HAS_NORMALS
-      _NORMAL = normals;
-    #endif
-
-    #ifdef HAS_TANGENTS
-      _TANGENT = TANGENT;
-    #endif
-
-    #ifdef HAS_UV
-      _TEXCOORD_0 = texCoords;
-    #endif
-
-    pbr_setPositionNormalTangentUV(positions, _NORMAL, _TANGENT, _TEXCOORD_0);
-    gl_Position = u_MVPMatrix * positions;
-  }
+fn vertexMain(inputs: VertexInputs) -> FragmentInputs {
+  var outputs: FragmentInputs;
+  var position = vec4f(inputs.positions, 1.0);
+  var normal = vec3f(0.0, 0.0, 1.0);
+  var tangent = vec4f(1.0, 0.0, 0.0, 1.0);
+  var uv = vec2f(0.0, 0.0);
+
+#ifdef HAS_NORMALS
+  normal = inputs.normals;
+#endif
+#ifdef HAS_UV
+  uv = inputs.texCoords;
+#endif
+#ifdef HAS_TANGENTS
+  tangent = inputs.TANGENT;
+#endif
+#ifdef HAS_SKIN
+  let skinMatrix = getSkinMatrix(inputs.WEIGHTS_0, inputs.JOINTS_0);
+  position = skinMatrix * position;
+  normal = normalize((skinMatrix * vec4f(normal, 0.0)).xyz);
+#ifdef HAS_TANGENTS
+  tangent = vec4f(normalize((skinMatrix * vec4f(tangent.xyz, 0.0)).xyz), tangent.w);
+#endif
+#endif
+
+  let worldPosition = pbrProjection.modelMatrix * position;
+
+#ifdef HAS_NORMALS
+  normal = normalize((pbrProjection.normalMatrix * vec4f(normal, 0.0)).xyz);
+#endif
+#ifdef HAS_TANGENTS
+  let worldTangent = normalize((pbrProjection.modelMatrix * vec4f(tangent.xyz, 0.0)).xyz);
+  outputs.pbrTangent = vec4f(worldTangent, tangent.w);
+#endif
+
+  outputs.position = pbrProjection.modelViewProjectionMatrix * position;
+  outputs.pbrPosition = worldPosition.xyz / worldPosition.w;
+  outputs.pbrUV = uv;
+  outputs.pbrNormal = normal;
+  return outputs;
+}
 
 @fragment
-  out vec4 fragmentColor;
-
-  void main(void) {
-    vec3 pos = pbr_vPosition;
-    fragmentColor = pbr_filterColor(vec4(1.0));
-  }
+fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
+  fragmentInputs.pbr_vPosition = inputs.pbrPosition;
+  fragmentInputs.pbr_vUV = inputs.pbrUV;
+  fragmentInputs.pbr_vNormal = inputs.pbrNormal;
+#ifdef HAS_TANGENTS
+  let tangent = normalize(inputs.pbrTangent.xyz);
+  let bitangent = normalize(cross(inputs.pbrNormal, tangent)) * inputs.pbrTangent.w;
+  fragmentInputs.pbr_vTBN = mat3x3f(tangent, bitangent, inputs.pbrNormal);
+#endif
+  return pbr_filterColor(vec4f(1.0));
+}
 `;
 
 // TODO rename attributes to POSITION/NORMAL etc
@@ -76,6 +114,11 @@ const vs = /* glsl */ `\
     in vec2 texCoords;
   #endif
 
+  #ifdef HAS_SKIN
+    in uvec4 JOINTS_0;
+    in vec4 WEIGHTS_0;
+  #endif
+
   void main(void) {
     vec4 _NORMAL = vec4(0.);
     vec4 _TANGENT = vec4(0.);
@@ -93,8 +136,17 @@ const vs = /* glsl */ `\
       _TEXCOORD_0 = texCoords;
     #endif
 
-    pbr_setPositionNormalTangentUV(positions, _NORMAL, _TANGENT, _TEXCOORD_0);
-    gl_Position = pbrProjection.modelViewProjectionMatrix * positions;
+    vec4 pos = positions;
+
+    #ifdef HAS_SKIN
+      mat4 skinMat = getSkinMatrix(WEIGHTS_0, JOINTS_0);
+      pos = skinMat * pos;
+      _NORMAL = skinMat * _NORMAL;
+      _TANGENT = vec4((skinMat * vec4(_TANGENT.xyz, 0.)).xyz, _TANGENT.w);
+    #endif
+
+    pbr_setPositionNormalTangentUV(pos, _NORMAL, _TANGENT, _TEXCOORD_0);
+    gl_Position = pbrProjection.modelViewProjectionMatrix * pos;
   }
 `;
 
@@ -108,11 +160,17 @@ const fs = /* glsl */ `\
   }
 `;
 
+/** Options used to instantiate a `ModelNode` for one glTF primitive. */
 export type CreateGLTFModelOptions = {
+  /** Optional id assigned to the generated model. */
   id?: string;
+  /** Vertex count override for non-indexed primitives. */
   vertexCount?: number;
+  /** Geometry converted from the glTF primitive. */
   geometry: Geometry;
+  /** Parsed PBR material state for the primitive. */
   parsedPPBRMaterial: ParsedPBRMaterial;
+  /** Additional model props merged into the generated model. */
   modelOptions?: Partial<ModelProps>;
 };
 
@@ -144,7 +202,7 @@ export function createGLTFModel(device: Device, options: CreateGLTFModelOptions)
     geometry,
     topology: geometry.topology,
     vertexCount,
-    modules: [pbrMaterial as unknown as ShaderModule],
+    modules: [pbrMaterial, skin],
     ...modelOptions,
 
     defines: {...parsedPPBRMaterial.defines, ...modelOptions.defines},

package/src/gltf/create-scenegraph-from-gltf.ts

@@ -10,22 +10,50 @@ import {parseGLTF, type ParseGLTFOptions} from '../parsers/parse-gltf';
 import {parseGLTFLights} from '../parsers/parse-gltf-lights';
 import {GLTFAnimator} from './gltf-animator';
 import {parseGLTFAnimations} from '../parsers/parse-gltf-animations';
-import {deepCopy} from '../utils/deep-copy';
 
+/** Scenegraph bundle returned from a parsed glTF asset. */
+export type GLTFScenegraphs = {
+  /** Scene roots produced from the glTF scenes array. */
+  scenes: GroupNode[];
+  /** Animation controller for glTF animations. */
+  animator: GLTFAnimator;
+  /** Parsed punctual lights from the asset. */
+  lights: Light[];
+
+  /** Map from glTF mesh ids to generated mesh group nodes. */
+  gltfMeshIdToNodeMap: Map<string, GroupNode>;
+  /** Map from glTF node indices to generated scenegraph nodes. */
+  gltfNodeIndexToNodeMap: Map<number, GroupNode>;
+  /** Map from glTF node ids to generated scenegraph nodes. */
+  gltfNodeIdToNodeMap: Map<string, GroupNode>;
+
+  /** Original post-processed glTF document. */
+  gltf: GLTFPostprocessed;
+};
+
+/** Converts a post-processed glTF asset into luma.gl scenegraph nodes and animation helpers. */
 export function createScenegraphsFromGLTF(
   device: Device,
   gltf: GLTFPostprocessed,
   options?: ParseGLTFOptions
-): {
-  scenes: GroupNode[];
-  animator: GLTFAnimator;
-  lights: Light[];
-} {
-  gltf = deepCopy(gltf);
-  const scenes = parseGLTF(device, gltf, options);
-  // Note: There is a nasty dependency on injected nodes in the glTF
+): GLTFScenegraphs {
+  const {scenes, gltfMeshIdToNodeMap, gltfNodeIdToNodeMap, gltfNodeIndexToNodeMap} = parseGLTF(
+    device,
+    gltf,
+    options
+  );
+
   const animations = parseGLTFAnimations(gltf);
-  const animator = new GLTFAnimator({animations});
+  const animator = new GLTFAnimator({animations, gltfNodeIdToNodeMap});
   const lights = parseGLTFLights(gltf);
-  return {scenes, animator, lights};
+
+  return {
+    scenes,
+    animator,
+    lights,
+    gltfMeshIdToNodeMap,
+    gltfNodeIdToNodeMap,
+    gltfNodeIndexToNodeMap,
+    gltf
+  };
 }