dev #84

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

View File

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

View File

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

View File

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

View File

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