From 64b9290f370af886221323203dbedc5254bd9147 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Fri, 6 Sep 2024 10:22:03 +0300
Subject: [PATCH] point vertical

---
 front/src/assets/nav.scss                      |  1 +
 front/src/components/Main/main_load_models.vue |  2 --
 front/src/components/Promo/load_models.vue     | 16 ++++++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/front/src/assets/nav.scss b/front/src/assets/nav.scss
index 0d03c0a..3173b48 100644
--- a/front/src/assets/nav.scss
+++ b/front/src/assets/nav.scss
@@ -34,6 +34,7 @@ $white: #fff;
         background-color: var(--primary-color);
         color: $white;
         cursor: pointer;
+        font-weight: bold;
 
         &.disabled {
             opacity: 0.5;
diff --git a/front/src/components/Main/main_load_models.vue b/front/src/components/Main/main_load_models.vue
index ba6af98..7b1ea37 100644
--- a/front/src/components/Main/main_load_models.vue
+++ b/front/src/components/Main/main_load_models.vue
@@ -18,8 +18,6 @@ const loadModels = async () => {
         const element = raw_dataStore.data.elements[index];
         const item = {} as model3DType
 
-        if (element.name == 'ground') continue
-
         item.modelUrl = `${IMAGE_URL}/${element.model_file}`
         let { scene: loaded_scene } = await useGLTF(item.modelUrl)
         item.modelFile = loaded_scene
diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue
index 67e3bb9..ee47cc3 100644
--- a/front/src/components/Promo/load_models.vue
+++ b/front/src/components/Promo/load_models.vue
@@ -177,10 +177,10 @@ const loadModels = async () => {
         if (!find_element) continue
         if (find_element && !(find_element as Group).isGroup) {
             const world_position = new Vector3();
-            const size = new Vector3()
+            const size = new Vector3();
             const boundingBox = ((find_element as Mesh).geometry.boundingBox as any)
             boundingBox.getCenter(world_position);
-            boundingBox.getCenter(size);
+            boundingBox.getSize(size);
             (find_element as Mesh).localToWorld(world_position);
 
             const point = point_mesh_obj.clone()
@@ -277,10 +277,10 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => {
             el.getWorldPosition(target_vector);
             target_vector.setComponent(1, raw_dataStore.data.min_distance > 50 ? raw_dataStore.data.min_distance / 7 : 1)
 
-            const d = raw_dataStore.data.max_distance * 0.5;
+            const d = raw_dataStore.data.max_distance * 0.25;
             const lerp_vector = new Vector3()
-            lerp_vector.lerpVectors(camera.value?.position, target_vector, 0.5).multiply(new Vector3(1, 2, 1))
-            // lerp_vector.setComponent(1, d)
+            lerp_vector.lerpVectors(camera.value?.position, target_vector, 0.5)
+            lerp_vector.setComponent(1, d)
             // const multiply = new Vector3(1.25, 1, 1.25)
             const multiply = new Vector3(1, 1, 1)
 
@@ -294,7 +294,7 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => {
                 camera.value?.position
                 && (
                     camera.value?.position.distanceTo(lerp_move) > d
-                    || camera.value?.position.distanceTo(target_move) > 10
+                    || camera.value?.position.distanceTo(target_move) > raw_dataStore.data.min_distance
                 )
             ) {
                 set_moveto(smooth_target, lerp_vector)
@@ -462,11 +462,11 @@ onUnmounted(() => {
             <TresObject3D v-bind="item.clone()" :ref="clickable_refs[i]" />
         </template>
         <TresMesh :position="point_1">
-            <TresBoxGeometry :args="[0.1, 0.1, 0.1]" />
+            <TresSphereGeometry :args="[0.1, 32,32]" />
             <TresMeshStandardMaterial color="violet" />
         </TresMesh>
         <TresMesh :position="point_2">
-            <TresBoxGeometry :args="[0.1, 0.1, 0.1]" />
+            <TresSphereGeometry :args="[0.1, 32,32]" />
             <TresMeshStandardMaterial color="darkgreen" />
         </TresMesh>
     </TresGroup>