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

package/dist/gltf/create-gltf-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-gltf-model.d.ts","sourceRoot":"","sources":["../../src/gltf/create-gltf-model.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAqC,MAAM,eAAe,CAAC;AAEzE,OAAO,EAAC,QAAQ,EAAS,SAAS,EAAE,KAAK,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAC,KAAK,iBAAiB,EAAC,+BAA4B;AAuG3D,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,kBAAkB,EAAE,iBAAiB,CAAC;IACtC,YAAY,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CACpC,CAAC;AAEF,4CAA4C;AAC5C,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB,GAAG,SAAS,CA6C1F"}
+{"version":3,"file":"create-gltf-model.d.ts","sourceRoot":"","sources":["../../src/gltf/create-gltf-model.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAqC,MAAM,eAAe,CAAC;AAEzE,OAAO,EAAC,QAAQ,EAAS,SAAS,EAAE,KAAK,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAC,KAAK,iBAAiB,EAAC,+BAA4B;AA2J3D,wEAAwE;AACxE,MAAM,MAAM,sBAAsB,GAAG;IACnC,mDAAmD;IACnD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kDAAkD;IAClD,QAAQ,EAAE,QAAQ,CAAC;IACnB,mDAAmD;IACnD,kBAAkB,EAAE,iBAAiB,CAAC;IACtC,8DAA8D;IAC9D,YAAY,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CACpC,CAAC;AAEF,4CAA4C;AAC5C,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB,GAAG,SAAS,CA6C1F"}

package/dist/gltf/create-gltf-model.js

@@ -2,53 +2,91 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { log } from '@luma.gl/core';
-import { pbrMaterial } from '@luma.gl/shadertools';
+import { pbrMaterial, skin } from '@luma.gl/shadertools';
 import { Model, ModelNode } from '@luma.gl/engine';
 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
-
-  #ifdef HAS_UV
-    // in vec2 TEXCOORD_0;
-    in vec2 texCoords;
-  #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
+};
+
+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
 // See gpu-geometry.ts: getAttributeBuffersFromGeometry()
@@ -72,6 +110,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.);
@@ -89,8 +132,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;
   }
 `;
 const fs = /* glsl */ `\
@@ -126,7 +178,7 @@ export function createGLTFModel(device, options) {
         geometry,
         topology: geometry.topology,
         vertexCount,
-        modules: [pbrMaterial],
+        modules: [pbrMaterial, skin],
         ...modelOptions,
         defines: { ...parsedPPBRMaterial.defines, ...modelOptions.defines },
         parameters: { ...parameters, ...parsedPPBRMaterial.parameters, ...modelOptions.parameters }

package/dist/gltf/create-gltf-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-gltf-model.js","sourceRoot":"","sources":["../../src/gltf/create-gltf-model.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAwC,GAAG,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,EAAC,WAAW,EAAe,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAW,KAAK,EAAE,SAAS,EAAkB,MAAM,iBAAiB,CAAC;AAG5E,MAAM,MAAM,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6CzB,CAAC;AAEF,gDAAgD;AAChD,yDAAyD;AACzD,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCrB,CAAC;AAEF,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;CAQrB,CAAC;AAUF,4CAA4C;AAC5C,MAAM,UAAU,eAAe,CAAC,MAAc,EAAE,OAA+B;IAC7E,MAAM,EAAC,EAAE,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,EAAC,GAAG,OAAO,CAAC;IAEnF,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,2BAA2B,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;IAEvE,6BAA6B;IAC7B,sDAAsD;IACtD,4DAA4D;IAC5D,MAAM,gBAAgB,GAAU,EAAE,CAAC;IACnC,8DAA8D;IAC9D,4FAA4F;IAE5F,MAAM,UAAU,GAA6B;QAC3C,iBAAiB,EAAE,IAAI;QACvB,YAAY,EAAE,MAAM;QACpB,WAAW,EAAE,aAAa;QAC1B,QAAQ,EAAE,MAAM;KACjB,CAAC;IAEF,MAAM,UAAU,GAAe;QAC7B,EAAE;QACF,MAAM,EAAE,MAAM;QACd,EAAE;QACF,EAAE;QACF,QAAQ;QACR,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,WAAW;QACX,OAAO,EAAE,CAAC,WAAsC,CAAC;QACjD,GAAG,YAAY;QAEf,OAAO,EAAE,EAAC,GAAG,kBAAkB,CAAC,OAAO,EAAE,GAAG,YAAY,CAAC,OAAO,EAAC;QACjE,UAAU,EAAE,EAAC,GAAG,UAAU,EAAE,GAAG,kBAAkB,CAAC,UAAU,EAAE,GAAG,YAAY,CAAC,UAAU,EAAC;KAC1F,CAAC;IAEF,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C,MAAM,EAAC,MAAM,EAAE,GAAG,gBAAgB,EAAC,GAAG;QACpC,GAAG,kBAAkB,CAAC,QAAQ;QAC9B,GAAG,YAAY,CAAC,QAAQ;QACxB,GAAG,kBAAkB,CAAC,QAAQ;QAC9B,GAAG,YAAY,CAAC,QAAQ;KACzB,CAAC;IAEF,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAC,MAAM,EAAC,EAAC,CAAC,CAAC;IACtF,OAAO,IAAI,SAAS,CAAC,EAAC,gBAAgB,EAAE,KAAK,EAAC,CAAC,CAAC;AAClD,CAAC"}
+{"version":3,"file":"create-gltf-model.js","sourceRoot":"","sources":["../../src/gltf/create-gltf-model.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAwC,GAAG,EAAC,MAAM,eAAe,CAAC;AACzE,OAAO,EAAC,WAAW,EAAE,IAAI,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAW,KAAK,EAAE,SAAS,EAAkB,MAAM,iBAAiB,CAAC;AAG5E,MAAM,MAAM,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmFzB,CAAC;AAEF,gDAAgD;AAChD,yDAAyD;AACzD,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDrB,CAAC;AAEF,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;CAQrB,CAAC;AAgBF,4CAA4C;AAC5C,MAAM,UAAU,eAAe,CAAC,MAAc,EAAE,OAA+B;IAC7E,MAAM,EAAC,EAAE,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,GAAG,EAAE,EAAC,GAAG,OAAO,CAAC;IAEnF,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,2BAA2B,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;IAEvE,6BAA6B;IAC7B,sDAAsD;IACtD,4DAA4D;IAC5D,MAAM,gBAAgB,GAAU,EAAE,CAAC;IACnC,8DAA8D;IAC9D,4FAA4F;IAE5F,MAAM,UAAU,GAA6B;QAC3C,iBAAiB,EAAE,IAAI;QACvB,YAAY,EAAE,MAAM;QACpB,WAAW,EAAE,aAAa;QAC1B,QAAQ,EAAE,MAAM;KACjB,CAAC;IAEF,MAAM,UAAU,GAAe;QAC7B,EAAE;QACF,MAAM,EAAE,MAAM;QACd,EAAE;QACF,EAAE;QACF,QAAQ;QACR,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,WAAW;QACX,OAAO,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC;QAC5B,GAAG,YAAY;QAEf,OAAO,EAAE,EAAC,GAAG,kBAAkB,CAAC,OAAO,EAAE,GAAG,YAAY,CAAC,OAAO,EAAC;QACjE,UAAU,EAAE,EAAC,GAAG,UAAU,EAAE,GAAG,kBAAkB,CAAC,UAAU,EAAE,GAAG,YAAY,CAAC,UAAU,EAAC;KAC1F,CAAC;IAEF,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C,MAAM,EAAC,MAAM,EAAE,GAAG,gBAAgB,EAAC,GAAG;QACpC,GAAG,kBAAkB,CAAC,QAAQ;QAC9B,GAAG,YAAY,CAAC,QAAQ;QACxB,GAAG,kBAAkB,CAAC,QAAQ;QAC9B,GAAG,YAAY,CAAC,QAAQ;KACzB,CAAC;IAEF,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAC,MAAM,EAAC,EAAC,CAAC,CAAC;IACtF,OAAO,IAAI,SAAS,CAAC,EAAC,gBAAgB,EAAE,KAAK,EAAC,CAAC,CAAC;AAClD,CAAC"}

package/dist/gltf/create-scenegraph-from-gltf.d.ts

@@ -4,9 +4,23 @@ import { GLTFPostprocessed } from '@loaders.gl/gltf';
 import { Light } from '@luma.gl/shadertools';
 import { type ParseGLTFOptions } from "../parsers/parse-gltf.js";
 import { GLTFAnimator } from "./gltf-animator.js";
-export declare function createScenegraphsFromGLTF(device: Device, gltf: GLTFPostprocessed, options?: ParseGLTFOptions): {
+/** 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 declare function createScenegraphsFromGLTF(device: Device, gltf: GLTFPostprocessed, options?: ParseGLTFOptions): GLTFScenegraphs;
 //# sourceMappingURL=create-scenegraph-from-gltf.d.ts.map

package/dist/gltf/create-scenegraph-from-gltf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-scenegraph-from-gltf.d.ts","sourceRoot":"","sources":["../../src/gltf/create-scenegraph-from-gltf.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAY,KAAK,gBAAgB,EAAC,iCAA8B;AAEvE,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAI7C,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACzB;IACD,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAQA"}
+{"version":3,"file":"create-scenegraph-from-gltf.d.ts","sourceRoot":"","sources":["../../src/gltf/create-scenegraph-from-gltf.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAY,KAAK,gBAAgB,EAAC,iCAA8B;AAEvE,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAG7C,2DAA2D;AAC3D,MAAM,MAAM,eAAe,GAAG;IAC5B,uDAAuD;IACvD,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,gDAAgD;IAChD,QAAQ,EAAE,YAAY,CAAC;IACvB,6CAA6C;IAC7C,MAAM,EAAE,KAAK,EAAE,CAAC;IAEhB,4DAA4D;IAC5D,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5C,gEAAgE;IAChE,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC/C,4DAA4D;IAC5D,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAE5C,6CAA6C;IAC7C,IAAI,EAAE,iBAAiB,CAAC;CACzB,CAAC;AAEF,gGAAgG;AAChG,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACzB,eAAe,CAoBjB"}

package/dist/gltf/create-scenegraph-from-gltf.js

@@ -5,14 +5,20 @@ import { parseGLTF } from "../parsers/parse-gltf.js";
 import { parseGLTFLights } from "../parsers/parse-gltf-lights.js";
 import { GLTFAnimator } from "./gltf-animator.js";
 import { parseGLTFAnimations } from "../parsers/parse-gltf-animations.js";
-import { deepCopy } from "../utils/deep-copy.js";
+/** Converts a post-processed glTF asset into luma.gl scenegraph nodes and animation helpers. */
 export function createScenegraphsFromGLTF(device, gltf, options) {
-    gltf = deepCopy(gltf);
-    const scenes = parseGLTF(device, gltf, options);
-    // Note: There is a nasty dependency on injected nodes in the glTF
+    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
+    };
 }
 //# sourceMappingURL=create-scenegraph-from-gltf.js.map

package/dist/gltf/create-scenegraph-from-gltf.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-scenegraph-from-gltf.js","sourceRoot":"","sources":["../../src/gltf/create-scenegraph-from-gltf.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAMpC,OAAO,EAAC,SAAS,EAAwB,iCAA8B;AACvE,OAAO,EAAC,eAAe,EAAC,wCAAqC;AAC7D,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,mBAAmB,EAAC,4CAAyC;AACrE,OAAO,EAAC,QAAQ,EAAC,8BAA2B;AAE5C,MAAM,UAAU,yBAAyB,CACvC,MAAc,EACd,IAAuB,EACvB,OAA0B;IAM1B,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAChD,kEAAkE;IAClE,MAAM,UAAU,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,EAAC,UAAU,EAAC,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"create-scenegraph-from-gltf.js","sourceRoot":"","sources":["../../src/gltf/create-scenegraph-from-gltf.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAMpC,OAAO,EAAC,SAAS,EAAwB,iCAA8B;AACvE,OAAO,EAAC,eAAe,EAAC,wCAAqC;AAC7D,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAC7C,OAAO,EAAC,mBAAmB,EAAC,4CAAyC;AAsBrE,gGAAgG;AAChG,MAAM,UAAU,yBAAyB,CACvC,MAAc,EACd,IAAuB,EACvB,OAA0B;IAE1B,MAAM,EAAC,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,sBAAsB,EAAC,GAAG,SAAS,CAC1F,MAAM,EACN,IAAI,EACJ,OAAO,CACR,CAAC;IAEF,MAAM,UAAU,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,EAAC,UAAU,EAAE,mBAAmB,EAAC,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAErC,OAAO;QACL,MAAM;QACN,QAAQ;QACR,MAAM;QACN,mBAAmB;QACnB,mBAAmB;QACnB,sBAAsB;QACtB,IAAI;KACL,CAAC;AACJ,CAAC"}

package/dist/gltf/gltf-animator.d.ts

@@ -1,27 +1,53 @@
+import { GroupNode } from '@luma.gl/engine';
 import { GLTFAnimation } from "./animations/animations.js";
+/** Construction props for a single glTF animation controller. */
 type GLTFSingleAnimatorProps = {
+    /** Animation data to evaluate. */
     animation: GLTFAnimation;
+    /** Mapping from glTF node ids to scenegraph nodes. */
+    gltfNodeIdToNodeMap: Map<string, GroupNode>;
+    /** Start time in seconds. */
     startTime?: number;
+    /** Whether playback is active. */
     playing?: boolean;
+    /** Playback speed multiplier. */
     speed?: number;
 };
+/** Evaluates one glTF animation against the generated scenegraph. */
 declare class GLTFSingleAnimator {
+    /** Animation definition being played. */
     animation: GLTFAnimation;
+    /** Target scenegraph lookup table. */
+    gltfNodeIdToNodeMap: Map<string, GroupNode>;
+    /** Playback start time in seconds. */
     startTime: number;
+    /** Whether playback is currently enabled. */
     playing: boolean;
+    /** Playback speed multiplier. */
     speed: number;
+    /** Creates a single-animation controller. */
     constructor(props: GLTFSingleAnimatorProps);
+    /** Advances the animation to the supplied wall-clock time in milliseconds. */
     setTime(timeMs: number): void;
 }
+/** Construction props for {@link GLTFAnimator}. */
 export type GLTFAnimatorProps = {
+    /** Parsed animations from the source glTF. */
     animations: GLTFAnimation[];
+    /** Mapping from glTF node ids to scenegraph nodes. */
+    gltfNodeIdToNodeMap: Map<string, GroupNode>;
 };
+/** Coordinates playback of every animation found in a glTF scene. */
 export declare class GLTFAnimator {
+    /** Individual animation controllers. */
     animations: GLTFSingleAnimator[];
+    /** Creates an animator for the supplied glTF scenegraph. */
     constructor(props: GLTFAnimatorProps);
     /** @deprecated Use .setTime(). Will be removed (deck.gl is using this) */
     animate(time: number): void;
+    /** Advances every animation to the supplied wall-clock time in milliseconds. */
     setTime(time: number): void;
+    /** Returns the per-animation controllers managed by this animator. */
     getAnimations(): GLTFSingleAnimator[];
 }
 export {};

package/dist/gltf/gltf-animator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gltf-animator.d.ts","sourceRoot":"","sources":["../../src/gltf/gltf-animator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,aAAa,EAAC,mCAAgC;AAGtD,KAAK,uBAAuB,GAAG;IAC7B,SAAS,EAAE,aAAa,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,cAAM,kBAAkB;IACtB,SAAS,EAAE,aAAa,CAAC;IACzB,SAAS,EAAE,MAAM,CAAK;IACtB,OAAO,EAAE,OAAO,CAAQ;IACxB,KAAK,EAAE,MAAM,CAAK;gBAEN,KAAK,EAAE,uBAAuB;IAM1C,OAAO,CAAC,MAAM,EAAE,MAAM;CAavB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,aAAa,EAAE,CAAC;CAC7B,CAAC;AAEF,qBAAa,YAAY;IACvB,UAAU,EAAE,kBAAkB,EAAE,CAAC;gBAErB,KAAK,EAAE,iBAAiB;IASpC,0EAA0E;IAC1E,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK3B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI3B,aAAa;CAGd"}
+{"version":3,"file":"gltf-animator.d.ts","sourceRoot":"","sources":["../../src/gltf/gltf-animator.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,mCAAgC;AAGtD,iEAAiE;AACjE,KAAK,uBAAuB,GAAG;IAC7B,kCAAkC;IAClC,SAAS,EAAE,aAAa,CAAC;IACzB,sDAAsD;IACtD,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5C,6BAA6B;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kCAAkC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,qEAAqE;AACrE,cAAM,kBAAkB;IACtB,yCAAyC;IACzC,SAAS,EAAE,aAAa,CAAC;IACzB,sCAAsC;IACtC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5C,sCAAsC;IACtC,SAAS,EAAE,MAAM,CAAK;IACtB,6CAA6C;IAC7C,OAAO,EAAE,OAAO,CAAQ;IACxB,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAK;IAElB,6CAA6C;gBACjC,KAAK,EAAE,uBAAuB;IAO1C,8EAA8E;IAC9E,OAAO,CAAC,MAAM,EAAE,MAAM;CAiBvB;AAED,mDAAmD;AACnD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,8CAA8C;IAC9C,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,sDAAsD;IACtD,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC7C,CAAC;AAEF,qEAAqE;AACrE,qBAAa,YAAY;IACvB,wCAAwC;IACxC,UAAU,EAAE,kBAAkB,EAAE,CAAC;IAEjC,4DAA4D;gBAChD,KAAK,EAAE,iBAAiB;IAUpC,0EAA0E;IAC1E,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK3B,gFAAgF;IAChF,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI3B,sEAAsE;IACtE,aAAa;CAGd"}

package/dist/gltf/gltf-animator.js

@@ -2,36 +2,52 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { log } from '@luma.gl/core';
-import { Matrix4 } from '@math.gl/core';
 import { interpolate } from "./animations/interpolate.js";
+/** Evaluates one glTF animation against the generated scenegraph. */
 class GLTFSingleAnimator {
+    /** Animation definition being played. */
     animation;
+    /** Target scenegraph lookup table. */
+    gltfNodeIdToNodeMap;
+    /** Playback start time in seconds. */
     startTime = 0;
+    /** Whether playback is currently enabled. */
     playing = true;
+    /** Playback speed multiplier. */
     speed = 1;
+    /** Creates a single-animation controller. */
     constructor(props) {
         this.animation = props.animation;
+        this.gltfNodeIdToNodeMap = props.gltfNodeIdToNodeMap;
         this.animation.name ||= 'unnamed';
         Object.assign(this, props);
     }
+    /** Advances the animation to the supplied wall-clock time in milliseconds. */
     setTime(timeMs) {
         if (!this.playing) {
             return;
         }
         const absTime = timeMs / 1000;
         const time = (absTime - this.startTime) * this.speed;
-        this.animation.channels.forEach(({ sampler, target, path }) => {
-            interpolate(time, sampler, target, path);
-            applyTranslationRotationScale(target, target._node);
+        this.animation.channels.forEach(({ sampler, targetNodeId, path }) => {
+            const targetNode = this.gltfNodeIdToNodeMap.get(targetNodeId);
+            if (!targetNode) {
+                throw new Error(`Cannot find animation target node ${targetNodeId}`);
+            }
+            interpolate(time, sampler, targetNode, path);
         });
     }
 }
+/** Coordinates playback of every animation found in a glTF scene. */
 export class GLTFAnimator {
+    /** Individual animation controllers. */
     animations;
+    /** Creates an animator for the supplied glTF scenegraph. */
     constructor(props) {
         this.animations = props.animations.map((animation, index) => {
             const name = animation.name || `Animation-${index}`;
             return new GLTFSingleAnimator({
+                gltfNodeIdToNodeMap: props.gltfNodeIdToNodeMap,
                 animation: { name, channels: animation.channels }
             });
         });
@@ -41,26 +57,13 @@ export class GLTFAnimator {
         log.warn('GLTFAnimator#animate is deprecated. Use GLTFAnimator#setTime instead')();
         this.setTime(time);
     }
+    /** Advances every animation to the supplied wall-clock time in milliseconds. */
     setTime(time) {
         this.animations.forEach(animation => animation.setTime(time));
     }
+    /** Returns the per-animation controllers managed by this animator. */
     getAnimations() {
         return this.animations;
     }
 }
-// TODO: share with GLTFInstantiator
-const scratchMatrix = new Matrix4();
-function applyTranslationRotationScale(gltfNode, node) {
-    node.matrix.identity();
-    if (gltfNode.translation) {
-        node.matrix.translate(gltfNode.translation);
-    }
-    if (gltfNode.rotation) {
-        const rotationMatrix = scratchMatrix.fromQuaternion(gltfNode.rotation);
-        node.matrix.multiplyRight(rotationMatrix);
-    }
-    if (gltfNode.scale) {
-        node.matrix.scale(gltfNode.scale);
-    }
-}
 //# sourceMappingURL=gltf-animator.js.map

package/dist/gltf/gltf-animator.js.map

@@ -1 +1 @@
-{"version":3,"file":"gltf-animator.js","sourceRoot":"","sources":["../../src/gltf/gltf-animator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gltf-animator.js","sourceRoot":"","sources":["../../src/gltf/gltf-animator.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAC;AAGlC,OAAO,EAAC,WAAW,EAAC,oCAAiC;AAgBrD,qEAAqE;AACrE,MAAM,kBAAkB;IACtB,yCAAyC;IACzC,SAAS,CAAgB;IACzB,sCAAsC;IACtC,mBAAmB,CAAyB;IAC5C,sCAAsC;IACtC,SAAS,GAAW,CAAC,CAAC;IACtB,6CAA6C;IAC7C,OAAO,GAAY,IAAI,CAAC;IACxB,iCAAiC;IACjC,KAAK,GAAW,CAAC,CAAC;IAElB,6CAA6C;IAC7C,YAAY,KAA8B;QACxC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAC;QACrD,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,8EAA8E;IAC9E,OAAO,CAAC,MAAc;QACpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;QAC9B,MAAM,IAAI,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAErD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAC,EAAE,EAAE;YAChE,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC9D,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,qCAAqC,YAAY,EAAE,CAAC,CAAC;YACvE,CAAC;YAED,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAUD,qEAAqE;AACrE,MAAM,OAAO,YAAY;IACvB,wCAAwC;IACxC,UAAU,CAAuB;IAEjC,4DAA4D;IAC5D,YAAY,KAAwB;QAClC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YAC1D,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,IAAI,aAAa,KAAK,EAAE,CAAC;YACpD,OAAO,IAAI,kBAAkB,CAAC;gBAC5B,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;gBAC9C,SAAS,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAC;aAChD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,0EAA0E;IAC1E,OAAO,CAAC,IAAY;QAClB,GAAG,CAAC,IAAI,CAAC,sEAAsE,CAAC,EAAE,CAAC;QACnF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,gFAAgF;IAChF,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,sEAAsE;IACtE,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;CACF"}