@needle-tools/three-animation-pointer 1.1.2 → 1.1.3

package/CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.1.3]
+- Fix: morph target (blend shape) weight animation bound to the wrong object when a multi-material mesh is used by multiple nodes. three.js clones a shared mesh per node, so every node's `Group` has identically named submeshes; the submesh segment of `.nodes.<node>.<submesh>.morphTargetInfluences` was looked up from the mixer root instead of inside `<node>`, so all tracks bound to the first node's submeshes. Child names are now resolved within the already resolved node.
+
 ## [1.1.2] - 2026-06-17
 - Fix: don't mutate the `KHR_animation_pointer.pointer` value in `parser.json`. The resolved three.js property path is now kept in plugin-local state, so other plugins / app code can still read the original spec-defined pointer after load — by @0b5vr in [#2](https://github.com/needle-tools/three-animation-pointer/pull/2)
 

package/dist/three-animation-pointer.js

@@ -1,50 +1,50 @@
-import { InterpolateDiscrete as M, InterpolateLinear as F, AnimationClip as w, PropertyBinding as C, QuaternionKeyframeTrack as S, ColorKeyframeTrack as W, VectorKeyframeTrack as B, BooleanKeyframeTrack as D, NumberKeyframeTrack as E } from "three";
+import { InterpolateDiscrete as M, InterpolateLinear as F, AnimationClip as w, PropertyBinding as C, QuaternionKeyframeTrack as S, ColorKeyframeTrack as W, VectorKeyframeTrack as B, BooleanKeyframeTrack as D, NumberKeyframeTrack as O } from "three";
 const k = {
   node: "node",
   material: "material",
   camera: "camera",
   light: "light"
-}, R = "KHR_animation_pointer", O = {
+}, R = "KHR_animation_pointer", E = {
   // We use a custom interpolant (GLTFCubicSplineInterpolation) for CUBICSPLINE tracks. Each
   // keyframe track will be initialized with a default interpolation type, then modified.
   CUBICSPLINE: void 0,
   LINEAR: F,
   STEP: M
 };
-class z {
+class G {
   /** @type {import("three/examples/jsm/loaders/GLTFLoader").GLTFParser} */
-  constructor(a) {
-    this.name = R, this.parser = a, this.animationPointerResolver = null, this.pointerPathMap = /* @__PURE__ */ new Map();
+  constructor(r) {
+    this.name = R, this.parser = r, this.animationPointerResolver = null, this.pointerPathMap = /* @__PURE__ */ new Map();
   }
   /** 
    * @param {import("..").AnimationPointerResolver | null} animationPointerResolver
    */
-  setAnimationPointerResolver(a) {
-    return this.animationPointerResolver = a, this;
+  setAnimationPointerResolver(r) {
+    return this.animationPointerResolver = r, this;
   }
   /* DUPLICATE of functionality in GLTFLoader */
-  loadAnimationTargetFromChannel(a) {
-    const s = a.target, r = s.node !== void 0 ? s.node : s.id;
-    return this.parser.getDependency("node", r);
+  loadAnimationTargetFromChannel(r) {
+    const t = r.target, a = t.node !== void 0 ? t.node : t.id;
+    return this.parser.getDependency("node", a);
   }
-  loadAnimationTargetFromChannelWithAnimationPointer(a) {
+  loadAnimationTargetFromChannelWithAnimationPointer(r) {
     var o;
     L();
-    const s = a.target, r = s.extensions && s.extensions[R] && s.path && s.path === "pointer";
-    if (!r) return null;
-    let e, t = k.node, n;
-    if (r) {
-      const m = s.extensions[R];
+    const t = r.target, a = t.extensions && t.extensions[R] && t.path && t.path === "pointer";
+    if (!a) return null;
+    let e, s = k.node, n;
+    if (a) {
+      const m = t.extensions[R];
       let i = m.pointer;
       if (!i) {
-        console.warn("Invalid path", m, s);
+        console.warn("Invalid path", m, t);
         return;
       }
-      if (i.startsWith("/materials/") ? t = k.material : i.startsWith("/extensions/KHR_lights_punctual/lights/") ? t = k.light : i.startsWith("/cameras/") && (t = k.camera), n = this._tryResolveTargetId(i, t), n === null || isNaN(n)) {
+      if (i.startsWith("/materials/") ? s = k.material : i.startsWith("/extensions/KHR_lights_punctual/lights/") ? s = k.light : i.startsWith("/cameras/") && (s = k.camera), n = this._tryResolveTargetId(i, s), n === null || isNaN(n)) {
         console.warn("Failed resolving animation node id: " + n, i);
         return;
       }
-      switch (t) {
+      switch (s) {
         case k.material:
           const h = ("/materials/" + n.toString() + "/").length, y = i.substring(0, h);
           switch (e = i.substring(h), e) {
@@ -133,8 +133,8 @@ class z {
           i = y + e;
           break;
         case k.node:
-          const f = ("/nodes/" + n.toString() + "/").length, d = i.substring(0, f);
-          if (e = i.substring(f), e.startsWith("weights/")) {
+          const g = ("/nodes/" + n.toString() + "/").length, d = i.substring(0, g);
+          if (e = i.substring(g), e.startsWith("weights/")) {
             const l = e.substring(8);
             /^\d+$/.test(l) ? e = "morphTargetInfluences[" + l + "]" : console.warn(R + ": invalid weight index", e, i);
           } else
@@ -204,50 +204,50 @@ class z {
           break;
       }
       (o = this.animationPointerResolver) != null && o.resolvePath && (i = this.animationPointerResolver.resolvePath(i));
-      const v = m.pointer;
-      this.pointerPathMap.set(v, i);
+      const I = m.pointer;
+      this.pointerPathMap.set(I, i);
     }
     if (n == null || isNaN(n)) {
-      console.warn("Failed resolving animation node id: " + n, s);
+      console.warn("Failed resolving animation node id: " + n, t);
       return;
     }
     let u;
-    return t === k.node ? u = this.parser.getDependency("node", n) : t === k.material ? u = this.parser.getDependency("material", n) : t === k.light ? u = this.parser.getDependency("light", n) : t === k.camera ? u = this.parser.getDependency("camera", n) : console.error("Unhandled type", t), u;
+    return s === k.node ? u = this.parser.getDependency("node", n) : s === k.material ? u = this.parser.getDependency("material", n) : s === k.light ? u = this.parser.getDependency("light", n) : s === k.camera ? u = this.parser.getDependency("camera", n) : console.error("Unhandled type", s), u;
   }
-  createAnimationTracksWithAnimationPointer(a, s, r, e, t) {
+  createAnimationTracksWithAnimationPointer(r, t, a, e, s) {
     var d;
-    if (!(t.extensions && t.extensions[R] && t.path && t.path === "pointer")) return null;
-    const u = t.extensions[R].pointer;
+    if (!(s.extensions && s.extensions[R] && s.path && s.path === "pointer")) return null;
+    const u = s.extensions[R].pointer;
     let o = this.pointerPathMap.get(u);
     if (!o) return null;
     const m = [];
     o = o.replaceAll("/", ".");
     const i = o.split(".");
-    var h = a.name !== void 0 && a.name !== null ? a.name : a.uuid;
+    var h = r.name !== void 0 && r.name !== null ? r.name : r.uuid;
     if (i[2] = h, (d = i[3]) != null && d.startsWith("morphTargetInfluences")) {
       const p = i[3];
-      if (a.type === "Group") {
-        for (const c of a.children)
-          c.morphTargetInfluences && (i[3] = c.name, i[4] = p, f(this.parser));
+      if (r.type === "Group") {
+        for (const c of r.children)
+          c.morphTargetInfluences && (i[3] = c.name, i[4] = p, g(this.parser));
         return m;
       }
     }
-    f(this.parser);
+    g(this.parser);
     function y(p, c) {
       try {
-        const b = c.split(".").filter(Boolean), g = b[b.length - 1].replace(/\[.*\]$/, "");
-        return g in p ? typeof p[g] == "boolean" : !1;
+        const b = c.split(".").filter(Boolean), f = b[b.length - 1].replace(/\[.*\]$/, "");
+        return f in p ? typeof p[f] == "boolean" : !1;
       } catch {
         return !1;
       }
     }
-    function f(p) {
+    function g(p) {
       o = i.join(".");
       let c, b = !1;
-      switch (r.itemSize) {
+      switch (a.itemSize) {
         case 1:
-          Object.prototype.toString.call(r.array) === "[object Uint8Array]" && // UNSIGNED_BYTE as a strong hint
-          y(a, o) ? (c = D, b = !0) : c = E;
+          Object.prototype.toString.call(a.array) === "[object Uint8Array]" && // UNSIGNED_BYTE as a strong hint
+          y(r, o) ? (c = D, b = !0) : c = O;
           break;
         case 2:
         case 3:
@@ -258,36 +258,36 @@ class z {
           break;
       }
       if (!c) {
-        console.warn("Unsupported output accessor format", r);
+        console.warn("Unsupported output accessor format", a);
         return;
       }
-      const l = e.interpolation !== void 0 ? O[e.interpolation] : F;
-      let g = p._getArrayFromAccessor(r);
-      o.endsWith(".fov") && (g = g.map((x) => x / Math.PI * 180)), b && (g = g.map((x) => x > 0));
+      const l = e.interpolation !== void 0 ? E[e.interpolation] : F;
+      let f = p._getArrayFromAccessor(a);
+      o.endsWith(".fov") && (f = f.map((x) => x / Math.PI * 180)), b && (f = f.map((x) => x > 0));
       const _ = new c(
         o,
-        s.array,
-        g,
+        t.array,
+        f,
         l
       );
-      if (l === "CUBICSPLINE" && p._createCubicSplineTrackInterpolant(_), m.push(_), o && r.itemSize === 4 && o.startsWith(".materials.") && o.endsWith(".color")) {
-        const x = new Float32Array(g.length / 4);
-        for (let T = 0, K = g.length / 4; T < K; T += 1)
-          x[T] = g[T * 4 + 3];
-        const I = new c(
+      if (l === "CUBICSPLINE" && p._createCubicSplineTrackInterpolant(_), m.push(_), o && a.itemSize === 4 && o.startsWith(".materials.") && o.endsWith(".color")) {
+        const x = new Float32Array(f.length / 4);
+        for (let T = 0, A = f.length / 4; T < A; T += 1)
+          x[T] = f[T * 4 + 3];
+        const P = new c(
           o.replace(".color", ".opacity"),
-          s.array,
+          t.array,
           x,
           l
         );
-        l === "CUBICSPLINE" && p._createCubicSplineTrackInterpolant(_), m.push(I);
+        l === "CUBICSPLINE" && p._createCubicSplineTrackInterpolant(_), m.push(P);
       }
     }
     return m;
   }
-  _tryResolveTargetId(a, s) {
-    let r = "";
-    return s === "node" ? r = a.substring(7) : s === "material" ? r = a.substring(11) : s === "light" ? r = a.substring(39) : s === "camera" && (r = a.substring(9)), r = r.substring(0, r.indexOf("/")), Number.parseInt(r);
+  _tryResolveTargetId(r, t) {
+    let a = "";
+    return t === "node" ? a = r.substring(7) : t === "material" ? a = r.substring(11) : t === "light" ? a = r.substring(39) : t === "camera" && (a = r.substring(9)), a = a.substring(0, a.indexOf("/")), Number.parseInt(a);
   }
   /* MOSTLY DUPLICATE of GLTFLoader.loadAnimation, but also tries to resolve KHR_animation_pointer. */
   /**
@@ -295,73 +295,82 @@ class z {
    * @param {number} animationIndex
    * @return {Promise<AnimationClip>}
    */
-  loadAnimation(a) {
-    const s = this, r = this.parser.json, e = this.parser, t = r.animations[a], n = t.name ? t.name : "animation_" + a, u = [], o = [], m = [], i = [], v = [];
-    for (let h = 0, y = t.channels.length; h < y; h++) {
-      const f = t.channels[h], d = t.samplers[f.sampler], p = f.target, c = t.parameters !== void 0 ? t.parameters[d.input] : d.input, b = t.parameters !== void 0 ? t.parameters[d.output] : d.output;
-      let l = s.loadAnimationTargetFromChannelWithAnimationPointer(f);
-      l || (l = s.loadAnimationTargetFromChannel(f)), u.push(l), o.push(e.getDependency("accessor", c)), m.push(e.getDependency("accessor", b)), i.push(d), v.push(p);
+  loadAnimation(r) {
+    const t = this, a = this.parser.json, e = this.parser, s = a.animations[r], n = s.name ? s.name : "animation_" + r, u = [], o = [], m = [], i = [], I = [];
+    for (let h = 0, y = s.channels.length; h < y; h++) {
+      const g = s.channels[h], d = s.samplers[g.sampler], p = g.target, c = s.parameters !== void 0 ? s.parameters[d.input] : d.input, b = s.parameters !== void 0 ? s.parameters[d.output] : d.output;
+      let l = t.loadAnimationTargetFromChannelWithAnimationPointer(g);
+      l || (l = t.loadAnimationTargetFromChannel(g)), u.push(l), o.push(e.getDependency("accessor", c)), m.push(e.getDependency("accessor", b)), i.push(d), I.push(p);
     }
     return Promise.all([
       Promise.all(u),
       Promise.all(o),
       Promise.all(m),
       Promise.all(i),
-      Promise.all(v)
+      Promise.all(I)
     ]).then(function(h) {
-      const y = h[0], f = h[1], d = h[2], p = h[3], c = h[4], b = [];
-      for (let l = 0, g = y.length; l < g; l++) {
-        const _ = y[l], x = f[l], I = d[l], T = p[l], K = c[l];
+      const y = h[0], g = h[1], d = h[2], p = h[3], c = h[4], b = [];
+      for (let l = 0, f = y.length; l < f; l++) {
+        const _ = y[l], x = g[l], P = d[l], T = p[l], A = c[l];
         if (_ === void 0) continue;
         _.updateMatrix && (_.updateMatrix(), _.matrixAutoUpdate = !0);
-        let P = s.createAnimationTracksWithAnimationPointer(_, x, I, T, K);
-        if (P || (P = e._createAnimationTracks(_, x, I, T, K)), P)
-          for (let N = 0; N < P.length; N++)
-            b.push(P[N]);
+        let N = t.createAnimationTracksWithAnimationPointer(_, x, P, T, A);
+        if (N || (N = e._createAnimationTracks(_, x, P, T, A)), N)
+          for (let K = 0; K < N.length; K++)
+            b.push(N[K]);
       }
       return new w(n, void 0, b);
     });
   }
 }
-let H = !1, U = null;
+function U(v, r) {
+  for (const t of v.children) {
+    const a = t.getObjectByName(r);
+    if (a) return a;
+  }
+}
+let H = !1, j = null;
 function L() {
   if (H) return;
   H = !0;
-  const A = U || (U = C.findNode);
-  C.findNode = function(a, s) {
-    if (!s) return A(a, s);
-    if (s.startsWith(".materials.")) {
-      const r = s.substring(11).substring(s.indexOf(".")), e = r.indexOf("."), t = e < 0 ? r : r.substring(0, e);
+  const v = j || (j = C.findNode);
+  C.findNode = function(r, t) {
+    if (!t) return v(r, t);
+    if (t.startsWith(".materials.")) {
+      const a = t.substring(11).substring(t.indexOf(".")), e = a.indexOf("."), s = e < 0 ? a : a.substring(0, e);
       let n = null;
-      return a.traverse((u) => {
-        n !== null || u.type !== "Mesh" && u.type !== "SkinnedMesh" || u.material && (u.material.uuid === t || u.material.name === t) && (n = u.material, n !== null && (r.endsWith(".map") ? n = n.map : r.endsWith(".emissiveMap") && (n = n.emissiveMap)));
+      return r.traverse((u) => {
+        n !== null || u.type !== "Mesh" && u.type !== "SkinnedMesh" || u.material && (u.material.uuid === s || u.material.name === s) && (n = u.material, n !== null && (a.endsWith(".map") ? n = n.map : a.endsWith(".emissiveMap") && (n = n.emissiveMap)));
       }), n;
-    } else if (s.startsWith(".nodes.") || s.startsWith(".lights.") || s.startsWith(".cameras.")) {
-      const r = s.split(".");
+    } else if (t.startsWith(".nodes.") || t.startsWith(".lights.") || t.startsWith(".cameras.")) {
+      const a = t.split(".");
       let e;
-      for (let t = 1; t < r.length; t++) {
-        const n = r[t];
+      for (let s = 1; s < a.length; s++) {
+        const n = a[s];
         if (n.length == 36)
-          e = a.getObjectByProperty("uuid", n);
+          e = r.getObjectByProperty("uuid", n);
         else if (e && e[n]) {
           const o = Number.parseInt(n);
           let m = n;
           o >= 0 && (m = o), e = e[m];
+        } else if (e && e.isObject3D) {
+          const o = U(e, n);
+          o && (e = o);
         } else {
-          const o = a.getObjectByName(n);
+          const o = r.getObjectByName(n);
           o && (e = o);
         }
       }
       if (!e) {
-        const t = A(a, r[2]);
-        return t || console.warn(R + ": Property binding not found", s, a, a.name, r), t;
+        const s = v(r, a[2]);
+        return s || console.warn(R + ": Property binding not found", t, r, r.name, a), s;
       }
       return e;
     }
-    return A(a, s);
+    return v(r, t);
   };
 }
 export {
-  z as GLTFAnimationPointerExtension,
-  z as default
+  G as GLTFAnimationPointerExtension,
+  G as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/three-animation-pointer",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "KHR_animation_pointer support for three.js",
   "type": "module",
   "main": "dist/three-animation-pointer.js",

package/src/GLTFLoaderAnimationPointer.js

@@ -706,6 +706,25 @@ export class GLTFAnimationPointerExtension {
 
 
 
+/**
+ * Like Object3D.getObjectByName, but does not match the object itself.
+ * @param {import("three").Object3D} parent
+ * @param {string} name
+ * @returns {import("three").Object3D | undefined}
+ */
+function _findDescendantByName( parent, name ) {
+
+	for ( const child of parent.children ) {
+
+		const found = child.getObjectByName( name );
+		if ( found ) return found;
+
+	}
+
+	return undefined;
+
+}
+
 let _havePatchedPropertyBindings = false;
 
 // HACK monkey patching findNode to ensure we can map to other types required by KHR_animation_pointer.
@@ -784,6 +803,17 @@ function _ensurePropertyBindingPatch() {
 					if (_animationPointerDebug)
 						console.log(currentTarget);
 
+				} else if (currentTarget && currentTarget.isObject3D) {
+
+					// access by child node name, e.g. the submeshes of a multi-material mesh:
+					// `.nodes.<node>.<submesh>.morphTargetInfluences`.
+					// Must resolve inside the already resolved node: a glTF mesh used by multiple nodes
+					// is cloned per node, so every node has identically named submeshes.
+					const foundNode = _findDescendantByName(currentTarget, val);
+
+					if (foundNode)
+						currentTarget = foundNode;
+
 				} else {
 
 					// access by node name