Fix BlendShape anim compatible with multiple SkinMeshRenderer in on… (#…

…1756) * fix: blendShape anim compatible with multiple SkinMeshRenderer in one entity
galacean · Sep 15, 2023 · 81f3274 · 81f3274
1 parent 5f625e8
commit 81f3274
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...n/internal/animationCurveOwner/assembler/BlendShapeWeightsAnimationCurveOwnerAssembler.ts b/...n/internal/animationCurveOwner/assembler/BlendShapeWeightsAnimationCurveOwnerAssembler.ts
@@ -7,18 +7,22 @@ import { IAnimationCurveOwnerAssembler } from "./IAnimationCurveOwnerAssembler";
  * @internal
  */
 export class BlendShapeWeightsAnimationCurveOwnerAssembler implements IAnimationCurveOwnerAssembler<Float32Array> {
-  private _skinnedMeshRenderer: SkinnedMeshRenderer;
+  private _skinnedMeshRenderer: SkinnedMeshRenderer[] = [];
 
   initialize(owner: AnimationCurveOwner<KeyframeValueType>): void {
-    this._skinnedMeshRenderer = owner.target.getComponent(SkinnedMeshRenderer);
+    // @todo: Compatible with multiple SkinnedMeshRenderer in a entity, optimize later.
+    owner.target.getComponents(SkinnedMeshRenderer, this._skinnedMeshRenderer);
   }
 
   getTargetValue(): Float32Array {
-    return this._skinnedMeshRenderer.blendShapeWeights;
+    return this._skinnedMeshRenderer[0].blendShapeWeights;
   }
 
   setTargetValue(value: Float32Array): void {
-    this._skinnedMeshRenderer.blendShapeWeights = value;
+    const skinnedMeshRenderer = this._skinnedMeshRenderer;
+    for (let i = 0, n = skinnedMeshRenderer.length; i < n; i++) {
+      skinnedMeshRenderer[i].blendShapeWeights = value;
+    }
   }
 }
 

diff --git a/packages/loader/src/gltf/parser/AnimationParser.ts b/packages/loader/src/gltf/parser/AnimationParser.ts
@@ -203,12 +203,12 @@ export class AnimationParser extends Parser {
           if (curve.interpolation === InterpolationType.CubicSpine) {
             keyframe.inTangent = Array.from(output.subarray(offset, offset + outputSize));
             offset += outputSize;
-            keyframe.value = output.subarray(offset, offset + outputSize) as Float32Array;
+            keyframe.value = output.slice(offset, offset + outputSize) as Float32Array;
             offset += outputSize;
             keyframe.outTangent = Array.from(output.subarray(offset, offset + outputSize));
             offset += outputSize;
           } else {
-            keyframe.value = output.subarray(offset, offset + outputSize) as Float32Array;
+            keyframe.value = output.slice(offset, offset + outputSize) as Float32Array;
             offset += outputSize;
           }
           curve.addKey(keyframe);