Skip to content

Commit 7f2ab0e

Browse files
nekomeowwwnekomeowww
committed
fix: typecheck
1 parent 12a2472 commit 7f2ab0e

File tree

5 files changed

+37
-44
lines changed

5 files changed

+37
-44
lines changed

‎apps/stage-web/src/components/Layouts/InteractiveArea/Actions/ViewControls.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const emits = defineEmits<{
77
(e: 'reset'): void
88
}>()
99
10-
const { stageView, stageViewControlsEnabled } = storeToRefs(useSettings())
10+
const { stageModelRenderer, stageViewControlsEnabled } = storeToRefs(useSettings())
1111
1212
const mode = defineModel<'x' | 'y' | 'z' | 'scale'>({ required: true })
1313
@@ -31,7 +31,7 @@ function handleViewControlsToggle(targetMode: 'x' | 'y' | 'z' | 'scale') {
3131
<Button variant="secondary-muted" :toggled="mode === 'y'" w-full @click="handleViewControlsToggle('y')">
3232
Y
3333
</Button>
34-
<Button v-if="stageView === '3d'" variant="secondary-muted" :toggled="mode === 'z'" w-full @click="handleViewControlsToggle('z')">
34+
<Button v-if="stageModelRenderer === 'vrm'" variant="secondary-muted" :toggled="mode === 'z'" w-full @click="handleViewControlsToggle('z')">
3535
Z
3636
</Button>
3737
<Button variant="secondary-muted" :toggled="mode === 'scale'" w-full @click="handleViewControlsToggle('scale')">

‎apps/stage-web/src/components/Layouts/MobileInteractiveArea.vue‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const { activeProvider, activeModel } = storeToRefs(useConsciousnessStore())
3434
useResizeObserver(document.documentElement, () => screenSafeArea.update())
3535
3636
// const { askPermission } = useSettingsAudioDevice()
37-
const { themeColorsHueDynamic, stageView, stageViewControlsEnabled } = storeToRefs(useSettings())
37+
const { themeColorsHueDynamic, stageViewControlsEnabled } = storeToRefs(useSettings())
3838
const { enabled, selectedAudioInput } = storeToRefs(useSettingsAudioDevice())
3939
const { send, onAfterMessageComposed, discoverToolsCompatibility } = useChatStore()
4040
const { messages } = storeToRefs(useChatStore())
@@ -145,14 +145,6 @@ onMounted(() => {
145145
<!-- <button border="2 solid neutral-100/60 dark:neutral-800/30" bg="neutral-50/70 dark:neutral-800/70" w-fit flex items-center self-end justify-center rounded-xl p-2 backdrop-blur-md title="Model">
146146
<div i-solar:face-scan-circle-outline size-5 text="neutral-500 dark:neutral-400" />
147147
</button> -->
148-
<button border="2 solid neutral-100/60 dark:neutral-800/30" bg="neutral-50/70 dark:neutral-800/70" w-fit flex items-center self-end justify-center rounded-xl p-2 backdrop-blur-md title="Stage View" @click="stageView = stageView === '2d' ? '3d' : '2d'">
149-
<div v-if="stageView === '2d'" size-5 text="neutral-500 dark:neutral-400" inline-flex items-center justify-center>
150-
<span>2D</span>
151-
</div>
152-
<div v-if="stageView === '3d'" size-5 text="neutral-500 dark:neutral-400" inline-flex items-center justify-center>
153-
<span>3D</span>
154-
</div>
155-
</button>
156148
<ActionViewControls v-model="viewControlsActiveMode" @reset="() => viewControlsInputsRef?.resetOnMode()" />
157149
</div>
158150
</div>

‎apps/stage-web/src/components/Layouts/ViewControls/Inputs.vue‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@ const props = defineProps<{
1010
mode: 'x' | 'y' | 'z' | 'scale'
1111
}>()
1212
13-
const { stageView, stageViewControlsEnabled } = storeToRefs(useSettings())
13+
const { stageModelRenderer, stageViewControlsEnabled } = storeToRefs(useSettings())
1414
const { scale: vrmScale, modelOffset: vrmPosition, modelSize: vrmModelSize } = storeToRefs(useVRM())
1515
const { scale: live2dScale, position: live2dPosition } = storeToRefs(useLive2d())
1616
1717
const viewControlsValueX = computed({
1818
get: () => {
19-
switch (stageView.value) {
20-
case '2d':
19+
switch (stageModelRenderer.value) {
20+
case 'live2d':
2121
return live2dPosition.value.x
22-
case '3d':
22+
case 'vrm':
2323
return vrmPosition.value.x
2424
default:
2525
return 0
2626
}
2727
},
2828
set: (value) => {
29-
switch (stageView.value) {
30-
case '2d':
29+
switch (stageModelRenderer.value) {
30+
case 'live2d':
3131
live2dPosition.value.x = value
3232
break
33-
case '3d':
33+
case 'vrm':
3434
vrmPosition.value.x = value
3535
break
3636
default:
@@ -40,30 +40,30 @@ const viewControlsValueX = computed({
4040
})
4141
4242
const viewControlsValueXMin = computed(() => {
43-
return stageView.value === '2d' ? -500 : -vrmModelSize.value.x - 10
43+
return stageModelRenderer.value === 'live2d' ? -500 : -vrmModelSize.value.x - 10
4444
})
4545
4646
const viewControlsValueXMax = computed(() => {
47-
return stageView.value === '2d' ? 500 : vrmModelSize.value.x + 10
47+
return stageModelRenderer.value === 'vrm' ? 500 : vrmModelSize.value.x + 10
4848
})
4949
5050
const viewControlsValueY = computed({
5151
get: () => {
52-
switch (stageView.value) {
53-
case '2d':
52+
switch (stageModelRenderer.value) {
53+
case 'live2d':
5454
return live2dPosition.value.y
55-
case '3d':
55+
case 'vrm':
5656
return vrmPosition.value.y
5757
default:
5858
return 0
5959
}
6060
},
6161
set: (value) => {
62-
switch (stageView.value) {
63-
case '2d':
62+
switch (stageModelRenderer.value) {
63+
case 'live2d':
6464
live2dPosition.value.y = value
6565
break
66-
case '3d':
66+
case 'vrm':
6767
vrmPosition.value.y = value
6868
break
6969
default:
@@ -73,29 +73,29 @@ const viewControlsValueY = computed({
7373
})
7474
7575
const viewControlsValueYMin = computed(() => {
76-
return stageView.value === '2d' ? -500 : -vrmModelSize.value.y - 10
76+
return stageModelRenderer.value === 'live2d' ? -500 : -vrmModelSize.value.y - 10
7777
})
7878
7979
const viewControlsValueYMax = computed(() => {
80-
return stageView.value === '2d' ? 500 : vrmModelSize.value.y + 10
80+
return stageModelRenderer.value === 'vrm' ? 500 : vrmModelSize.value.y + 10
8181
})
8282
8383
const viewControlsValueZ = computed({
8484
get: () => {
85-
switch (stageView.value) {
86-
case '2d':
85+
switch (stageModelRenderer.value) {
86+
case 'live2d':
8787
return 0
88-
case '3d':
88+
case 'vrm':
8989
return vrmPosition.value.z
9090
default:
9191
return 0
9292
}
9393
},
9494
set: (value) => {
95-
switch (stageView.value) {
96-
case '2d':
95+
switch (stageModelRenderer.value) {
96+
case 'live2d':
9797
break
98-
case '3d':
98+
case 'vrm':
9999
vrmPosition.value.z = value
100100
break
101101
default:
@@ -105,23 +105,23 @@ const viewControlsValueZ = computed({
105105
})
106106
107107
const viewControlsValueZMin = computed(() => {
108-
return stageView.value === '2d' ? -500 : -vrmModelSize.value.z - 10
108+
return stageModelRenderer.value === 'live2d' ? -500 : -vrmModelSize.value.z - 10
109109
})
110110
111111
const viewControlsValueZMax = computed(() => {
112-
return stageView.value === '2d' ? 500 : vrmModelSize.value.z + 10
112+
return stageModelRenderer.value === 'live2d' ? 500 : vrmModelSize.value.z + 10
113113
})
114114
115115
const viewControlsValueScale = computed({
116116
get: () => {
117-
if (stageView.value === '2d') {
117+
if (stageModelRenderer.value === 'live2d') {
118118
return live2dScale.value
119119
}
120120
121121
return vrmScale.value
122122
},
123123
set: (value) => {
124-
if (stageView.value === '2d') {
124+
if (stageModelRenderer.value === 'live2d') {
125125
live2dScale.value = value
126126
}
127127
else {
@@ -168,7 +168,7 @@ defineExpose({
168168
{{ viewControlsValueY.toFixed(2) }}
169169
</div>
170170
</div>
171-
<div v-else-if="stageView === '3d' && props.mode === 'z'" relative class="[&_.round-range-tooltip]:hover:opacity-100">
171+
<div v-else-if="stageModelRenderer === 'vrm' && props.mode === 'z'" relative class="[&_.round-range-tooltip]:hover:opacity-100">
172172
<RoundRange v-model="viewControlsValueZ" :min="viewControlsValueZMin" :max="viewControlsValueZMax" :step="0.01" write-vertical-left h="50%" data-direction="vertical" />
173173
<div class="round-range-tooltip" top="50%" translate-y="[-50%]" absolute left-10 font-mono op-0 transition="all duration-200 ease-in-out">
174174
{{ viewControlsValueZ.toFixed(2) }}

‎packages/stage-ui/src/components/Scenarios/Dialogs/model-selector/model-selector.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const mapFormatRenderer: Record<DisplayModelFormat, string> = {
6161
[DisplayModelFormat.Live2dDirectory]: 'Live2D',
6262
[DisplayModelFormat.VRM]: 'VRM',
6363
[DisplayModelFormat.PMXDirectory]: 'MMD',
64+
[DisplayModelFormat.PMXZip]: 'MMD',
6465
[DisplayModelFormat.PMD]: 'MMD',
6566
}
6667

‎packages/stage-ui/src/components/Scenes/Stage.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const db = ref<DuckDBWasmDrizzleDatabase>()
4141
4242
const vrmViewerRef = ref<{ setExpression: (expression: string) => void }>()
4343
44-
const { stageView, stageViewControlsEnabled, live2dDisableFocus, stageModelSelectedUrl } = storeToRefs(useSettings())
44+
const { stageModelRenderer, stageViewControlsEnabled, live2dDisableFocus, stageModelSelectedUrl } = storeToRefs(useSettings())
4545
const { mouthOpenSize } = storeToRefs(useSpeakingStore())
4646
const { audioContext, calculateVolume } = useAudioContext()
4747
const { onBeforeMessageComposed, onBeforeSend, onTokenLiteral, onTokenSpecial, onStreamEnd, onAssistantResponseEnd } = useChatStore()
@@ -137,14 +137,14 @@ const { currentMotion } = storeToRefs(useLive2d())
137137
const emotionsQueue = useQueue<Emotion>({
138138
handlers: [
139139
async (ctx) => {
140-
if (stageView.value === 'vrm') {
140+
if (stageModelRenderer.value === 'vrm') {
141141
const value = EMOTION_VRMExpressionName_value[ctx.data]
142142
if (!value)
143143
return
144144
145145
await vrmViewerRef.value!.setExpression(value)
146146
}
147-
else if (stageView.value === 'live2d') {
147+
else if (stageModelRenderer.value === 'live2d') {
148148
currentMotion.value = { group: EMOTION_EmotionMotionName_value[ctx.data] }
149149
}
150150
},
@@ -229,7 +229,7 @@ onMounted(async () => {
229229
<div relative>
230230
<div h-full w-full>
231231
<Live2DScene
232-
v-if="stageView === 'live2d'"
232+
v-if="stageModelRenderer === 'live2d'"
233233
min-w="50% <lg:full" min-h="100 sm:100" h-full w-full flex-1
234234
:model-src="stageModelSelectedUrl"
235235
:focus-at="focusAt"
@@ -241,7 +241,7 @@ onMounted(async () => {
241241
:disable-focus-at="live2dDisableFocus"
242242
/>
243243
<VRMScene
244-
v-else-if="stageView === 'vrm'"
244+
v-else-if="stageModelRenderer === 'vrm'"
245245
ref="vrmViewerRef"
246246
:model-src="stageModelSelectedUrl"
247247
idle-animation="/assets/vrm/animations/idle_loop.vrma"

0 commit comments

Comments
 (0)