ksenia_mikhailova
/
demo-int-table
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bx-1379-redesign #15

Merged
ksenia_mikhailova merged 124 commits from bx-1379-redesign into dev 2024-09-06 15:39:13 +03:00
Conversation 0 Commits 124 Files Changed 68 +22 -18
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4dd3e3d237 - Show all commits

32
front/src/components/Promo/load_models.vue
View File

@ -279,7 +279,8 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => {
target_vector.setComponent(1, targetDistance.min) target_vector.setComponent(1, targetDistance.min)
set_moveto(smooth_target, target_vector) 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 }) }, { deep: true })
@ -307,19 +308,6 @@ onBeforeRender(() => {
timer.resetTimer() timer.resetTimer()
home_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)
}
}
}
else
if (smooth_target.value) { if (smooth_target.value) {
(controls.value as any).target.lerp(smooth_target.value as Vector3, koef); (controls.value as any).target.lerp(smooth_target.value as Vector3, koef);
(controls.value as any).update() (controls.value as any).update()
@ -332,6 +320,22 @@ onBeforeRender(() => {
} }
} }
} }
else
if (smooth_move.value) {
camera.value?.position.lerp(smooth_move.value as Vector3, koef);
camera.value?.updateMatrixWorld();
(controls.value as any).update()
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)
}
}
}
} }
}) })