mns/mns-mini-zabor
mns
/
mns-mini-zabor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
Conversation 0 Commits 141 Files Changed 62 +8 -7
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0bdc048140 - Show all commits

6
components/modal.vue
View File

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

4
components/model/diagram.vue
View File

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

3
components/model/fence.vue
View File

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

2
utils/material.ts
View File

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