bx-1379-redesign #15

Merged
ksenia_mikhailova merged 124 commits from bx-1379-redesign into dev 2024-09-06 15:39:13 +03:00
1 changed files with 8 additions and 3 deletions
Showing only changes of commit 252261aab9 - Show all commits

View File

@ -281,7 +281,7 @@ 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();
@ -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', '')))
}