From 9ffa3ce5dbaa6d2f365adcfbffeb8a4f3d3d39a6 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Fri, 28 Jun 2024 11:50:11 +0300
Subject: [PATCH] fps fence

---
 components/model/fence.vue | 39 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/components/model/fence.vue b/components/model/fence.vue
index 4f3502f..a8dc6e9 100644
--- a/components/model/fence.vue
+++ b/components/model/fence.vue
@@ -58,12 +58,13 @@ watch([instanced_lamelle, fence_section, extra_section, lamelles_count], (mesh)
             instanced_lamelle.value.setMatrixAt(i, newmatrix);
 
             if (i >= lamelles_count.value) {
-                instanced_lamelle.value.setMatrixAt(i, new Matrix4().makeTranslation(new Vector3(0,0,-2)));
+                instanced_lamelle.value.setMatrixAt(i, new Matrix4().makeTranslation(new Vector3(0, 2, 2)));
             }
         }
         instanced_lamelle.value.instanceMatrix.needsUpdate = true
     }
 });
+
 watch([section_count, fence_section, extra_section], () => {
     extra.value = (extra_section.value && props.index == (section_count.value + 1)) ? extra_section.value * 0.001 : false
     if (extra_section && props.index == (section_count.value + 1)) {
@@ -80,16 +81,13 @@ watch([section_count, fence_section, extra_section], () => {
 <template>
     <TresGroup :scale="scale_koef" :position-x="translate_to_section" :name="`fence ${index}`"
         :position-y="extra ? 1 : 0">
+
         <TresGroup name="pillar_one" v-if="!remove_pillar && show_pillar_one" :position-x="pillar_one_pos"
             :position-z="0">
             <TresGroup :position-y="(lSize * -0.5)" :scale="[1, 0.5, 1]">
                 <TresObject3D v-bind="props.models.fence.children[0]" />
             </TresGroup>
-            <template v-for="(n, i) in lamelles_count">
-                <TresGroup :position-y="(lSize * i)">
-                    <TresObject3D v-bind="props.models.fence.children[0]" />
-                </TresGroup>
-            </template>
+            <TresObject3D v-bind="props.models.fence.children[0]" :scale-y="lamelles_count" />
             <TresGroup :position-y="(lSize * lamelles_count)" :scale="[1, 0.5, 1]">
                 <TresObject3D v-bind="props.models.fence.children[0]" />
             </TresGroup>
@@ -100,39 +98,20 @@ watch([section_count, fence_section, extra_section], () => {
             <TresGroup :position-y="(lSize * -0.5)" :scale="[-1, 0.5, 1]">
                 <TresObject3D v-bind="props.models.fence.children[0]" />
             </TresGroup>
-            <template v-for="(n, i) in lamelles_count">
-                <TresGroup :position-y="(lSize * i)" :scale="[-1, 1, 1]">
-                    <TresObject3D v-bind="props.models.fence.children[0]" />
-                </TresGroup>
-            </template>
+            <TresObject3D v-bind="props.models.fence.children[0]" :scale="[-1, lamelles_count, 1]" />
             <TresGroup :position-y="(lSize * lamelles_count)" :scale="[-1, 0.5, 1]">
                 <TresObject3D v-bind="props.models.fence.children[0]" />
             </TresGroup>
         </TresGroup>
 
         <TresGroup name="lamelles">
-            <template v-for="(n, i) in lamelles_count" v-if=false>
-                <TresGroup :position="[pillar_size * 0.5, (lSize * i), 0.02]"
-                    :scale-x="((extra as number) || fence_section) * 10">
-                    <TresObject3D v-bind="props.models.lamelle.children[0]" />
-                </TresGroup>
-            </template>
-
             <TresInstancedMesh ref="instanced_lamelle" :args="instanced_v" cast-shadow />
         </TresGroup>
-        <TresGroup name="lam_fastening_one">
-            <template v-for="(n, i) in lamelles_count">
-                <TresGroup :position-y="(lSize * i)" :position-x="pillar_one_pos">
-                    <TresObject3D v-bind="props.models.fastening.children[0]" />
-                </TresGroup>
-            </template>
+        <TresGroup name="lam_fastening_one" :position-x="pillar_one_pos" :scale-y="lamelles_count">
+            <TresObject3D v-bind="props.models.fastening.children[0]" />
         </TresGroup>
-        <TresGroup name="lam_fastening_two">
-            <template v-for="(n, i) in lamelles_count">
-                <TresGroup :position-y="(lSize * i)" :scale="[-1, 1, 1]" :position-x="pillar_two_pos">
-                    <TresObject3D v-bind="props.models.fastening.children[0]" />
-                </TresGroup>
-            </template>
+        <TresGroup name="lam_fastening_two" :position-x="pillar_two_pos" :scale="[-1, lamelles_count, 1]">
+            <TresObject3D v-bind="props.models.fastening.children[0]" />
         </TresGroup>
         <TresGroup name="top_section" :scale-x="((extra as number) || fence_section) * 10"
             :position="[pillar_size * 0.5, lamelles_count * lSize, 0]">