From b88823cb6e97e699feef71f90a2100ca6a88cb1e Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Fri, 28 Jun 2024 09:21:44 +0300
Subject: [PATCH] replace model item to tres object 3d in calc values

---
 components/model/fence.vue | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/components/model/fence.vue b/components/model/fence.vue
index 4ae185b..69221cc 100644
--- a/components/model/fence.vue
+++ b/components/model/fence.vue
@@ -81,48 +81,43 @@ watch([section_count, fence_section, extra_section], () => {
         <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]">
-                <ModelItem :model="props.models.fence" />
+                <TresObject3D v-bind="props.models.fence.children[0]" />
             </TresGroup>
             <template v-for="(n, i) in lamelles_count">
                 <TresGroup :position-y="(lSize * i)">
-                    <ModelItem :model="props.models.fence" />
+                    <TresObject3D v-bind="props.models.fence.children[0]" />
                 </TresGroup>
             </template>
             <TresGroup :position-y="(lSize * lamelles_count)" :scale="[1, 0.5, 1]">
-                <ModelItem :model="props.models.fence" />
+                <TresObject3D v-bind="props.models.fence.children[0]" />
             </TresGroup>
         </TresGroup>
 
         <TresGroup name="pillar_two" v-if="!remove_pillar && show_pillar_two" :position-x="pillar_two_pos"
             :position-z="0">
             <TresGroup :position-y="(lSize * -0.5)" :scale="[-1, 0.5, 1]">
-                <ModelItem :model="props.models.fence" />
+                <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]">
-                    <ModelItem :model="props.models.fence" />
+                    <TresObject3D v-bind="props.models.fence.children[0]" />
                 </TresGroup>
             </template>
             <TresGroup :position-y="(lSize * lamelles_count)" :scale="[-1, 0.5, 1]">
-                <ModelItem :model="props.models.fence" />
+                <TresObject3D v-bind="props.models.fence.children[0]" />
             </TresGroup>
         </TresGroup>
 
         <TresGroup name="lamelles">
-            <template v-for="(n, i) in lamelles_count" v-if="false">
+            <template v-for="(n, i) in lamelles_count">
                 <TresGroup :position="[pillar_size * 0.5, (lSize * i), 0.02]"
                     :scale-x="((extra as number) || fence_section) * 10">
-                    <ModelItem :model="props.models.lamelle" />
+                    <TresObject3D v-bind="props.models.lamelle.children[0]" />
                 </TresGroup>
             </template>
 
-            <TresMesh :position-z="1"
-                :scale-x="((extra as number) || fence_section) * 10">
-                <TresObject3D v-bind="props.models.lamelle.children[0]" />
-                <TresMeshBasicMaterial color="blue" />
-            </TresMesh>
-            <TresInstancedMesh ref="instancedMesh" :args="[null!, null!, 4]"
-                :scale-x="((extra as number) || fence_section) * 10">
+            <TresInstancedMesh ref="instancedMesh" :args="[props.models.lamelle.children[0].geometry, null!, 4]"
+                :scale-x="((extra as number) || fence_section) * 10" v-if=false>
                 <TresBufferGeometry v-bind="props.models.lamelle.children[0].geometry" />
                 <TresMeshBasicMaterial color="red" />
             </TresInstancedMesh>
@@ -130,20 +125,20 @@ watch([section_count, fence_section, extra_section], () => {
         <TresGroup name="lam_fastening_one">
             <template v-for="(n, i) in lamelles_count">
                 <TresGroup :position-y="(lSize * i)" :position-x="pillar_one_pos">
-                    <ModelItem :model="props.models.fastening" />
+                    <TresObject3D v-bind="props.models.fastening.children[0]" />
                 </TresGroup>
             </template>
         </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">
-                    <ModelItem :model="props.models.fastening" />
+                    <TresObject3D v-bind="props.models.fastening.children[0]" />
                 </TresGroup>
             </template>
         </TresGroup>
         <TresGroup name="top_section" :scale-x="((extra as number) || fence_section) * 10"
             :position="[pillar_size * 0.5, lamelles_count * lSize, 0]">
-            <ModelItem :model="props.models.top" />
+            <TresObject3D v-bind="props.models.top.children[0]" />
         </TresGroup>
     </TresGroup>
 </template>
\ No newline at end of file