From 9fb3e87e0018766d7b1bed149d48e533fabf0bd6 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 2 Sep 2024 15:54:20 +0300 Subject: [PATCH] remove ground --- back/object/models.py | 6 - back/object/serializers.py | 2 - front/src/components/Promo/index.vue | 17 + front/src/components/Promo/load_models.vue | 41 -- front/src/components/nav.vue | 5 + front/src/index.d.ts | 4 - package-lock.json | 528 +++++++++++++++++++++ package.json | 5 + 8 files changed, 555 insertions(+), 53 deletions(-) create mode 100644 package-lock.json create mode 100644 package.json diff --git a/back/object/models.py b/back/object/models.py index f1cbd23..e80e3e0 100644 --- a/back/object/models.py +++ b/back/object/models.py @@ -16,12 +16,6 @@ def group_based_upload_to(instance, filename): class Environment(models.Model): - env_displacementmap = models.FileField( - upload_to=group_based_upload_to, blank=True, null=True - ) - env_normalmap = models.FileField( - upload_to=group_based_upload_to, blank=True, null=True - ) clear_color = ColorField(blank=True, null=True) clear_color_to = ColorField(blank=True, null=True) hdr_gainmap = models.FileField( diff --git a/back/object/serializers.py b/back/object/serializers.py index 81a9032..f623ac6 100644 --- a/back/object/serializers.py +++ b/back/object/serializers.py @@ -6,8 +6,6 @@ class EnvironmentSerializer(serializers.ModelSerializer): hdr_gainmap = serializers.FileField(use_url=False) hdr_json = serializers.FileField(use_url=False) hdr_webp = serializers.FileField(use_url=False) - env_displacementmap = serializers.FileField(use_url=False) - env_normalmap = serializers.FileField(use_url=False) class Meta: model = Environment diff --git a/front/src/components/Promo/index.vue b/front/src/components/Promo/index.vue index ac2e86e..adc35da 100644 --- a/front/src/components/Promo/index.vue +++ b/front/src/components/Promo/index.vue @@ -15,6 +15,8 @@ import { usePromoSidebar } from '../../stores/promo_sidebar'; import { useLoading } from '../../stores/loading'; import { useRawData } from '../../stores/raw_data'; +import { Pixelation, EffectComposer } from '@tresjs/post-processing' + const minPan = ref(new Vector3(-2, -2, -2)) const maxPan = ref(new Vector3(2, 2, 2)) const _v = new Vector3(); @@ -53,6 +55,16 @@ const sidebarFunc = () => { sidebar.open() } } + +const bloomParams = reactive({ + luminanceThreshold: 0.1, + luminanceSmoothing: 0.3, + mipmapBlur: true, + intensity: 0.4, + radius: 0.5, + disableRender: true, + // blendFunction: BlendFunction.ADD, +})