dev #84

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

View File

@ -86,8 +86,16 @@ watch([section_count, fence_section, extra_section], () => {
} }
}) })
const setBraceCount = () => {
brace_count.value = Math.ceil(lamelles_count.value / 4)
}
const brace = props.models.brace.clone().children[0] const brace = props.models.brace.clone().children[0]
const brace_h = lamelle_height.value * 3 const brace_h = lamelle_height.value * 3
const brace_count = ref<number>()
setBraceCount()
watch(lamelles_count, setBraceCount)
const pillar = ref<Mesh[]>([]) const pillar = ref<Mesh[]>([])
const setPillar = () => { const setPillar = () => {
@ -154,8 +162,8 @@ watch([instanced_lamelle, lamelle_color], setLamellesColor)
<template v-for="item in pillar"> <template v-for="item in pillar">
<TresMesh v-bind="item.clone()" /> <TresMesh v-bind="item.clone()" />
</template> </template>
<template v-for="i in (lamelles_count % 4)"> <template v-for="i in brace_count">
<TresMesh v-bind="brace.clone()" :position-y="brace_h * (i - 1)" /> <TresMesh v-bind="brace.clone()" :position-y="brace_h * i" />
</template> </template>
</TresGroup> </TresGroup>
@ -163,8 +171,8 @@ watch([instanced_lamelle, lamelle_color], setLamellesColor)
<template v-for="item in pillar"> <template v-for="item in pillar">
<TresObject3D v-bind="item.clone()" /> <TresObject3D v-bind="item.clone()" />
</template> </template>
<template v-for="i in (lamelles_count % 4)"> <template v-for="i in brace_count">
<TresMesh v-bind="brace.clone()" :position-y="brace_h * (i - 1)" /> <TresMesh v-bind="brace.clone()" :position-y="brace_h * i" />
</template> </template>
</TresGroup> </TresGroup>