diff --git a/back/back/settings.py b/back/back/settings.py index 8e86d7b..302a8ee 100644 --- a/back/back/settings.py +++ b/back/back/settings.py @@ -61,6 +61,7 @@ CORS_ORIGIN_WHITELIST = [ "http://127.0.0.1", "http://192.168.103.159", "http://192.168.103.159:3000", + "http://192.168.103.159:5173", "http://192.168.103.159:8000", "http://front:4173", "http://front:5173", diff --git a/front/.env.development b/front/.env.development index d4c57fd..707e245 100644 --- a/front/.env.development +++ b/front/.env.development @@ -1,3 +1,3 @@ VITE_SERVER_URL='https://demo.kustarshina.ru' VITE_IMAGE_URL='https://demo.kustarshina.ru' -# VITE_SERVER_URL='http://localhost:8000' \ No newline at end of file +VITE_SERVER_URL='http://192.168.103.159:8000' \ No newline at end of file diff --git a/front/src/components/Promo/env.vue b/front/src/components/Promo/env.vue index 60b87ed..90d9ebf 100644 --- a/front/src/components/Promo/env.vue +++ b/front/src/components/Promo/env.vue @@ -21,8 +21,8 @@ const loadEnv = async () => { ]) scene.value.environment = result.renderTarget.texture - scene.value.background = result.renderTarget.texture - scene.value.background.mapping = EquirectangularReflectionMapping + // scene.value.background = result.renderTarget.texture + // scene.value.background.mapping = EquirectangularReflectionMapping // scene.value.backgroundBlurriness = 0.15 result.renderTarget.texture.dispose(); } diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index d274729..8c2ea1f 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -15,7 +15,7 @@ import { IMAGE_URL, SERVER_URL, } from '../../constants' import { usePromoSidebar } from '../../stores/promo_sidebar'; import { usePromoScene } from '../../stores/promo_scene'; -const props = defineProps(['source', 'loaded', 'loaded_pan', 'tres_values']) +const props = defineProps(['source', 'loaded', 'loaded_pan', 'clearColor']) const models = ref([]) const clickable = ref([]) @@ -40,9 +40,8 @@ const loadModels = async () => { envVars.hdr_json = raw_data.hdr_json ? `${IMAGE_URL}/${raw_data.hdr_json}` : undefined envVars.hdr_webp = raw_data.hdr_webp ? `${IMAGE_URL}/${raw_data.hdr_webp}` : undefined - // tiltShift.focus = raw_data.max_distance * 0.5 - tiltShift.focus = raw_data.max_distance * 0.5 - tiltShift.aperture = 15 + tiltShift.focus = raw_data.max_distance * 0.33 + tiltShift.aperture = 10 tiltShift.maxblur = 1 const data = raw_data.elements @@ -197,7 +196,7 @@ watch(() => sidebar_scene.list, () => {