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

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

@ -6,6 +6,7 @@ import {
Vector2, Vector3,
CircleGeometry, MeshBasicMaterial,
Quaternion, AdditiveBlending,
Euler,
} from 'three';
import { useTresContext, useSeek, useTexture, useLoop } from '@tresjs/core';
@ -261,14 +262,18 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => {
el.getWorldPosition(target_vector);
target_vector.y = 10;
controls_targetto.value = target_vector;
const quaternion = new Quaternion();
quaternion.setFromAxisAngle(new Vector3(1, 0, 0), -45 * 3 * (Math.PI / 180));
quaternion.setFromAxisAngle(new Vector3(0, 1, 0), -45 * 3 * (Math.PI / 180));
// quaternion.setFromAxisAngle(new Vector3(0, 0, 1), -15 * (Math.PI / 180));
quaternion.setFromEuler(new Euler(
-45 * 1 * (Math.PI / 180),
35 * 1 * (Math.PI / 180),
35 * 1 * (Math.PI / 180)
));
// quaternion.setFromAxisAngle(new Vector3(0, 1, 0).normalize(), 45 * 4 * (Math.PI / 180));
// quaternion.setFromAxisAngle(new Vector3(0, 0, 1).normalize(), -45 * 4 * (Math.PI / 180));
camera_rotatetoto.value = quaternion
controls_targetto.value = target_vector;
camera_moveto.value = target_vector;
}
}
@ -306,15 +311,12 @@ onAfterRender(() => {
// camera.value?.lookAt(camera_moveto.value)
camera_moveto.value = undefined;
camera_moveto_count.value = COUNT;
// (controls.value as any).maxDistance = targetDistance.max;
// (controls.value as any).minDistance = targetDistance.min;
}
}
if (!controls_targetto.value && !camera_moveto.value && camera_rotatetoto.value) {
timer.stopTimer();
// camera.value?.quaternion.slerp(camera_rotatetoto.value, 0.5);
// camera.value?.quaternion.normalize()
camera.value?.quaternion.slerp(camera_rotatetoto.value, 0.5);
camera.value?.quaternion.normalize()
camera_rotatetoto_count.value -= 1;
if (camera_rotatetoto_count.value == 0) {
camera_rotatetoto_count.value = 10;