diff --git a/voicevox-remotion-template/src/data/pizza-kiln/script.ts b/voicevox-remotion-template/src/data/pizza-kiln/script.ts index 5670dc7..caf2aa4 100644 --- a/voicevox-remotion-template/src/data/pizza-kiln/script.ts +++ b/voicevox-remotion-template/src/data/pizza-kiln/script.ts @@ -1,4 +1,4 @@ -import type {SpeakingAvatarAnimationType} from "../../avatar-animations"; +import {getStandeeSet, type AvatarDefinition} from "../../standee-sets"; export type VoicevoxVoice = Readonly<{ speakerName: string; @@ -8,13 +8,7 @@ export type CharacterDefinition = Readonly<{ displayName: string; voicevox: VoicevoxVoice; - avatar: Readonly<{ - kind: "sayo"; - accentColor: string; - imagePath: string; - mouthImageDir?: string; - speakingAnimationType?: SpeakingAvatarAnimationType; - }>; + avatar: AvatarDefinition; }>; export const characters = { @@ -25,9 +19,8 @@ styleName: "ノーマル", }, avatar: { - kind: "sayo", + ...getStandeeSet("sayo_ohnegus_ai"), accentColor: "#6b5f83", - imagePath: "image/sayo-standee-base.png", speakingAnimationType: "rhubarbLipSync", }, }, diff --git a/voicevox-remotion-template/src/data/script.ts b/voicevox-remotion-template/src/data/script.ts index a745d5f..041438b 100644 --- a/voicevox-remotion-template/src/data/script.ts +++ b/voicevox-remotion-template/src/data/script.ts @@ -1,29 +1,10 @@ -import type { - IdleAvatarAnimationType, - SpeakingAvatarAnimationType, -} from "../avatar-animations"; +import {getStandeeSet, type AvatarDefinition} from "../standee-sets"; export type VoicevoxVoice = Readonly<{ speakerName: string; styleName: string; }>; -export type AvatarDefinition = Readonly<{ - kind: "zundamon" | "sayo"; - accentColor: string; - imagePath?: string; - mouthImageDir?: string; - imageLayout?: Readonly<{ - width?: number; - maxHeight?: number; - translateY?: number; - flipX?: boolean; - }>; - nameplatePosition?: "top" | "bottom" | "none"; - idleAnimationType?: IdleAvatarAnimationType; - speakingAnimationType?: SpeakingAvatarAnimationType; -}>; - export type CharacterDefinition = Readonly<{ displayName: string; voicevox: VoicevoxVoice; @@ -38,15 +19,8 @@ styleName: "ノーマル", }, avatar: { - kind: "zundamon", + ...getStandeeSet("zundamon_ohnegus_ai"), accentColor: "#79d36f", - imagePath: "image/zundamon-standee-base.png", - imageLayout: { - width: 560, - maxHeight: 760, - translateY: -87, - flipX: true, - }, nameplatePosition: "none", idleAnimationType: "none", speakingAnimationType: "rhubarbLipSync", @@ -59,14 +33,8 @@ styleName: "ノーマル", }, avatar: { - kind: "sayo", + ...getStandeeSet("sayo_ohnegus_ai"), accentColor: "#6b5f83", - imagePath: "image/sayo-standee-base.png", - imageLayout: { - width: 560, - maxHeight: 760, - translateY: -60, - }, nameplatePosition: "none", idleAnimationType: "none", speakingAnimationType: "rhubarbLipSync", diff --git a/voicevox-remotion-template/src/pizza-kiln-composition.tsx b/voicevox-remotion-template/src/pizza-kiln-composition.tsx index 21ce731..4389e1c 100644 --- a/voicevox-remotion-template/src/pizza-kiln-composition.tsx +++ b/voicevox-remotion-template/src/pizza-kiln-composition.tsx @@ -31,6 +31,10 @@ } from "./lipsync/LipSyncedStandeeImage"; const BACKGROUND_VIDEO_PATH = "video/pizza-kiln-background.mp4"; +const STAGE_STANDEE_WIDTH = 610; +const STAGE_STANDEE_HEIGHT = 760; +const STAGE_STANDEE_RIGHT = 315; +const STAGE_STANDEE_BOTTOM = -118; const CORNER_STANDEE_WIDTH = 420; const CORNER_STANDEE_HEIGHT = 360; const CORNER_IMAGE_WIDTH = 470; @@ -130,15 +134,15 @@ ? getMouthForSpeechFrame(speechId, localFrame, fps) : "rest"; const isCorner = mode === "corner"; - const frameWidth = isCorner ? CORNER_STANDEE_WIDTH : 560; - const frameHeight = isCorner ? CORNER_STANDEE_HEIGHT : 700; + const frameWidth = isCorner ? CORNER_STANDEE_WIDTH : STAGE_STANDEE_WIDTH; + const frameHeight = isCorner ? CORNER_STANDEE_HEIGHT : STAGE_STANDEE_HEIGHT; return (