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 +11 -7
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f00664bcd6 - Show all commits

4
assets/main.scss
View File

@ -186,6 +186,10 @@ a[href^="#"] {
>* { >* {
@apply relative; @apply relative;
} }
>div:first-child {
@apply min-h-[600px];
}
} }
} }

8
components/model/fence.vue
View File

@ -162,14 +162,14 @@ const fastening = ref<Object3D[]>([])
const setFastening = () => { const setFastening = () => {
const top_one = props.models.fixing.clone().children[0]; const top_one = props.models.fixing.clone().children[0];
top_one.position.set( top_one.position.set(
pillar_one_pos.value + pillar_size * 0.75, pillar_one_pos.value + pillar_size * 0.66,
lamelles_count.value * lSize - 0.01 * scale_koef, lamelles_count.value * lSize - 0.015 * scale_koef,
0.025 * scale_koef 0.025 * scale_koef
) )
const top_two = props.models.fixing.clone().children[0]; const top_two = props.models.fixing.clone().children[0];
top_two.position.set( top_two.position.set(
pillar_two_pos.value - pillar_size * 0.75, pillar_two_pos.value - pillar_size * 0.66,
lamelles_count.value * lSize - 0.01 * scale_koef, lamelles_count.value * lSize - 0.01 * scale_koef,
0.025 * scale_koef 0.025 * scale_koef
) )
@ -194,7 +194,7 @@ const setFastening = () => {
side_two.position.set(pillar_two_pos.value, 0, -0.005 * scale_koef); side_two.position.set(pillar_two_pos.value, 0, -0.005 * scale_koef);
let arr = [top_one, top_two, top, side_one, side_two]; let arr = [top_one, top_two, top, side_one, side_two];
[top, side_one, side_two].map(el => { [top, side_one, side_two, ...braces.value].map(el => {
set_material({ children: [el] }, getColorHexFromRal(pillar_color.value)) set_material({ children: [el] }, getColorHexFromRal(pillar_color.value))
}) })
fastening.value = arr.map(el => el.clone()) fastening.value = arr.map(el => el.clone())

4
pages/calc.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<div class="siteblock siteblock_calc bg-white"> <div class="siteblock siteblock_calc bg-white">
<div class="container"> <div class="container">
<div class="col-span-9 h-full relative"> <div class="col-span-12 xl:col-span-9 h-full relative">
<Suspense> <Suspense>
<LazyCalcModels /> <LazyCalcModels />
</Suspense> </Suspense>
</div> </div>
<div class="col-span-3"> <div class="col-span-12 xl:col-span-3">
<CalcValues /> <CalcValues />
</div> </div>
</div> </div>

2
utils/material.ts
View File

@ -58,7 +58,7 @@ export const set_material = (scene: any, color: any, pattern: { pattern: pattern
// alphaMap: pattern ? texture : null, // alphaMap: pattern ? texture : null,
transparent: true, transparent: true,
opacity: 1, opacity: 1,
roughness: 0.2, roughness: 0.5,
metalness: 0, metalness: 0,
side: DoubleSide, side: DoubleSide,
}) })