From 673783280b658e9307a52e7f451c0950d2738e73 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Wed, 25 Sep 2024 14:28:02 +0300 Subject: [PATCH] recolor fix --- components/model/recolor.vue | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/components/model/recolor.vue b/components/model/recolor.vue index 2f3549f..a8ae44a 100644 --- a/components/model/recolor.vue +++ b/components/model/recolor.vue @@ -19,18 +19,14 @@ if (!pillar_color.value) { lamelle_color.value = predefLamelleColors[r] as ralTypes } -[lamelle].map( - (el: Object3D) => set_material(el, getColorHexFromRal(lamelle_color.value))); -[top, fastening, fence, fence_bottom, fence_top, fence_inner].map( - (el: Object3D) => { set_material(el, getColorHexFromRal(pillar_color.value)) }); - -watch(lamelle_color, () => { +const recolorLamelles = () => { [ lamelle, ...seekAll(scene.value, 'name', "lamelles"), ].map((el: Object3D) => { set_material(el, getColorHexFromRal(lamelle_color.value)) }); -}) -watch(pillar_color, () => { +} + +const recolorPillar = () => { [ top, fastening, fence, fence_bottom, fence_top, ...seekAll(scene.value, 'name', "pillar_one"), @@ -39,9 +35,9 @@ watch(pillar_color, () => { ...seekAll(scene.value, 'name', "lam_fastening_two"), ...seekAll(scene.value, 'name', "top_section"), ].map((el: Object3D) => { set_material(el, getColorHexFromRal(pillar_color.value)) }); +} -}) -watch([pillar_pattern, lamelle_count], () => { +const recolorPillarPattern = () => { [fence_inner].map( (el: Object3D) => { set_material(el, getColorHexFromRal(pillar_color.value), { @@ -49,7 +45,15 @@ watch([pillar_pattern, lamelle_count], () => { count: lamelle_count.value }) }); -}) +} + +recolorLamelles(); +recolorPillar(); +recolorPillarPattern(); + +watch(lamelle_color, recolorLamelles) +watch(pillar_color, recolorPillar) +watch([pillar_pattern, lamelle_count], recolorPillarPattern) \ No newline at end of file