From bb83d39cb9ea14db30d5611d2ffad6ac51e56310 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Fri, 6 Sep 2024 10:55:06 +0300
Subject: [PATCH] without lerp

---
 front/src/components/Promo/load_models.vue | 80 +++++++++-------------
 1 file changed, 33 insertions(+), 47 deletions(-)

diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue
index ee47cc3..5c6e49e 100644
--- a/front/src/components/Promo/load_models.vue
+++ b/front/src/components/Promo/load_models.vue
@@ -35,7 +35,7 @@ const targetDistance = reactive({ max: 10, min: 0 })
 let sidebar_clickable = [] as PromoScene[]
 let sidebar_visible = [] as PromoScene[]
 
-const COUNT = 30
+const COUNT = 50
 type smooth = {
     value: Vector3 | Quaternion | undefined,
     count: number
@@ -271,41 +271,17 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => {
         const el = seekByName(scene.value, `${sidebar.id_clickable}_clickable`);
         if (el) {
             targetDistance.max = 10
-            targetDistance.min = 1
+            targetDistance.min = raw_dataStore.data.min_distance > 50 ? raw_dataStore.data.min_distance / 7 : 3
 
             const target_vector = new Vector3();
             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.25;
-            const lerp_vector = new Vector3()
-            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)
+            target_vector.setComponent(1, targetDistance.min)
 
+            const multiply = new Vector3(1.25, 2, 1.25)
             const target_move = target_vector.multiply(multiply)
-            const lerp_move = lerp_vector.multiply(multiply)
 
-            point_1.value = target_move
-            point_2.value = lerp_move;
-
-            if (
-                camera.value?.position
-                && (
-                    camera.value?.position.distanceTo(lerp_move) > d
-                    || camera.value?.position.distanceTo(target_move) > raw_dataStore.data.min_distance
-                )
-            ) {
-                set_moveto(smooth_target, lerp_vector)
-                set_moveto(smooth_move, lerp_move)
-
-                set_moveto(temp_smooth_target, target_vector)
-                set_moveto(temp_smooth_move, target_move)
-            } else {
-                set_moveto(smooth_target, target_vector)
-                set_moveto(smooth_move, target_move)
-            }
+            set_moveto(smooth_target, target_vector)
+            set_moveto(smooth_move, target_move)
         }
     }
 }, { deep: true })
@@ -327,14 +303,14 @@ onBeforeRender(() => {
             }
         }
     })
-    const koef = (1 / COUNT) * 3
+    // const koef = (1 / COUNT) * 3
+    const koef = 0.05
     const smoothy = [
         {
             el: smooth_target,
             temp_el: temp_smooth_target,
             f: () => {
                 (controls.value as any).target.lerp(smooth_target.value as Vector3, koef);
-                // (controls.value as any).update()
             },
         },
         {
@@ -342,25 +318,35 @@ onBeforeRender(() => {
             temp_el: temp_smooth_move,
             f: () => {
                 camera.value?.position.lerp(smooth_move.value as Vector3, koef);
-                // camera.value?.updateMatrixWorld()
             },
         },
     ]
-    smoothy.forEach(element => {
-        if (element.el.value) {
-            timer.resetTimer()
-            home_timer.resetTimer()
-            element.f()
-            element.el.count -= 1
-            if (element.el.count == 1) {
-                set_moveto(element.el, undefined)
-                if (element.temp_el && element.temp_el.value) {
-                    set_moveto(element.el, element.temp_el.value)
-                    set_moveto(element.temp_el, undefined)
+    if (smooth_target.value || smooth_move.value) {
+        timer.resetTimer()
+        home_timer.resetTimer()
+        if (smooth_move.value) {
+            camera.value?.position.lerp(smooth_move.value as Vector3, koef);
+            smooth_move.count -=1
+            if (smooth_move.count == 1) {
+                set_moveto(smooth_move, undefined)
+                if (temp_smooth_move.value) {
+                    set_moveto(smooth_move, temp_smooth_move.value)
+                    set_moveto(temp_smooth_move, undefined)
+                }
+            }
+        }else
+        if (smooth_target.value) {
+            (controls.value as any).target.lerp(smooth_target.value as Vector3, koef);
+            smooth_target.count -=1
+            if (smooth_target.count == 1) {
+                set_moveto(smooth_target, undefined)
+                if (temp_smooth_target.value) {
+                    set_moveto(smooth_target, temp_smooth_target.value)
+                    set_moveto(temp_smooth_target, undefined)
                 }
             }
         }
-    });
+    }
     (controls.value as any).update()
     camera.value?.updateMatrixWorld()
 })
@@ -462,11 +448,11 @@ onUnmounted(() => {
             <TresObject3D v-bind="item.clone()" :ref="clickable_refs[i]" />
         </template>
         <TresMesh :position="point_1">
-            <TresSphereGeometry :args="[0.1, 32,32]" />
+            <TresSphereGeometry :args="[0.1, 32, 32]" />
             <TresMeshStandardMaterial color="violet" />
         </TresMesh>
         <TresMesh :position="point_2">
-            <TresSphereGeometry :args="[0.1, 32,32]" />
+            <TresSphereGeometry :args="[0.1, 32, 32]" />
             <TresMeshStandardMaterial color="darkgreen" />
         </TresMesh>
     </TresGroup>