diff --git a/front/src/assets/btn/3D_lg.svg b/front/src/assets/btn/3D_lg.svg new file mode 100644 index 0000000..cae3bb7 --- /dev/null +++ b/front/src/assets/btn/3D_lg.svg @@ -0,0 +1,4 @@ + + + + diff --git a/front/src/assets/btn/3D_sm.svg b/front/src/assets/btn/3D_sm.svg new file mode 100644 index 0000000..29a3a51 --- /dev/null +++ b/front/src/assets/btn/3D_sm.svg @@ -0,0 +1,4 @@ + + + + diff --git a/front/src/assets/btn/enter.svg b/front/src/assets/btn/enter.svg new file mode 100644 index 0000000..58bb2d2 --- /dev/null +++ b/front/src/assets/btn/enter.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/front/src/assets/btn/gallery.svg b/front/src/assets/btn/gallery.svg new file mode 100644 index 0000000..3aee3f7 --- /dev/null +++ b/front/src/assets/btn/gallery.svg @@ -0,0 +1,4 @@ + + + + diff --git a/front/src/assets/btn/home.svg b/front/src/assets/btn/home.svg new file mode 100644 index 0000000..e9dac4f --- /dev/null +++ b/front/src/assets/btn/home.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/assets/btn/left_lg.svg b/front/src/assets/btn/left_lg.svg new file mode 100644 index 0000000..704bf65 --- /dev/null +++ b/front/src/assets/btn/left_lg.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/assets/btn/left_sm.svg b/front/src/assets/btn/left_sm.svg new file mode 100644 index 0000000..07dcbe6 --- /dev/null +++ b/front/src/assets/btn/left_sm.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/assets/btn/minus.svg b/front/src/assets/btn/minus.svg new file mode 100644 index 0000000..45ab541 --- /dev/null +++ b/front/src/assets/btn/minus.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/assets/btn/plus_lg.svg b/front/src/assets/btn/plus_lg.svg new file mode 100644 index 0000000..45542f8 --- /dev/null +++ b/front/src/assets/btn/plus_lg.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/assets/btn/plus_sm.svg b/front/src/assets/btn/plus_sm.svg new file mode 100644 index 0000000..ec71f07 --- /dev/null +++ b/front/src/assets/btn/plus_sm.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/assets/btn/right_lg.svg b/front/src/assets/btn/right_lg.svg new file mode 100644 index 0000000..557dde4 --- /dev/null +++ b/front/src/assets/btn/right_lg.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/assets/btn/right_sm.svg b/front/src/assets/btn/right_sm.svg new file mode 100644 index 0000000..5a184ce --- /dev/null +++ b/front/src/assets/btn/right_sm.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/assets/sidebar.scss b/front/src/assets/sidebar.scss index d4b3a67..42229f3 100644 --- a/front/src/assets/sidebar.scss +++ b/front/src/assets/sidebar.scss @@ -65,9 +65,19 @@ $boxShadow: 0px 0px 8px rgba(0, 0, 0, .25); pointer-events: none; } - > a { + >a { line-height: 1; color: inherit; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } + + svg { + width: 50%; + height: 50%; } } @@ -80,6 +90,11 @@ $boxShadow: 0px 0px 8px rgba(0, 0, 0, .25); &-deep { width: 4rem; height: 4rem; + + svg { + width: 80%; + height: 80%; + } } } diff --git a/front/src/components/Promo/index.vue b/front/src/components/Promo/index.vue index 07bc372..1330e1b 100644 --- a/front/src/components/Promo/index.vue +++ b/front/src/components/Promo/index.vue @@ -14,11 +14,13 @@ import { PROMOBG } from '../../constants'; import { usePromoSidebar } from '../../stores/promo_sidebar'; import { useLoading } from '../../stores/loading'; import { useRawData } from '../../stores/raw_data'; - -import { Pixelation, EffectComposer } from '@tresjs/post-processing' -import { useClickable } from '../../stores/clickable'; import { usePromoScene } from '../../stores/promo_scene'; +import icon_enter from '../../assets/btn/enter.svg'; +import icon_right from '../../assets/btn/right_sm.svg'; +import icon_left from '../../assets/btn/left_sm.svg'; +import icon_plus from '../../assets/btn/plus_lg.svg'; + const minPan = ref(new Vector3(-2, -2, -2)) const maxPan = ref(new Vector3(2, 2, 2)) const _v = new Vector3(); @@ -94,22 +96,22 @@ const nextClickableId = () => {
- +
- +
- +
- +
diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index 5144521..2e05931 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -303,6 +303,7 @@ onAfterRender(() => { camera.value?.position.lerp(camera_moveto.value, koef); camera_moveto_count.value -= 1 if (camera_moveto_count.value == 0) { + // camera.value?.lookAt(camera_moveto.value) camera_moveto.value = undefined; camera_moveto_count.value = COUNT; @@ -310,10 +311,10 @@ onAfterRender(() => { // (controls.value as any).minDistance = targetDistance.min; } } - if (camera_rotatetoto.value) { + if (!controls_targetto.value && !camera_moveto.value && camera_rotatetoto.value) { timer.stopTimer(); - camera.value?.quaternion.slerp(camera_rotatetoto.value, 0.5); - camera.value?.quaternion.normalize() + // camera.value?.quaternion.slerp(camera_rotatetoto.value, 0.5); + // camera.value?.quaternion.normalize() camera_rotatetoto_count.value -= 1; if (camera_rotatetoto_count.value == 0) { camera_rotatetoto_count.value = 10; diff --git a/front/src/components/nav.vue b/front/src/components/nav.vue index 130a041..e4f2b42 100644 --- a/front/src/components/nav.vue +++ b/front/src/components/nav.vue @@ -1,4 +1,7 @@