fix: 修复 ikHanler 导致的舞蹈动画问题

lobehub · Sep 18, 2024 · 8e07780 · 8e07780
1 parent 3bb1c67
commit 8e07780
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/src/app/chat/ChatInfo/DanceList/index.tsx b/src/app/chat/ChatInfo/DanceList/index.tsx
@@ -65,14 +65,6 @@ const DanceList = memo((props: PlayListProps) => {
             />
           }
         />
-
-        <Virtuoso
-          computeItemKey={(_, item) => item.danceId}
-          data={danceList}
-          followOutput={false}
-          itemContent={(index, item) => <DanceItem danceItem={item} key={item.danceId} />}
-        />
-
         {danceList.length === 0 ? (
           <Empty description={t('noDanceList')} image={Empty.PRESENTED_IMAGE_SIMPLE}>
             <GradientButton
@@ -85,7 +77,14 @@ const DanceList = memo((props: PlayListProps) => {
               {t('danceMarket')}
             </GradientButton>
           </Empty>
-        ) : null}
+        ) : (
+          <Virtuoso
+            computeItemKey={(_, item) => item.danceId}
+            data={danceList}
+            followOutput={false}
+            itemContent={(index, item) => <DanceItem danceItem={item} key={item.danceId} />}
+          />
+        )}
       </Flexbox>
     </Flexbox>
   );

diff --git a/src/libs/emoteController/motionManager.ts b/src/libs/emoteController/motionManager.ts
@@ -20,6 +20,8 @@ export class MotionManager {
     this.vrm = vrm;
     this.mixer = new AnimationMixer(vrm.scene);
     this.ikHandler = IKHandler.get(vrm);
+    this.currentAction = undefined;
+    this.currentClip = undefined;
   }
 
   public async loadMotionUrl(
@@ -70,18 +72,19 @@ export class MotionManager {
   }
 
   public disposeCurrentMotion(): void {
-    if (this.currentClip && this.mixer) {
+    this.mixer.stopAllAction();
+    if (this.currentClip) {
       this.mixer.uncacheAction(this.currentClip);
       this.mixer.uncacheClip(this.currentClip);
+      this.currentAction = undefined;
     }
 
+    this.ikHandler.disableAll();
+
     if (this.currentAction) {
       this.currentAction.stop();
+      this.currentClip = undefined;
     }
-    this.ikHandler.disableAll();
-
-    this.currentAction = undefined;
-    this.currentClip = undefined;
   }
 
   public update(delta: number): void {

diff --git a/src/libs/vrmViewer/model.ts b/src/libs/vrmViewer/model.ts
@@ -93,8 +93,9 @@ export class Model {
       const { volume } = this._lipSync.update();
       this.emoteController?.lipSync('aa', volume);
     }
-
-    this.emoteController?.update(delta);
+    // vrm 先更新
     this.vrm?.update(delta);
+    // 后更新表情动作
+    this.emoteController?.update(delta);
   }
 }