dev #84

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

View File

@ -86,6 +86,9 @@ watch([section_count, fence_section, extra_section], () => {
} }
}) })
const brace = props.models.brace.clone().children[0]
const brace_h = lamelle_height.value * 3
const pillar = ref<Mesh[]>([]) const pillar = ref<Mesh[]>([])
const setPillar = () => { const setPillar = () => {
const top = props.models.fence_top.children[0]; const top = props.models.fence_top.children[0];
@ -151,12 +154,18 @@ watch([instanced_lamelle, lamelle_color], setLamellesColor)
<template v-for="item in pillar"> <template v-for="item in pillar">
<TresMesh v-bind="item.clone()" /> <TresMesh v-bind="item.clone()" />
</template> </template>
<template v-for="i in (lamelles_count % 6)">
<TresMesh v-bind="brace.clone()" :position-y="brace_h * (i - 1)" />
</template>
</TresGroup> </TresGroup>
<TresGroup name="pillar_two" v-if="!remove_pillar && show_pillar_two" :position-x="pillar_two_pos"> <TresGroup name="pillar_two" v-if="!remove_pillar && show_pillar_two" :position-x="pillar_two_pos">
<template v-for="item in pillar"> <template v-for="item in pillar">
<TresObject3D v-bind="item.clone()" /> <TresObject3D v-bind="item.clone()" />
</template> </template>
<template v-for="i in (lamelles_count % 6)">
<TresMesh v-bind="brace.clone()" :position-y="brace_h * (i - 1)" />
</template>
</TresGroup> </TresGroup>
<TresGroup name="lamelles"> <TresGroup name="lamelles">

View File

@ -21,6 +21,7 @@ const { scene: model_fence_top } = await useGLTF('/fence_one/top.glb')
const { scene: model_fence_center } = await useGLTF('/fence_one/center.glb') const { scene: model_fence_center } = await useGLTF('/fence_one/center.glb')
const { scene: model_fence_bottom } = await useGLTF('/fence_one/bottom.glb') const { scene: model_fence_bottom } = await useGLTF('/fence_one/bottom.glb')
const { scene: model_fence_inner } = await useGLTF('/fence_one/inner.glb') const { scene: model_fence_inner } = await useGLTF('/fence_one/inner.glb')
const { scene: model_brace } = await useGLTF('/fence_one/brace.glb')
const { scene: fastening_model } = await useGLTF('/models_one/krepleniye_planok.glb', { draco: true }); const { scene: fastening_model } = await useGLTF('/models_one/krepleniye_planok.glb', { draco: true });
const { scene: lamelle_model } = await useGLTF('/models_one/lamel_100.glb', { draco: true }); const { scene: lamelle_model } = await useGLTF('/models_one/lamel_100.glb', { draco: true });
@ -29,6 +30,7 @@ const fence = ref(model_fence_center)
const fence_top = ref(model_fence_top) const fence_top = ref(model_fence_top)
const fence_bottom = ref(model_fence_bottom) const fence_bottom = ref(model_fence_bottom)
const fence_inner = ref(model_fence_inner) const fence_inner = ref(model_fence_inner)
const brace = ref(model_brace)
const fastening = ref(fastening_model) const fastening = ref(fastening_model)
const lamelle = ref(lamelle_model) const lamelle = ref(lamelle_model)
@ -89,7 +91,7 @@ watch(open_calc, () => {
<template> <template>
<TresGroup name="base"> <TresGroup name="base">
<template v-for="line in (total >= 4) ? 4 : 1" :key="`${line}_${count}`"> <template v-for="line in (total >= 4) ? 4 : 1" :key="`${line}_${count}`">
<ModelLine :models="{ top, fence, fence_top, fence_bottom, fence_inner, fastening, lamelle }" :number="line" <ModelLine :models="{ top, fence, fence_top, fence_bottom, fence_inner, brace, fastening, lamelle }" :number="line"
:count="count" /> :count="count" />
</template> </template>
</TresGroup> </TresGroup>

Binary file not shown.

BIN
public/fence_one/brace.glb Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -49,8 +49,8 @@ export const set_material = (scene: any, color: any, pattern: { pattern: pattern
} }
} }
test_texture.then((res: Texture) => { test_texture.then((res: Texture) => {
res.wrapT = RepeatWrapping; // res.wrapT = RepeatWrapping;
res.repeat.set(1, 10); // res.repeat.set(1, 10);
res.needsUpdate = true res.needsUpdate = true
material.map = res; material.map = res;
material.normalMap = res; material.normalMap = res;