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

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

@ -281,14 +281,14 @@ watch(() => sidebar, () => {
if (!target) return
const el = seekByName(scene.value, `${sidebar.id_clickable}_clickable`);
if (el) {
// el.visible = false;
el.visible = false;
(controls.value as any).maxDistance = 10;
(controls.value as any).minDistance = 1;
const target_vector = new Vector3();
el.getWorldPosition(target_vector);
controls_targetto.value = target_vector;
camera_rotatetoto.value = new Quaternion(Math.PI*0.5, Math.PI*0.5, Math.PI*0.5, Math.PI*0.5)
camera_rotatetoto.value = new Quaternion(Math.PI * 0.5, Math.PI * 0.5, Math.PI * 0.5, Math.PI * 0.5)
}
}
}, { deep: true })
@ -365,7 +365,12 @@ const clickEvent = (event: MouseEvent) => {
const clickable_objects = seekAllByName(scene.value, '_clickable');
const intersects = raycaster.value.intersectObjects(clickable_objects);
const names = intersects.map(el => (el.object.parent ? el.object.parent.name : el.object.name) ?? false).filter(Boolean)
// const intersects_visible = intersects.filter(el=>el.visi)
const names = intersects
.map(el => (el.object.parent ? el.object.parent.name : el.object.name) ?? false)
.filter(el =>
clickable_objects.find(item => item.name == el).visible == true ?? false
).filter(Boolean)
if (names.length) {
sidebar.open(parseInt(names[0].replace('_clickable', '')))
}