ksenia_mikhailova
/
demo-int-table
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bx-1379-redesign #15

Merged
ksenia_mikhailova merged 124 commits from bx-1379-redesign into dev 2024-09-06 15:39:13 +03:00
Conversation 0 Commits 124 Files Changed 68 +12 -9
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f3b520a1a2 - Show all commits

3
front/src/assets/main.scss
View File

@ -29,6 +29,8 @@ a[href] {
&-title, &-title,
&-desc { &-desc {
max-width: 40vw; max-width: 40vw;
position: relative;
z-index: 2;
} }
&-title { &-title {
@ -55,7 +57,6 @@ a[href] {
&-canvas { &-canvas {
flex-grow: 1; flex-grow: 1;
height: 100vh; height: 100vh;
z-index: -1;
} }
} }

18
front/src/components/Promo/env.vue
View File

@ -24,6 +24,9 @@ renderer.value.toneMapping = ACESFilmicToneMapping;
renderer.value.toneMappingExposure = 1.25; renderer.value.toneMappingExposure = 1.25;
renderer.value.setPixelRatio((window.devicePixelRatio || 1) * 2) renderer.value.setPixelRatio((window.devicePixelRatio || 1) * 2)
const pmremGenerator = new PMREMGenerator(renderer.value);
pmremGenerator.compileEquirectangularShader();
const loadEnv = async () => { const loadEnv = async () => {
try { try {
const loader = new GainMapLoader(renderer.value) const loader = new GainMapLoader(renderer.value)
@ -32,15 +35,12 @@ const loadEnv = async () => {
props.hdr_gainmap ? `${IMAGE_URL}/${props.hdr_gainmap}` : hdr_gainmap, props.hdr_gainmap ? `${IMAGE_URL}/${props.hdr_gainmap}` : hdr_gainmap,
props.hdr_json ? `${IMAGE_URL}/${props.hdr_json}` : hdr_json, props.hdr_json ? `${IMAGE_URL}/${props.hdr_json}` : hdr_json,
]) ])
const pmremGenerator = new PMREMGenerator(renderer.value);
pmremGenerator.compileEquirectangularShader();
const exrCubeRenderTarget = pmremGenerator.fromEquirectangular(result.renderTarget.texture); const exrCubeRenderTarget = pmremGenerator.fromEquirectangular(result.renderTarget.texture);
const newEnvMap = exrCubeRenderTarget ? exrCubeRenderTarget.texture : null; const newEnvMap = exrCubeRenderTarget ? exrCubeRenderTarget.texture : null;
// scene.value.background = exrCubeRenderTarget.texture // scene.value.environment = newEnvMap
scene.value.environment = newEnvMap // scene.value.environmentIntensity = 1
scene.value.environmentIntensity = 1
result.renderTarget.texture.dispose(); result.renderTarget.texture.dispose();
} catch (error) { } catch (error) {
@ -49,8 +49,8 @@ const loadEnv = async () => {
const c = new Color() const c = new Color()
c.set(props.clear_color || PROMOBG) c.set(props.clear_color || PROMOBG)
renderer.value.setClearColor(c) // renderer.value.setClearColor(c)
scene.value.fog = new Fog(c, props.focus * k.start, props.focus * k.end) // scene.value.fog = new Fog(c, props.focus * k.start, props.focus * k.end)
document.documentElement.style.setProperty('--primary-color', props.clear_color) document.documentElement.style.setProperty('--primary-color', props.clear_color)
@ -71,9 +71,11 @@ const loadEnv = async () => {
ctx.fillStyle = grad; ctx.fillStyle = grad;
ctx.fillRect(0, 0, s, s); ctx.fillRect(0, 0, s, s);
} }
const texture = new CanvasTexture(canvas) const texture = new CanvasTexture(canvas);
texture.colorSpace = SRGBColorSpace
texture.needsUpdate = true texture.needsUpdate = true
scene.value.background = texture scene.value.background = texture
texture.dispose()
console.log(canvas.toDataURL()) console.log(canvas.toDataURL())
} }
} }