diff --git a/front/src/components/Promo/index.vue b/front/src/components/Promo/index.vue index bb3f956..b9d94d0 100644 --- a/front/src/components/Promo/index.vue +++ b/front/src/components/Promo/index.vue @@ -44,8 +44,8 @@ const cameraPosition = ref([1, 1, 1]) as unknown as Ref const controlsState = reactive({ enableDamping: true, - maxPolarAngle: (Math.PI / 2) - 0.07, - minAzimuthAngle: (Math.PI / 2) - 0.20, + maxPolarAngle: (60) * (Math.PI / 180), + minAzimuthAngle: (75) * (Math.PI / 180), }) const raw_dataStore = useRawData() diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index 7ca7de0..684d2d3 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -107,7 +107,7 @@ const loadModels = async () => { loading_store.status = 'loading' process_loading.value = props.source - + await raw_dataStore.load(props) raw_dataStore.data.loading = true document.title = `${raw_dataStore.data.name} - ${title}` @@ -309,7 +309,7 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => { const { onBeforeRender } = useLoop() onBeforeRender(() => { clickable_refs.value.map(el => { - el.value[0].visible = (camera.value?.position?.y as number) < raw_dataStore.data.min_distance ? false : true; + el.value[0].visible = (camera.value?.position as Vector3).distanceTo(controls.value.target) < raw_dataStore.data.min_distance ? false : true; if (el.value[0] && el.value[0].children) { el.value[0].children[0].lookAt(camera.value?.position); el.value[0].children[0].rotateX(90 * (Math.PI / 180)); @@ -344,7 +344,8 @@ onBeforeRender(() => { ] smoothy.forEach(element => { if (element.el.value) { - timer.resetTimer(); + timer.resetTimer() + home_timer.resetTimer() element.f() element.el.count -= 1 if (element.el.count == 1) { @@ -372,10 +373,10 @@ timer.timer_func = () => { } else { gotoCenterAndDistance(); } + home_timer.startTimer(); + (controls.value as any).autoRotate = true; (controls.value as any).autoRotateSpeed = 0.5; - - home_timer.startTimer() } } diff --git a/front/src/stores/timer_home.ts b/front/src/stores/timer_home.ts index a297c23..d83d9c0 100644 --- a/front/src/stores/timer_home.ts +++ b/front/src/stores/timer_home.ts @@ -29,6 +29,9 @@ export const useTimerHome = defineStore('timer_home', { this.startTimer() } }, + pauseTimer() { + this.is_enabled = !this.is_enabled + }, resetTimer() { this.seconds_left = BASE_TIMER },