Merge pull request 'io prim color' (#82) from bx-1480-calc into dev

Reviewed-on: #82

components/modal.vue

@@ -180,7 +180,7 @@ const total_txt = computed(() => {
         const isPattern = pillar_pattern.value !== 0;
         const isTopper = pillar_topper.value !== 0;
         if (isPattern) els.push('нанесения узоров на опорные столбы')
-        if (isTopper) els.push('индивидуальный дизайн колпаков')
+        if (isTopper) els.push('индивидуального дизайна колпаков')
         const txt = `Стоимость ${els.join(' и ')} рассчитывается отдельно.`
         decor.el = {
             txt: txt,
@@ -271,8 +271,8 @@ const policy = () => {
                         Цвет столба: {{ getColorNameFromRal(pillar_color) }}<br />
                         Цвет ламелей: {{ getColorNameFromRal(lamelle_color) }}
                     </p>
-                    <template v-for="item in total_txt">
-                        <p v-if="item.length">
+                    <template v-for="(item, i) in total_txt">
+                        <p v-if="item.length" :class="[{ 'text-ioprim': i == 'decor' }]">
                             <template v-for="i in item">{{ i }}<br /></template>
                         </p>
                     </template>

components/model/diagram.vue

@@ -25,8 +25,8 @@ const { scene: verh } = await useGLTF('/models_exp/verh.glb')
 const lamelle_color = use_lamelle_color()
 const pillar_color = use_pillar_color()
 
-set_material(planki, getColorHexFromRal(lamelle_color.value), undefined, false);
-[stolb, verh, krepleniye_planok].map(el => set_material(el, getColorHexFromRal(pillar_color.value), undefined, false))
+set_material(planki, getColorHexFromRal(lamelle_color.value));
+[stolb, verh, krepleniye_planok].map(el => set_material(el, getColorHexFromRal(pillar_color.value)))
 
 </script>
 <template>

components/model/fence.vue

@@ -146,12 +146,13 @@ const setPillar = () => {
 
     let arr = [top, pillar_outer, pillar_inner, bottom]
     arr.map(el => {
-        set_material({ children: [el] }, getColorHexFromRal(pillar_color.value))
+        set_material({ children: [el] }, getColorHexFromRal(pillar_color.value), undefined, true)
     })
     set_material(
         { children: [arr[2]] },
         getColorHexFromRal(pillar_color.value),
         { pattern: pillar_pattern.value, count: lamelles_count.value },
+        true
     )
     pillar.value = arr.map(el => el.clone())
 }

utils/material.ts

@@ -79,7 +79,7 @@ export const set_material = (
     scene: any,
     color: any,
     pattern: { pattern: patternIds, count: number } | undefined = undefined,
-    noise_material: boolean = true,
+    noise_material: boolean = false,
 ) => {
     let c = color
     const material = noiseMaterial.clone()