From eb97e545012efee573bae6bae2f7e200ad50169d Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 20 Jun 2024 11:05:41 +0300
Subject: [PATCH] fix extra count

---
 components/modal.vue       | 12 ++++++------
 components/model/fence.vue |  2 +-
 components/model/item.vue  |  7 +------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/components/modal.vue b/components/modal.vue
index 56cf3d8..08e1134 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -100,17 +100,17 @@ const total_txt = computed(() => {
     bar = parseFloat(bar)
     guide = parseFloat(guide)
     const sections = section_count.value as number
-    const extra_mm = extra_section.value as number
-    const length_mm = fence_section.value as number
+    const extra_m = extra_section.value as number * 0.001
+    const length_m = fence_section.value as number
     const lam_count = lamelles_count.value as number
 
     const prices = {
         pillar: mortgage + pillar,
-        lamella: rivets * 2 + lamella * length_mm,
-        lamella_extra: rivets * 2 + lamella * extra_mm,
+        lamella: rivets * 2 + lamella * length_m,
+        lamella_extra: rivets * 2 + lamella * extra_m,
         guide: guide * lam_count * 0.115,
-        top: bar * length_mm,
-        top_extra: bar * extra_mm
+        top: bar * length_m,
+        top_extra: bar * extra_m
     }
 
     const extra = {
diff --git a/components/model/fence.vue b/components/model/fence.vue
index c24d30d..cefa798 100644
--- a/components/model/fence.vue
+++ b/components/model/fence.vue
@@ -98,7 +98,7 @@ watch([section_count, fence_section, extra_section], () => {
         <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" :remove-pos="true" />
+                    <ModelItem :model="props.models.fastening" />
                 </TresGroup>
             </template>
         </TresGroup>
diff --git a/components/model/item.vue b/components/model/item.vue
index fee3832..4da9411 100644
--- a/components/model/item.vue
+++ b/components/model/item.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useGLTF } from '@tresjs/cientos'
 import { Vector3 } from 'three';
-const props = defineProps(['modelUrl', 'model', 'position', 'removePos', 'target', 'color', 'map'])
+const props = defineProps(['modelUrl', 'model', 'position', 'target', 'color', 'map'])
 
 let scene: any
 if (props.modelUrl) {
@@ -17,11 +17,6 @@ const target = ref(props.target ? new Vector3(...props.target) : new Vector3(0,
 
 function shadows_and_pos(scene: any) {
     scene.children.forEach((el: any) => {
-        if (props.removePos) {
-            el.translateX(-el.position.x)
-            el.translateY(-el.position.y)
-            el.translateZ(-el.position.z)
-        }
         shadows_and_pos(el)
     })
 }