From b9fa61f4c4850cb2feca06863ffff196fa249d9a Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 2 Sep 2024 14:06:45 +0300 Subject: [PATCH] colors --- front/src/assets/main.scss | 1 + front/src/components/Promo/env.vue | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/front/src/assets/main.scss b/front/src/assets/main.scss index 9f561c9..8a10e72 100644 --- a/front/src/assets/main.scss +++ b/front/src/assets/main.scss @@ -31,6 +31,7 @@ a[href] { max-width: 40vw; position: relative; z-index: 2; + color: var(--main-text-color) } &-title { diff --git a/front/src/components/Promo/env.vue b/front/src/components/Promo/env.vue index b087bd1..b2da362 100644 --- a/front/src/components/Promo/env.vue +++ b/front/src/components/Promo/env.vue @@ -39,8 +39,8 @@ const loadEnv = async () => { const exrCubeRenderTarget = pmremGenerator.fromEquirectangular(result.renderTarget.texture); const newEnvMap = exrCubeRenderTarget ? exrCubeRenderTarget.texture : null; - // scene.value.environment = newEnvMap - // scene.value.environmentIntensity = 1 + scene.value.environment = newEnvMap + scene.value.environmentIntensity = 1.5 result.renderTarget.texture.dispose(); } catch (error) { @@ -49,10 +49,14 @@ const loadEnv = async () => { const c = new Color() c.set(props.clear_color || PROMOBG) - // renderer.value.setClearColor(c) - // scene.value.fog = new Fog(c, props.focus * k.start, props.focus * k.end) + renderer.value.setClearColor(c) + scene.value.fog = new Fog(c, props.focus * k.start, props.focus * k.end) + const hsl_value = { h: 0, s: 0, l: 0 } + new Color(props.clear_color).getHSL(hsl_value); + document.documentElement.style.setProperty('--primary-color', props.clear_color) + document.documentElement.style.setProperty('--main-text-color', hsl_value.l < 0.5 ? '#fff' : '#000') if (props.clear_color_to) { const c_to = new Color() @@ -67,7 +71,6 @@ const loadEnv = async () => { const grad = ctx.createLinearGradient(0, 0, 0, s); grad.addColorStop(0, props.clear_color); grad.addColorStop(1, props.clear_color_to); - console.log(props.clear_color, props.clear_color_to) ctx.fillStyle = grad; ctx.fillRect(0, 0, s, s); }