From 05afc0e4c613fd6908e7e88a7631398af3371143 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 26 Sep 2024 15:21:37 +0300
Subject: [PATCH] files rename

---
 components/expDiagram.vue                         |  13 ++-----------
 components/model/diagram.vue                      |  12 ++++++------
 components/model/parametric.vue                   |  10 +++++-----
 pages/index.vue                                   |  14 ++++++++++----
 public/{models => models_exp}/kosynka.glb         | Bin
 .../{models => models_exp}/krepleniye_planok.glb  | Bin
 public/{models => models_exp}/osnova_stolba.glb   | Bin
 public/{models => models_exp}/planki.glb          | Bin
 public/{models => models_exp}/stolb.glb           | Bin
 public/{models => models_exp}/verh.glb            | Bin
 public/{fence_one => models_one}/bottom.glb       | Bin
 public/{fence_one => models_one}/brace.glb        | Bin
 public/{fence_one => models_one}/center.glb       | Bin
 public/{fence_one => models_one}/inner.glb        | Bin
 public/{fence_one => models_one}/top.glb          | Bin
 15 files changed, 23 insertions(+), 26 deletions(-)
 rename public/{models => models_exp}/kosynka.glb (100%)
 rename public/{models => models_exp}/krepleniye_planok.glb (100%)
 rename public/{models => models_exp}/osnova_stolba.glb (100%)
 rename public/{models => models_exp}/planki.glb (100%)
 rename public/{models => models_exp}/stolb.glb (100%)
 rename public/{models => models_exp}/verh.glb (100%)
 rename public/{fence_one => models_one}/bottom.glb (100%)
 rename public/{fence_one => models_one}/brace.glb (100%)
 rename public/{fence_one => models_one}/center.glb (100%)
 rename public/{fence_one => models_one}/inner.glb (100%)
 rename public/{fence_one => models_one}/top.glb (100%)

diff --git a/components/expDiagram.vue b/components/expDiagram.vue
index 66193a8..68de2ca 100644
--- a/components/expDiagram.vue
+++ b/components/expDiagram.vue
@@ -18,23 +18,16 @@ const toggleExpState = () => {
     explosion_state.value = !explosion_state.value
 }
 const back_light = ref()
-const key_light = ref()
 const secondary_light = ref()
 const loadAll = async () => {
     const { scene: back } = await useGLTF('/models_light/back_exp.glb')
-    const { scene: key } = await useGLTF('/models_light/key_exp.glb')
     const { scene: secondary } = await useGLTF('/models_light/secondary_exp.glb')
 
-    const k = 0.001
+    const k = 0.03
 
     back_light.value = back.children[0]
     back_light.value.intensity = back_light.value.intensity * k
-    back_light.value.shadow.bias = -0.01
-
-    key_light.value = key.children[0]
-    key_light.value.intensity = key_light.value.intensity * k
-    key_light.value.shadow.bias = -0.01
-    key_light.value.cast_shadow = true
+    back_light.value.shadow.bias = -0.02
 
     secondary_light.value = secondary.children[0]
     secondary_light.value.intensity = secondary_light.value.intensity * k
@@ -69,8 +62,6 @@ onMounted(() => {
 
                 <TresPointLight v-bind="back_light" v-if="back_light"
                     :position="[back_light.position.x, back_light.position.y, back_light.position.z]" />
-                <TresPointLight v-bind="key_light" v-if="key_light"
-                    :position="[key_light.position.x, key_light.position.y, key_light.position.z]" />
                 <TresPointLight v-bind="secondary_light" v-if="secondary_light"
                     :position="[secondary_light.position.x, secondary_light.position.y, secondary_light.position.z]" />
                 <!-- <TresAmbientLight :intensity="2" /> -->
diff --git a/components/model/diagram.vue b/components/model/diagram.vue
index 5638dd1..3844897 100644
--- a/components/model/diagram.vue
+++ b/components/model/diagram.vue
@@ -15,12 +15,12 @@ const targetExplosion = {
     verh: [0 * k, 0.25 * k, 0 * k],
 }
 
-const { scene: kosynka } = await useGLTF('/models/kosynka.glb')
-const { scene: krepleniye_planok } = await useGLTF('/models/krepleniye_planok.glb')
-const { scene: osnova_stolba } = await useGLTF('/models/osnova_stolba.glb')
-const { scene: planki } = await useGLTF('/models/planki.glb')
-const { scene: stolb } = await useGLTF('/models/stolb.glb')
-const { scene: verh } = await useGLTF('/models/verh.glb')
+const { scene: kosynka } = await useGLTF('/models_exp/kosynka.glb')
+const { scene: krepleniye_planok } = await useGLTF('/models_exp/krepleniye_planok.glb')
+const { scene: osnova_stolba } = await useGLTF('/models_exp/osnova_stolba.glb')
+const { scene: planki } = await useGLTF('/models_exp/planki.glb')
+const { scene: stolb } = await useGLTF('/models_exp/stolb.glb')
+const { scene: verh } = await useGLTF('/models_exp/verh.glb')
 
 const lamelle_color = use_lamelle_color()
 const pillar_color = use_pillar_color()
diff --git a/components/model/parametric.vue b/components/model/parametric.vue
index 50e26c9..f68124c 100644
--- a/components/model/parametric.vue
+++ b/components/model/parametric.vue
@@ -17,11 +17,11 @@ const { scene, controls, camera } = useTresContext()
 const { seek, seekAll } = useSeek()
 
 const { scene: top_model } = await useGLTF('/models_one/verh_100.glb', { draco: true })
-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_bottom } = await useGLTF('/fence_one/bottom.glb')
-const { scene: model_fence_inner } = await useGLTF('/fence_one/inner.glb')
-const { scene: model_brace } = await useGLTF('/fence_one/brace.glb')
+const { scene: model_fence_top } = await useGLTF('/models_one/top.glb')
+const { scene: model_fence_center } = await useGLTF('/models_one/center.glb')
+const { scene: model_fence_bottom } = await useGLTF('/models_one/bottom.glb')
+const { scene: model_fence_inner } = await useGLTF('/models_one/inner.glb')
+const { scene: model_brace } = await useGLTF('/models_one/brace.glb')
 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 });
 
diff --git a/pages/index.vue b/pages/index.vue
index 4dffb05..d6a1408 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -107,10 +107,16 @@ const { data: advData } = await apiFetch<ApiAdvantageType[]>(`advantage/`)
                 alt="коричневый забор" title="" format="webp" loading="lazy" />
         </div>
         <div class="siteblock siteblock_calc bg-white">
-            <LazyCalcValues />
-            <Suspense>
-                <LazyCalcModels />
-            </Suspense>
+            <div class="container">
+                <div class="col-span-9 h-full relative">
+                    <Suspense>
+                        <LazyCalcModels />
+                    </Suspense>
+                </div>
+                <div class="col-span-3">
+                    <CalcValues />
+                </div>
+            </div>
         </div>
         <div class="siteblock bg-white siteblock_content" :id="delivery?.slug" v-if="deliveryText">
             <div class="container">
diff --git a/public/models/kosynka.glb b/public/models_exp/kosynka.glb
similarity index 100%
rename from public/models/kosynka.glb
rename to public/models_exp/kosynka.glb
diff --git a/public/models/krepleniye_planok.glb b/public/models_exp/krepleniye_planok.glb
similarity index 100%
rename from public/models/krepleniye_planok.glb
rename to public/models_exp/krepleniye_planok.glb
diff --git a/public/models/osnova_stolba.glb b/public/models_exp/osnova_stolba.glb
similarity index 100%
rename from public/models/osnova_stolba.glb
rename to public/models_exp/osnova_stolba.glb
diff --git a/public/models/planki.glb b/public/models_exp/planki.glb
similarity index 100%
rename from public/models/planki.glb
rename to public/models_exp/planki.glb
diff --git a/public/models/stolb.glb b/public/models_exp/stolb.glb
similarity index 100%
rename from public/models/stolb.glb
rename to public/models_exp/stolb.glb
diff --git a/public/models/verh.glb b/public/models_exp/verh.glb
similarity index 100%
rename from public/models/verh.glb
rename to public/models_exp/verh.glb
diff --git a/public/fence_one/bottom.glb b/public/models_one/bottom.glb
similarity index 100%
rename from public/fence_one/bottom.glb
rename to public/models_one/bottom.glb
diff --git a/public/fence_one/brace.glb b/public/models_one/brace.glb
similarity index 100%
rename from public/fence_one/brace.glb
rename to public/models_one/brace.glb
diff --git a/public/fence_one/center.glb b/public/models_one/center.glb
similarity index 100%
rename from public/fence_one/center.glb
rename to public/models_one/center.glb
diff --git a/public/fence_one/inner.glb b/public/models_one/inner.glb
similarity index 100%
rename from public/fence_one/inner.glb
rename to public/models_one/inner.glb
diff --git a/public/fence_one/top.glb b/public/models_one/top.glb
similarity index 100%
rename from public/fence_one/top.glb
rename to public/models_one/top.glb