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

bx-1140-postprocessing #12

Merged
ksenia_mikhailova merged 18 commits from bx-1140-postprocessing into dev 2024-07-30 09:17:41 +03:00
Conversation 0 Commits 18 Files Changed 17 +5 -6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e91bfa14f9 - Show all commits

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

@ -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 props = defineProps(['hdr_webp', 'hdr_gainmap', 'hdr_json', 'env_displacementmap', 'env_normalmap', 'clear_color', 'focus'])
const { renderer, scene } = useTresContext() 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.outputColorSpace = SRGBColorSpace;
renderer.value.toneMapping = ACESFilmicToneMapping; renderer.value.toneMapping = ACESFilmicToneMapping;
@ -21,7 +21,7 @@ renderer.value.toneMappingExposure = 1.25;
renderer.value.setPixelRatio(1.5) renderer.value.setPixelRatio(1.5)
const loadEnv = async () => { const loadEnv = async () => {
console.log('update env') // console.log('update env')
const loader = new GainMapLoader(renderer.value) const loader = new GainMapLoader(renderer.value)
const result = await loader.loadAsync([ const result = await loader.loadAsync([
props.hdr_webp ? `${IMAGE_URL}/${props.hdr_webp}` : hdr_webp, props.hdr_webp ? `${IMAGE_URL}/${props.hdr_webp}` : hdr_webp,

7
front/src/components/Promo/load_models.vue
View File

@ -93,7 +93,6 @@ const loadModels = async () => {
clickable.value.push(...clickable_areas) clickable.value.push(...clickable_areas)
} }
let c = new Color() let c = new Color()
if (envVars.clear_color) { if (envVars.clear_color) {
c.set(envVars.clear_color) c.set(envVars.clear_color)
@ -109,8 +108,8 @@ const loadModels = async () => {
} }
const mesh = { const mesh = {
color: c.offsetHSL(0, 0, -0.33), color: c.offsetHSL(0, 0.5, -0.33),
displacementScale: envVars.focus, displacementScale: envVars.focus * 0.33,
roughness: 100, roughness: 100,
side: DoubleSide side: DoubleSide
} as MeshStandardMaterialParameters } as MeshStandardMaterialParameters
@ -123,7 +122,7 @@ const loadModels = async () => {
mesh.normalMap = addTexture.normalMap mesh.normalMap = addTexture.normalMap
} }
const ground = new Mesh( 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) new MeshStandardMaterial(mesh)
) )
ground.position.y = -0.33 * envVars.focus ground.position.y = -0.33 * envVars.focus