dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
1 changed files with 9 additions and 7 deletions
Showing only changes of commit 6aa838b151 - Show all commits

View File

@ -17,7 +17,7 @@ const open_calc = use_open_calc()
const goto_cam = use_goto_camera() const goto_cam = use_goto_camera()
const goto_target = use_goto_target() const goto_target = use_goto_target()
const { scene, controls } = useTresContext() const { scene, controls, camera } = useTresContext()
const { seek, seekAll } = useSeek() const { seek, seekAll } = useSeek()
const topper_models = {} as { [key: toppersIds]: Object3D } const topper_models = {} as { [key: toppersIds]: Object3D }
@ -95,13 +95,13 @@ const setTarget = (smooth = false) => {
goto_target.value = target goto_target.value = target
goto_cam.value = new Vector3(f, f, f) goto_cam.value = new Vector3(f, f, f)
} else { } else {
(controls.value as OrbitControlsProps).target = target (controls.value as OrbitControlsProps).target = target;
// camera.value?.position.set(f, f, f) (controls.value as any).update()
goto_cam.value = new Vector3(f, f, f)
} }
} }
setTarget()
watch([lamelles_count, fence_section], () => { watch([lamelles_count, fence_section], () => {
setTarget(false) setTarget()
open_calc.value = [] open_calc.value = []
}) })
@ -110,7 +110,9 @@ watch(open_calc, () => {
setTarget(true) setTarget(true)
} }
}) })
const min_for_square = 12 const min_for_square = 12;
setTarget()
</script> </script>
<template> <template>
<TresGroup name="base"> <TresGroup name="base">