feat: add default expression (optional)

Some models need to remove watermark or set a default expression, which can be done through this setting.
Open-LLM-VTuber · Jan 26, 2025 · bfd896b · bfd896b
1 parent ca609b6
commit bfd896b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/src/renderer/src/context/live2d-config-context.tsx b/src/renderer/src/context/live2d-config-context.tsx
@@ -44,17 +44,20 @@ export interface ModelInfo {
   url: string;
 
   /** Scale factor */
-  kScale: number | string;
+  kScale: number;
 
   /** Initial X position shift */
-  initialXshift: number | string;
+  initialXshift: number;
 
   /** Initial Y position shift */
-  initialYshift: number | string;
+  initialYshift: number;
 
   /** Idle motion group name */
   idleMotionGroupName?: string;
 
+  /** Default emotion */
+  defaultEmotion?: number | string;
+
   /** Emotion mapping configuration */
   emotionMap: EmotionMap;
 

diff --git a/src/renderer/src/hooks/canvas/use-live2d-model.ts b/src/renderer/src/hooks/canvas/use-live2d-model.ts
@@ -146,7 +146,7 @@ export const useLive2DModel = ({
         height: 0,
       };
 
-    resetModelPosition(modelRef.current, width, height, modelInfo);
+    resetModelPosition(modelRef.current, width, height, modelInfo?.initialXshift, modelInfo?.initialYshift);
   }, [modelInfo?.initialXshift, modelInfo?.initialYshift]);
 
   // Load Live2D model with configuration
@@ -297,9 +297,16 @@ export const useLive2DModel = ({
   // Reset expression when AI state changes to IDLE (like finishing a conversation)
   useEffect(() => {
     if (aiState === AiStateEnum.IDLE) {
-      modelRef.current?.internalModel.motionManager.expressionManager?.resetExpression();
+      console.log("defaultEmotion: ", modelInfo?.defaultEmotion);
+      if (modelInfo?.defaultEmotion) {
+        modelRef.current?.internalModel.motionManager.expressionManager?.setExpression(
+          modelInfo.defaultEmotion,
+        );
+      } else {
+        modelRef.current?.internalModel.motionManager.expressionManager?.resetExpression();
+      }
     }
-  }, [aiState]);
+  }, [modelRef.current, aiState, modelInfo?.defaultEmotion]);
 
   // Load model when URL changes and cleanup on unmount
   useEffect(() => {

diff --git a/src/renderer/src/hooks/canvas/use-live2d-resize.ts b/src/renderer/src/hooks/canvas/use-live2d-resize.ts
@@ -11,13 +11,12 @@ export const resetModelPosition = (
   model: Live2DModel,
   width: number,
   height: number,
-  modelInfo: ModelInfo | undefined,
+  initialXshift: number | undefined,
+  initialYshift: number | undefined,
 ) => {
-  if (!model || !modelInfo) return;
-
-  const initXshift = Number(modelInfo?.initialXshift || 0);
-  const initYshift = Number(modelInfo?.initialYshift || 0);
-
+  if (!model) return;
+  const initXshift = Number(initialXshift || 0);
+  const initYshift = Number(initialYshift || 0);
   const targetX = (width - model.width) / 2 + initXshift;
   const targetY = (height - model.height) / 2 + initYshift;
 
@@ -119,7 +118,7 @@ export const useLive2DResize = (
         // Resize renderer and reset model position
         appRef.current.renderer.resize(width, height);
         appRef.current.renderer.clear();
-        resetModelPosition(modelRef.current, width, height, modelInfo);
+        resetModelPosition(modelRef.current, width, height, modelInfo?.initialXshift, modelInfo?.initialYshift);
       }
     });