diff --git a/apps/stage-web/public/assets/live2d/models/hiyori/preview.png b/apps/stage-web/public/assets/live2d/models/hiyori/preview.png deleted file mode 100644 index 928a64b01..000000000 Binary files a/apps/stage-web/public/assets/live2d/models/hiyori/preview.png and /dev/null differ diff --git a/apps/stage-web/public/assets/vrm/models/AvatarSample-A/preview.png b/apps/stage-web/public/assets/vrm/models/AvatarSample-A/preview.png deleted file mode 100644 index f052f2945..000000000 Binary files a/apps/stage-web/public/assets/vrm/models/AvatarSample-A/preview.png and /dev/null differ diff --git a/apps/stage-web/public/assets/vrm/models/AvatarSample-B/preview.png b/apps/stage-web/public/assets/vrm/models/AvatarSample-B/preview.png deleted file mode 100644 index cc39f3239..000000000 Binary files a/apps/stage-web/public/assets/vrm/models/AvatarSample-B/preview.png and /dev/null differ diff --git a/packages/stage-ui-three/src/components/ThreeScene.vue b/packages/stage-ui-three/src/components/ThreeScene.vue index dcac4ce85..52661d278 100644 --- a/packages/stage-ui-three/src/components/ThreeScene.vue +++ b/packages/stage-ui-three/src/components/ThreeScene.vue @@ -12,7 +12,6 @@ import type { DirectionalLight, SphericalHarmonics3, Texture, WebGLRenderTarget import type { Vec3 } from '../stores/model-store' -import { withBase } from '@proj-airi/stage-shared' import { TresCanvas } from '@tresjs/core' import { EffectComposerPmndrs, HueSaturationPmndrs } from '@tresjs/post-processing' import { useElementBounding } from '@vueuse/core' @@ -44,7 +43,7 @@ const props = withDefaults(defineProps<{ paused?: boolean }>(), { showAxes: false, - idleAnimation: withBase('/assets/vrm/animations/idle_loop.vrma'), + idleAnimation: new URL('../assets/vrm/animations/idle_loop.vrma', import.meta.url).href, paused: false, }) diff --git a/apps/stage-tamagotchi/src/renderer/public/assets/live2d/models/hiyori/preview.png b/packages/stage-ui/src/assets/live2d/models/hiyori/preview.png similarity index 100% rename from apps/stage-tamagotchi/src/renderer/public/assets/live2d/models/hiyori/preview.png rename to packages/stage-ui/src/assets/live2d/models/hiyori/preview.png diff --git a/apps/stage-web/public/assets/vrm/animations/idle_loop.vrma b/packages/stage-ui/src/assets/vrm/animations/idle_loop.vrma similarity index 100% rename from apps/stage-web/public/assets/vrm/animations/idle_loop.vrma rename to packages/stage-ui/src/assets/vrm/animations/idle_loop.vrma diff --git a/apps/stage-tamagotchi/src/renderer/public/assets/vrm/models/AvatarSample-A/preview.png b/packages/stage-ui/src/assets/vrm/models/AvatarSample-A/preview.png similarity index 100% rename from apps/stage-tamagotchi/src/renderer/public/assets/vrm/models/AvatarSample-A/preview.png rename to packages/stage-ui/src/assets/vrm/models/AvatarSample-A/preview.png diff --git a/apps/stage-tamagotchi/src/renderer/public/assets/vrm/models/AvatarSample-B/preview.png b/packages/stage-ui/src/assets/vrm/models/AvatarSample-B/preview.png similarity index 100% rename from apps/stage-tamagotchi/src/renderer/public/assets/vrm/models/AvatarSample-B/preview.png rename to packages/stage-ui/src/assets/vrm/models/AvatarSample-B/preview.png diff --git a/packages/stage-ui/src/stores/display-models.ts b/packages/stage-ui/src/stores/display-models.ts index 1b9357dc3..546456926 100644 --- a/packages/stage-ui/src/stores/display-models.ts +++ b/packages/stage-ui/src/stores/display-models.ts @@ -26,6 +26,14 @@ export type DisplayModel = | DisplayModelFile | DisplayModelURL +const presetLive2dProUrl = new URL('../assets/live2d/models/hiyori_pro_zh.zip', import.meta.url).href +const presetLive2dFreeUrl = new URL('../assets/live2d/models/hiyori_free_zh.zip', import.meta.url).href +const presetLive2dPreview = new URL('../assets/live2d/models/hiyori/preview.png', import.meta.url).href +const presetVrmAvatarAUrl = new URL('../assets/vrm/models/AvatarSample-A/AvatarSample_A.vrm', import.meta.url).href +const presetVrmAvatarAPreview = new URL('../assets/vrm/models/AvatarSample-A/preview.png', import.meta.url).href +const presetVrmAvatarBUrl = new URL('../assets/vrm/models/AvatarSample-B/AvatarSample_B.vrm', import.meta.url).href +const presetVrmAvatarBPreview = new URL('../assets/vrm/models/AvatarSample-B/preview.png', import.meta.url).href + export interface DisplayModelFile { id: string format: DisplayModelFormat @@ -47,10 +55,10 @@ export interface DisplayModelURL { } const displayModelsPresets: DisplayModel[] = [ - { id: 'preset-live2d-1', format: DisplayModelFormat.Live2dZip, type: 'url', url: '/assets/live2d/models/hiyori_pro_zh.zip', name: 'Hiyori (Pro)', previewImage: '/assets/live2d/models/hiyori/preview.png', importedAt: 1733113886840 }, - { id: 'preset-live2d-2', format: DisplayModelFormat.Live2dZip, type: 'url', url: '/assets/live2d/models/hiyori_free_zh.zip', name: 'Hiyori (Free)', previewImage: '/assets/live2d/models/hiyori/preview.png', importedAt: 1733113886840 }, - { id: 'preset-vrm-1', format: DisplayModelFormat.VRM, type: 'url', url: '/assets/vrm/models/AvatarSample-A/AvatarSample_A.vrm', name: 'AvatarSample_A', previewImage: '/assets/vrm/models/AvatarSample-A/preview.png', importedAt: 1733113886840 }, - { id: 'preset-vrm-2', format: DisplayModelFormat.VRM, type: 'url', url: '/assets/vrm/models/AvatarSample-B/AvatarSample_B.vrm', name: 'AvatarSample_B', previewImage: '/assets/vrm/models/AvatarSample-B/preview.png', importedAt: 1733113886840 }, + { id: 'preset-live2d-1', format: DisplayModelFormat.Live2dZip, type: 'url', url: presetLive2dProUrl, name: 'Hiyori (Pro)', previewImage: presetLive2dPreview, importedAt: 1733113886840 }, + { id: 'preset-live2d-2', format: DisplayModelFormat.Live2dZip, type: 'url', url: presetLive2dFreeUrl, name: 'Hiyori (Free)', previewImage: presetLive2dPreview, importedAt: 1733113886840 }, + { id: 'preset-vrm-1', format: DisplayModelFormat.VRM, type: 'url', url: presetVrmAvatarAUrl, name: 'AvatarSample_A', previewImage: presetVrmAvatarAPreview, importedAt: 1733113886840 }, + { id: 'preset-vrm-2', format: DisplayModelFormat.VRM, type: 'url', url: presetVrmAvatarBUrl, name: 'AvatarSample_B', previewImage: presetVrmAvatarBPreview, importedAt: 1733113886840 }, ] export const useDisplayModelsStore = defineStore('display-models', () => {