diff --git a/front/src/components/Promo/env.vue b/front/src/components/Promo/env.vue index 8b7b358..60effeb 100644 --- a/front/src/components/Promo/env.vue +++ b/front/src/components/Promo/env.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index 834f7d7..10d4375 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -265,14 +265,19 @@ const gotoCenterAndDistance = () => { }); } -loadModels() watch(() => props.source, () => { - const loaded = seekByName(scene.value, 'loaded') - if (loaded) { - loaded.children = [] + if (props.source) { + const loaded = seekByName(scene.value, 'loaded') + if (loaded) { + loaded.children = [] + } + sidebar.close() + try { + loadModels() + } catch (error) { + console.log(error) + } } - sidebar.close() - loadModels() }) watch(() => sidebar, () => { @@ -308,7 +313,7 @@ onAfterRender(() => { clickable_refs.value.map(el => { if (el.value[0] && el.value[0].children) { el.value[0].children[0].lookAt(camera.value?.position) - + const dis_to_cam = camera.value?.position.distanceTo(el.value[0].position); if (dis_to_cam) { // console.log(dis_to_cam) @@ -394,6 +399,8 @@ const clickEvent = (event: MouseEvent) => { } const timerEvent = ['click', 'contextmenu', 'mousedown', 'mouseup', 'touchstart', 'touchend', 'touchmove'] onMounted(() => { + loadModels() + document.addEventListener('click', clickEvent) timerEvent.map((event: string) => { diff --git a/front/src/components/nav.vue b/front/src/components/nav.vue index 874ea65..7502c63 100644 --- a/front/src/components/nav.vue +++ b/front/src/components/nav.vue @@ -29,13 +29,12 @@ console.log(router)