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 +17 -5
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4843371930 - Show all commits

2
front/src/components/Main/index.vue
View File

@ -45,7 +45,9 @@ onMounted(async () => {
<TresCanvas window-size :output-encoding="SRGBColorSpace"> <TresCanvas window-size :output-encoding="SRGBColorSpace">
<TresPerspectiveCamera ref="camera" /> <TresPerspectiveCamera ref="camera" />
<OrbitControls v-bind="controlsState" make-default ref="controls" /> <OrbitControls v-bind="controlsState" make-default ref="controls" />
<Suspense>
<MainLoadModels v-if="raw_dataStore.data.id" /> <MainLoadModels v-if="raw_dataStore.data.id" />
</Suspense>
<TresAmbientLight /> <TresAmbientLight />
</TresCanvas> </TresCanvas>
</div> </div>

16
front/src/components/Main/main_load_models.vue
View File

@ -40,13 +40,14 @@ const loadModels = async () => {
} }
models.value.push(item) models.value.push(item)
} }
rotateSet()
} }
const cameraSet = () => { const cameraSet = () => {
if (controls.value) { if (controls.value) {
(controls.value as OrbitControlsProps).minDistance = raw_dataStore.data.min_distance; (controls.value as OrbitControlsProps).minDistance = raw_dataStore.data.min_distance;
(controls.value as OrbitControlsProps).maxDistance = raw_dataStore.data.max_distance; (controls.value as OrbitControlsProps).maxDistance = raw_dataStore.data.max_distance;
(controls.value as OrbitControlsProps).autoRotate = true; // (controls.value as OrbitControlsProps).autoRotate = true;
(controls.value as OrbitControlsProps).autoRotateSpeed = 0.5; // (controls.value as OrbitControlsProps).autoRotateSpeed = 0.5;
(controls.value as any).update() (controls.value as any).update()
} }
if (camera.value) { if (camera.value) {
@ -55,11 +56,20 @@ const cameraSet = () => {
camera.value.updateMatrixWorld() camera.value.updateMatrixWorld()
} }
} }
loadModels() const rotateSet = () => {
if (controls.value) {
(controls.value as OrbitControlsProps).autoRotate = true;
(controls.value as OrbitControlsProps).autoRotateSpeed = 0.5;
}
}
cameraSet() cameraSet()
loadModels()
const { onAfterRender } = useLoop() const { onAfterRender } = useLoop()
onAfterRender(() => { onAfterRender(() => {
if (controls.value) { if (controls.value) {
if (!(controls.value as OrbitControlsProps).autoRotate) {
rotateSet()
}
(controls.value as any).update() (controls.value as any).update()
} }
}) })