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 +16 -11
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0c2c12f5c6 - Show all commits

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

@ -273,6 +273,8 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => {
el.getWorldPosition(target_vector); el.getWorldPosition(target_vector);
target_vector.y = raw_dataStore.data.min_distance > 50 ? raw_dataStore.data.min_distance / 10 : 1; target_vector.y = raw_dataStore.data.min_distance > 50 ? raw_dataStore.data.min_distance / 10 : 1;
const target_vector_1 = target_vector.clone().multiplyScalar(3)
console.log(target_vector, target_vector_1)
const quaternion = new Quaternion(); const quaternion = new Quaternion();
quaternion.setFromEuler(new Euler( quaternion.setFromEuler(new Euler(
@ -283,15 +285,18 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => {
set_moveto(smooth_rotate, quaternion) set_moveto(smooth_rotate, quaternion)
const d = raw_dataStore.data.max_distance * 0.5
if(camera.value?.position && camera.value?.position.distanceTo(new Vector3(d,d,d)) > 20) {
set_moveto(temp_smooth_target, target_vector) set_moveto(temp_smooth_target, target_vector)
set_moveto(temp_smooth_move, target_vector) set_moveto(temp_smooth_move, target_vector)
set_moveto(smooth_target, new Vector3(0, 0, 0)) set_moveto(smooth_target, new Vector3(0, 0, 0))
set_moveto(smooth_move, new Vector3( set_moveto(smooth_move, new Vector3(d, d, d))
raw_dataStore.data.max_distance * 0.5, } else {
raw_dataStore.data.max_distance * 0.5, set_moveto(smooth_target, target_vector)
raw_dataStore.data.max_distance * 0.5 set_moveto(smooth_move, target_vector)
)) }
vis_target.value = target_vector; vis_target.value = target_vector;
} }
} }
@ -311,7 +316,7 @@ onAfterRender(() => {
} }
} }
}) })
const koef = 0.02 const koef = 1 / COUNT
if (smooth_target.value) { if (smooth_target.value) {
timer.stopTimer(); timer.stopTimer();
(controls.value as any).target.lerp(smooth_target.value, koef); (controls.value as any).target.lerp(smooth_target.value, koef);