Merge branch 'dev'

Open-LLM-VTuber · Jan 26, 2025 · ca609b6 · ca609b6
2 parents 665efbb + 971f0e9
commit ca609b6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/renderer/src/components/canvas/live2d.tsx b/src/renderer/src/components/canvas/live2d.tsx
@@ -1,4 +1,5 @@
-import { memo } from "react";
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+import { memo, useEffect } from "react";
 import { useLive2DConfig } from "@/context/live2d-config-context";
 import { useIpcHandlers } from "@/hooks/utils/use-ipc-handlers";
 import { useLive2DModel } from "@/hooks/canvas/use-live2d-model";
@@ -27,6 +28,26 @@ export const Live2D = memo(({ isPet }: Live2DProps): JSX.Element => {
   useInterrupt();
   useAudioTask();
 
+  useEffect(() => {
+    if (modelRef.current) {
+      // @ts-ignore
+      window.live2d = {
+        expression: (name?: string | number) => modelRef.current?.expression(name),
+        setExpression: (name?: string | number) => {
+          if (name !== undefined) {
+            modelRef.current?.internalModel.motionManager.expressionManager?.setExpression(name);
+          }
+        },
+        setRandomExpression: () => modelRef.current?.internalModel.motionManager.expressionManager?.setRandomExpression(),
+        getExpressions: () => modelRef.current?.internalModel.motionManager.expressionManager?.definitions.map((d) => d.name),
+      };
+    }
+    return () => {
+      // @ts-ignore
+      delete window.live2d;
+    };
+  }, [modelRef.current]); // window.live2d.expression() / getExpressions() / setRandomExpression()
+
   return (
     <div
       ref={containerRef}

diff --git a/src/renderer/src/hooks/utils/use-audio-task.ts b/src/renderer/src/hooks/utils/use-audio-task.ts
@@ -66,9 +66,11 @@ export const useAudioTask = () => {
     }
 
     try {
+      if (expressions?.[0] !== undefined) {
+        model.expression(expressions[0]);
+      }
+
       model.speak(`data:audio/wav;base64,${audioBase64}`, {
-        expression: expressions?.[0] || undefined,
-        resetExpression: false,
         onFinish: () => {
           console.log("Voiceline is over");
           onComplete();