From 78896b55a4b19f7f94399834f08b9e85c435ca2c Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova
Date: Mon, 2 Sep 2024 13:37:41 +0300
Subject: [PATCH] gradient
---
front/src/assets/main.scss | 5 ++-
front/src/components/Main/index.vue | 8 ++---
.../src/components/Main/main_load_models.vue | 8 +++--
front/src/components/Promo/env.vue | 32 +++++++++++++++++--
4 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/front/src/assets/main.scss b/front/src/assets/main.scss
index 42feae5..28390f8 100644
--- a/front/src/assets/main.scss
+++ b/front/src/assets/main.scss
@@ -54,9 +54,8 @@ a[href] {
&-canvas {
flex-grow: 1;
- height: 50vh;
- width: 100vw;
- max-height: 65vh;
+ height: 100vh;
+ z-index: -1;
}
}
diff --git a/front/src/components/Main/index.vue b/front/src/components/Main/index.vue
index fa02942..7bbee19 100644
--- a/front/src/components/Main/index.vue
+++ b/front/src/components/Main/index.vue
@@ -17,12 +17,12 @@ const controls = ref()
const controlsState = reactive({
enableDamping: true,
- minPolarAngle: 45 * (Math.PI / 180),
- maxPolarAngle: 45 * (Math.PI / 180),
+ minPolarAngle: 66 * (Math.PI / 180),
+ maxPolarAngle: 66 * (Math.PI / 180),
// minAzimuthAngle: (Math.PI / 2) / 2,
enablePan: false,
enableZoom: false,
- autoRotate: true,
+ // autoRotate: true,
})
await pageStore.load(route.params)
await raw_dataStore.load({ source: pageStore.page.scene_3d })
@@ -42,7 +42,7 @@ onMounted(async () => {
-
+
diff --git a/front/src/components/Main/main_load_models.vue b/front/src/components/Main/main_load_models.vue
index 6e0ad1a..b573740 100644
--- a/front/src/components/Main/main_load_models.vue
+++ b/front/src/components/Main/main_load_models.vue
@@ -50,8 +50,8 @@ const cameraSet = () => {
(controls.value as any).update()
}
if (camera.value) {
- const d = raw_dataStore.data.max_distance * 0.5;
- camera.value.position.set(d * 0.25, d * 0.5, d);
+ const d = raw_dataStore.data.max_distance * 0.75;
+ camera.value.position.set(d * 0.25, d, d);
camera.value.updateMatrixWorld()
}
}
@@ -59,7 +59,9 @@ loadModels()
cameraSet()
const { onAfterRender } = useLoop()
onAfterRender(() => {
- (controls.value as any).update()
+ if (controls.value) {
+ (controls.value as any).update()
+ }
})
diff --git a/front/src/components/Promo/env.vue b/front/src/components/Promo/env.vue
index 39fcce4..175ddd5 100644
--- a/front/src/components/Promo/env.vue
+++ b/front/src/components/Promo/env.vue
@@ -1,7 +1,7 @@