From 4dd3e3d23715d9eae219074300f4aa4279dce43f Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Fri, 6 Sep 2024 14:00:55 +0300 Subject: [PATCH] position --- front/src/components/Promo/load_models.vue | 40 ++++++++++++---------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index c81ee31..d2e3845 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -279,7 +279,8 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => { target_vector.setComponent(1, targetDistance.min) set_moveto(smooth_target, target_vector) - set_moveto(smooth_move, target_vector.multiply(new Vector3(1.25, 1, 1.25))) + // set_moveto(smooth_move, target_vector.multiply(new Vector3(1.25, 1, 1.25).setY(targetDistance.min))) + set_moveto(smooth_move, new Vector3(targetDistance.min, targetDistance.min, targetDistance.min)) } } }, { deep: true }) @@ -307,31 +308,34 @@ onBeforeRender(() => { timer.resetTimer() home_timer.resetTimer() - if (smooth_move.value) { - camera.value?.position.lerp(smooth_move.value as Vector3, koef); - camera.value?.updateMatrixWorld() - 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) + if (smooth_target.value) { + (controls.value as any).target.lerp(smooth_target.value as Vector3, koef); + (controls.value as any).update() + 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) } } } else - if (smooth_target.value) { - (controls.value as any).target.lerp(smooth_target.value as Vector3, koef); + if (smooth_move.value) { + camera.value?.position.lerp(smooth_move.value as Vector3, koef); + camera.value?.updateMatrixWorld(); (controls.value as any).update() - 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) + + 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) } } } + } })