From e91bfa14f9c1120726e689b24c6bfcc2c56c0a13 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 29 Jul 2024 11:15:15 +0300 Subject: [PATCH] narmal and displacement map --- front/src/components/Promo/env.vue | 4 ++-- front/src/components/Promo/load_models.vue | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/front/src/components/Promo/env.vue b/front/src/components/Promo/env.vue index a73b1e2..df3e8d8 100644 --- a/front/src/components/Promo/env.vue +++ b/front/src/components/Promo/env.vue @@ -13,7 +13,7 @@ import { IMAGE_URL, PROMOBG } from '../../constants'; const props = defineProps(['hdr_webp', 'hdr_gainmap', 'hdr_json', 'env_displacementmap', 'env_normalmap', 'clear_color', 'focus']) const { renderer, scene } = useTresContext() -const k = { start: 0.5, end: 2.5 } +const k = { start: 0.5, end: 3.5 } renderer.value.outputColorSpace = SRGBColorSpace; renderer.value.toneMapping = ACESFilmicToneMapping; @@ -21,7 +21,7 @@ renderer.value.toneMappingExposure = 1.25; renderer.value.setPixelRatio(1.5) const loadEnv = async () => { - console.log('update env') + // console.log('update env') const loader = new GainMapLoader(renderer.value) const result = await loader.loadAsync([ props.hdr_webp ? `${IMAGE_URL}/${props.hdr_webp}` : hdr_webp, diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index 5c84143..ad1feb8 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -93,7 +93,6 @@ const loadModels = async () => { clickable.value.push(...clickable_areas) } - let c = new Color() if (envVars.clear_color) { c.set(envVars.clear_color) @@ -109,8 +108,8 @@ const loadModels = async () => { } const mesh = { - color: c.offsetHSL(0, 0, -0.33), - displacementScale: envVars.focus, + color: c.offsetHSL(0, 0.5, -0.33), + displacementScale: envVars.focus * 0.33, roughness: 100, side: DoubleSide } as MeshStandardMaterialParameters @@ -123,7 +122,7 @@ const loadModels = async () => { mesh.normalMap = addTexture.normalMap } const ground = new Mesh( - new CircleGeometry(envVars.focus * 10, envVars.focus * 10), + new PlaneGeometry(envVars.focus * 7, envVars.focus * 7, 1024, 1024), new MeshStandardMaterial(mesh) ) ground.position.y = -0.33 * envVars.focus