dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
2 changed files with 28 additions and 24 deletions
Showing only changes of commit b30766cb3f - Show all commits

View File

@ -401,7 +401,7 @@ button {
} }
&-changer { &-changer {
@apply flex gap-4 mt-4 max-h-40 overflow-auto; @apply flex gap-3 mt-4 max-h-36 overflow-auto;
} }
&-list { &-list {
@ -445,7 +445,9 @@ button {
} }
} }
} }
.calc{
@apply max-h-[800px] relative h-full;
}
.calc_table { .calc_table {
@apply flex flex-col gap-2 self-end; @apply flex flex-col gap-2 self-end;

View File

@ -17,28 +17,30 @@ const cameraStat = reactive({
}) })
</script> </script>
<template> <template>
<ClientOnly fallback-tag="div"> <div class="calc">
<template #fallback> <ClientOnly fallback-tag="div">
<div class="fallback"> <template #fallback>
Загрузка 3D модели <div class="fallback">
</div> Загрузка 3D модели
</template> </div>
<Loader /> </template>
<Stats /> <Loader />
<TresCanvas clear-color="#e2e8f0"> <Stats />
<TresPerspectiveCamera v-bind="cameraStat" ref="camera" /> <TresCanvas clear-color="#e2e8f0">
<OrbitControls v-bind="controlsState" make-default /> <TresPerspectiveCamera v-bind="cameraStat" ref="camera" />
<Suspense> <OrbitControls v-bind="controlsState" make-default />
<ModelSmoothCamera />
</Suspense>
<Suspense>
<ModelEnv />
</Suspense>
<TresGroup>
<Suspense> <Suspense>
<ModelParametric /> <ModelSmoothCamera />
</Suspense> </Suspense>
</TresGroup> <Suspense>
</TresCanvas> <ModelEnv />
</ClientOnly> </Suspense>
<TresGroup>
<Suspense>
<ModelParametric />
</Suspense>
</TresGroup>
</TresCanvas>
</ClientOnly>
</div>
</template> </template>