dev #84

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

View File

@ -17,7 +17,6 @@ const section_count = use_section_count()
const extra_section = use_extra_section() const extra_section = use_extra_section()
const total_length = use_total_length() const total_length = use_total_length()
const min_length = use_min_length() const min_length = use_min_length()
const open_calc = use_open_calc()
if (!pillar_color.value) { if (!pillar_color.value) {
const r = Math.floor(Math.random() * predefPillarColors.length) const r = Math.floor(Math.random() * predefPillarColors.length)
@ -137,10 +136,6 @@ const changeParametres = () => {
goal('calc_fence', form_state) goal('calc_fence', form_state)
} }
watch(() => [form_state.fence_length, form_state.height, form_state.total_length], () => {
open_calc.value = []
})
const setLamelleColor = (color: ralTypes) => { const setLamelleColor = (color: ralTypes) => {
lamelle_color.value = color; lamelle_color.value = color;
lamelle_text.value = contrastColor(color) ?? '#000' lamelle_text.value = contrastColor(color) ?? '#000'

View File

@ -178,7 +178,7 @@ const setFastening = () => {
const top = props.models.fastening_top.clone().children[0]; const top = props.models.fastening_top.clone().children[0];
top.position.set( top.position.set(
pillar_size * 0.5, pillar_size * 0.5,
lamelles_count.value * lSize - 0.02 * scale_koef, lamelles_count.value * lSize - 0.0275 * scale_koef,
0 0
); );
top.scale.setComponent(0, v); top.scale.setComponent(0, v);

View File

@ -86,7 +86,10 @@ const setTarget = (smooth = false) => {
} }
} }
setTarget() setTarget()
watch([lamelles_count, fence_section], () => setTarget(false)) watch([lamelles_count, fence_section], () => {
setTarget(false)
open_calc.value = []
})
watch(open_calc, () => { watch(open_calc, () => {
if (Object.keys(open_calc.value).length == 0) { if (Object.keys(open_calc.value).length == 0) {