diff --git a/packages/stage-tamagotchi/package.json b/packages/stage-tamagotchi/package.json index eb1bf9755..574074cf0 100644 --- a/packages/stage-tamagotchi/package.json +++ b/packages/stage-tamagotchi/package.json @@ -31,6 +31,7 @@ "@pixi/core": "6", "@pixi/display": "6", "@pixi/extensions": "6", + "@pixi/interaction": "6", "@pixi/loaders": "6", "@pixi/math": "6", "@pixi/runner": "6", diff --git a/packages/stage-ui/src/components/Live2D/Canvas.vue b/packages/stage-ui/src/components/Live2D/Canvas.vue new file mode 100644 index 000000000..7d2012058 --- /dev/null +++ b/packages/stage-ui/src/components/Live2D/Canvas.vue @@ -0,0 +1,52 @@ + + + + + + + diff --git a/packages/stage-ui/src/components/Live2D/Viewer.vue b/packages/stage-ui/src/components/Live2D/Model.vue similarity index 68% rename from packages/stage-ui/src/components/Live2D/Viewer.vue rename to packages/stage-ui/src/components/Live2D/Model.vue index 5410c5a81..07e44f925 100644 --- a/packages/stage-ui/src/components/Live2D/Viewer.vue +++ b/packages/stage-ui/src/components/Live2D/Model.vue @@ -1,39 +1,38 @@ - + diff --git a/packages/stage-ui/src/components/Scenes/Live2D.vue b/packages/stage-ui/src/components/Scenes/Live2D.vue index 3096c9acd..05e748ddd 100644 --- a/packages/stage-ui/src/components/Scenes/Live2D.vue +++ b/packages/stage-ui/src/components/Scenes/Live2D.vue @@ -10,8 +10,10 @@ import { EmotionSurpriseMotionName, EmotionThinkMotionName, } from '../../constants/emotions' -import Live2DViewer from '../Live2D/Viewer.vue' +import Live2DCanvas from '../Live2D/Canvas.vue' +import Live2DModel from '../Live2D/Model.vue' import Screen from '../Screen.vue' +import TransitionVertical from '../TransitionVertical.vue' withDefaults(defineProps<{ model: string @@ -20,21 +22,15 @@ withDefaults(defineProps<{ mouthOpenSize: 0, }) -const modelRef = ref<{ - setMotion: (motionName: string) => Promise -}>() +const motion = defineModel('motion') const show = ref(false) - -defineExpose({ - setMotion: async (motionName: string): Promise => { - await modelRef.value?.setMotion(motionName) - }, -}) - + + + {{ $t('stage.viewers.debug-menu.emotions-btn.surprised') }} {{ $t('stage.viewers.debug-menu.emotions-btn.sad') }} {{ $t('stage.viewers.debug-menu.emotions-btn.angry') }} {{ $t('stage.viewers.debug-menu.emotions-btn.happy') }} {{ $t('stage.viewers.debug-menu.emotions-btn.awkward') }} {{ $t('stage.viewers.debug-menu.emotions-btn.question') }} {{ $t('stage.viewers.debug-menu.emotions-btn.think') }} diff --git a/packages/stage-ui/src/components/index.ts b/packages/stage-ui/src/components/index.ts index e269388bb..2a88e66fa 100644 --- a/packages/stage-ui/src/components/index.ts +++ b/packages/stage-ui/src/components/index.ts @@ -1,6 +1,7 @@ export { default as BasicTextarea } from './BasicTextarea.vue' -export { default as Live2DViewer } from './Live2D/Viewer.vue' +export { default as Live2DCanvas } from './Live2D/Canvas.vue' +export { default as Live2DModel } from './Live2D/Model.vue' export { default as SceneLive2D } from './Scenes/Live2D.vue' export { default as SceneVRM } from './Scenes/VRM.vue' diff --git a/packages/stage-web/package.json b/packages/stage-web/package.json index 0ea02af72..3f98f9ca7 100644 --- a/packages/stage-web/package.json +++ b/packages/stage-web/package.json @@ -26,6 +26,7 @@ "@pixi/core": "6", "@pixi/display": "6", "@pixi/extensions": "6", + "@pixi/interaction": "6", "@pixi/loaders": "6", "@pixi/math": "6", "@pixi/runner": "6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 03dc0fb50..8e6ec4346 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -350,6 +350,9 @@ importers: '@pixi/extensions': specifier: '6' version: 6.5.10 + '@pixi/interaction': + specifier: '6' + version: 6.5.10(@pixi/core@6.5.10(@pixi/constants@6.5.10)(@pixi/extensions@6.5.10)(@pixi/math@6.5.10)(@pixi/runner@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))))(@pixi/display@6.5.10(@pixi/constants@6.5.10)(@pixi/math@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))))(@pixi/math@6.5.10)(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))) '@pixi/loaders': specifier: '6' version: 6.5.10(@pixi/constants@6.5.10)(@pixi/core@6.5.10(@pixi/constants@6.5.10)(@pixi/extensions@6.5.10)(@pixi/math@6.5.10)(@pixi/runner@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))) @@ -629,6 +632,9 @@ importers: '@pixi/extensions': specifier: '6' version: 6.5.10 + '@pixi/interaction': + specifier: '6' + version: 6.5.10(@pixi/core@6.5.10(@pixi/constants@6.5.10)(@pixi/extensions@6.5.10)(@pixi/math@6.5.10)(@pixi/runner@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))))(@pixi/display@6.5.10(@pixi/constants@6.5.10)(@pixi/math@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))))(@pixi/math@6.5.10)(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))) '@pixi/loaders': specifier: '6' version: 6.5.10(@pixi/constants@6.5.10)(@pixi/core@6.5.10(@pixi/constants@6.5.10)(@pixi/extensions@6.5.10)(@pixi/math@6.5.10)(@pixi/runner@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))) @@ -3784,6 +3790,15 @@ packages: '@pixi/core': ^6.0.0 '@pixi/math': ^6.0.0 + '@pixi/interaction@6.5.10': + resolution: {integrity: sha512-v809pJmXA2B9dV/vdrDMUqJT+fBB/ARZli2YRmI2dPbEbkaYr8FNmxCAJnwT8o+ymTx044Ie820hn9tVrtMtfA==} + peerDependencies: + '@pixi/core': 6.5.10 + '@pixi/display': 6.5.10 + '@pixi/math': 6.5.10 + '@pixi/ticker': 6.5.10 + '@pixi/utils': 6.5.10 + '@pixi/loaders@6.5.10': resolution: {integrity: sha512-AuK7mXBmyVsDFL9DDFPB8sqP8fwQ2NOktvu98bQuJl0/p/UeK/0OAQnF3wcf3FeBv5YGXfNHL21c2DCisjKfTg==} peerDependencies: @@ -14026,6 +14041,14 @@ snapshots: '@pixi/core': 6.5.10(@pixi/constants@6.5.10)(@pixi/extensions@6.5.10)(@pixi/math@6.5.10)(@pixi/runner@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))) '@pixi/math': 6.5.10 + '@pixi/interaction@6.5.10(@pixi/core@6.5.10(@pixi/constants@6.5.10)(@pixi/extensions@6.5.10)(@pixi/math@6.5.10)(@pixi/runner@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))))(@pixi/display@6.5.10(@pixi/constants@6.5.10)(@pixi/math@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))))(@pixi/math@6.5.10)(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))': + dependencies: + '@pixi/core': 6.5.10(@pixi/constants@6.5.10)(@pixi/extensions@6.5.10)(@pixi/math@6.5.10)(@pixi/runner@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))) + '@pixi/display': 6.5.10(@pixi/constants@6.5.10)(@pixi/math@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))) + '@pixi/math': 6.5.10 + '@pixi/ticker': 6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)) + '@pixi/utils': 6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)) + '@pixi/loaders@6.5.10(@pixi/constants@6.5.10)(@pixi/core@6.5.10(@pixi/constants@6.5.10)(@pixi/extensions@6.5.10)(@pixi/math@6.5.10)(@pixi/runner@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))': dependencies: '@pixi/constants': 6.5.10