ksenia_mikhailova
/
demo-int-table
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bx-1316-refactoring #14

Merged
ksenia_mikhailova merged 46 commits from bx-1316-refactoring into dev 2024-08-28 15:06:52 +03:00
Conversation 0 Commits 46 Files Changed 295 +15 -1261
3 changed files with 15 additions and 1261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4e2f7ef29d - Show all commits

1254
.vscode/PythonImportHelper-v2-Completion.json vendored
View File

File diff suppressed because it is too large Load Diff

2
front/.env.development
View File

@ -1,4 +1,4 @@
VITE_SERVER_URL='https://demo.kustarshina.ru' VITE_SERVER_URL='https://demo.kustarshina.ru'
VITE_IMAGE_URL='https://demo.kustarshina.ru' VITE_IMAGE_URL='https://demo.kustarshina.ru'
VITE_SERVER_URL='https://demo.kustarshina.ru' VITE_SERVER_URL='https://demo.kustarshina.ru'
VITE_SERVER_URL='http://192.168.106.234:8000' VITE_SERVER_URL='http://localhost:8000'

20
front/src/components/Promo/load_models.vue
View File

@ -47,7 +47,11 @@ setInterval(() => {
} else if (timer.value == 0 && !(controls.value as any).autoRotate && (controls.value as any).enabled) { } else if (timer.value == 0 && !(controls.value as any).autoRotate && (controls.value as any).enabled) {
pause() pause()
if (controls.value && camera.value) { if (controls.value && camera.value) {
camera.value?.position.set(10, (controls.value as any).minDistance * 0.75, (controls.value as any).minDistance); camera.value?.position.set(
(controls.value as any).maxDistance * 0.5,
(controls.value as any).maxDistance * 0.5,
(controls.value as any).maxDistance * 0.5
);
(controls.value as any).target = new Vector3(0, 0, 0); (controls.value as any).target = new Vector3(0, 0, 0);
(controls.value as any).autoRotate = true; (controls.value as any).autoRotate = true;
(controls.value as any).autoRotateSpeed = 1; (controls.value as any).autoRotateSpeed = 1;
@ -81,14 +85,18 @@ const loadModels = async () => {
(controls.value as any).minDistance = mobileAndTabletCheck() ? raw_data.min_distance * 0.5 : raw_data.min_distance; (controls.value as any).minDistance = mobileAndTabletCheck() ? raw_data.min_distance * 0.5 : raw_data.min_distance;
(controls.value as any).maxDistance = raw_data.max_distance; (controls.value as any).maxDistance = raw_data.max_distance;
camera.value?.position.set(
(controls.value as any).maxDistance * 0.5,
(controls.value as any).maxDistance * 0.5,
(controls.value as any).maxDistance * 0.5
);
(controls.value as any).target = new Vector3(0, 0, 0);
(controls.value as any).autoRotate = false;
(controls.value as any)._needsUpdate = true; (controls.value as any)._needsUpdate = true;
(controls.value as any).update() (controls.value as any).update()
camera.value?.position.set(10, (controls.value as any).minDistance * 0.75, (controls.value as any).minDistance);
camera.value?.lookAt(0, 0, 0);
(controls.value as any).reset()
const sidebar_items = [] as PromoScene[] const sidebar_items = [] as PromoScene[]
clickable_items.value = [] clickable_items.value = []