From 021ee9dc4df720a1ea369b9a0bbddb7e3e175cc2 Mon Sep 17 00:00:00 2001 From: thomastgt Date: Thu, 1 Apr 2021 20:34:25 -0500 Subject: [PATCH 1/4] update neutral lighting to reduce huge specular on top of the object --- .../three-components/EvironmentSceneAlt.ts | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts b/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts index 90f430995f..0580979669 100644 --- a/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts +++ b/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts @@ -28,8 +28,8 @@ export default class EnvironmentSceneAlt extends Scene { new MeshStandardMaterial({metalness: 0, side: BackSide}); const boxMaterial = new MeshStandardMaterial({metalness: 0}); - const mainLight = new PointLight(0xffffff, 500.0, 28, 2); - mainLight.position.set(0.5, 16.5, 0.5); + const mainLight = new PointLight(0xffffff, 400.0, 28, 2); + mainLight.position.set(0.5, 14.0, 0.5); this.add(mainLight); const room = new Mesh(geometry, roomMaterial); @@ -73,36 +73,49 @@ export default class EnvironmentSceneAlt extends Scene { box6.scale.set(3.875, 3.487, 2.986); this.add(box6); - - // -x - const light1 = new Mesh(geometry, this.createAreaLightMaterial(18)); - light1.position.set(-14.0, 9.0, 0.1); - light1.scale.set(0.1, 5.0, 5.0); + // -x_left + const light1 = new Mesh(geometry, this.createAreaLightMaterial(122)); + light1.position.set(-14.0, 10.0, 8.0); + light1.scale.set(0.1, 2.5, 2.5); this.add(light1); + // -x_right + const light2 = new Mesh(geometry, this.createAreaLightMaterial(122)); + light2.position.set(-14.0, 14.0, -4.0); + light2.scale.set(0.1, 2.5, 2.5); + this.add(light2); + + + // +x - const light3 = new Mesh(geometry, this.createAreaLightMaterial(18)); - light3.position.set(14.0, 9.0, 0.1); + const light3 = new Mesh(geometry, this.createAreaLightMaterial(16)); + light3.position.set(14.0, 12.0, 0.0); light3.scale.set(0.1, 5.0, 5.0); this.add(light3); // +z - const light4 = new Mesh(geometry, this.createAreaLightMaterial(18)); + const light4 = new Mesh(geometry, this.createAreaLightMaterial(16)); light4.position.set(0.0, 9.0, 14.0); light4.scale.set(5.0, 5.0, 0.1); this.add(light4); - // -z - const light5 = new Mesh(geometry, this.createAreaLightMaterial(18)); - light5.position.set(0, 9.0, -14.0); - light5.scale.set(5.0, 5.0, 0.1); + // -z right + const light5 = new Mesh(geometry, this.createAreaLightMaterial(80)); + light5.position.set(7.0, 8.0, -14.0); + light5.scale.set(2.5, 2.5, 0.1); this.add(light5); - // +y - const light6 = new Mesh(geometry, this.createAreaLightMaterial(18)); - light6.position.set(0.0, 20.0, 0.0); - light6.scale.set(1.5, 0.1, 1.5); + // -z left + const light6 = new Mesh(geometry, this.createAreaLightMaterial(80)); + light6.position.set(-7.0, 16.0, -14.0); + light6.scale.set(2.5, 2.5, 0.1); this.add(light6); + + // +y + const light7 = new Mesh(geometry, this.createAreaLightMaterial(1)); + light7.position.set(0.0, 20.0, 0.0); + light7.scale.set(0.1, 0.1, 0.1); + this.add(light7); } createAreaLightMaterial(intensity: number): MeshBasicMaterial { From 8d8b909306e482faa1f70410c32ccb5f0b7bda28 Mon Sep 17 00:00:00 2001 From: thomastgt Date: Mon, 5 Apr 2021 21:15:31 -0500 Subject: [PATCH 2/4] update -x side to adjust light value compatible to the rest --- .../model-viewer/src/three-components/EvironmentSceneAlt.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts b/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts index 0580979669..bf19ce35cf 100644 --- a/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts +++ b/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts @@ -74,13 +74,13 @@ export default class EnvironmentSceneAlt extends Scene { this.add(box6); // -x_left - const light1 = new Mesh(geometry, this.createAreaLightMaterial(122)); + const light1 = new Mesh(geometry, this.createAreaLightMaterial(80)); light1.position.set(-14.0, 10.0, 8.0); light1.scale.set(0.1, 2.5, 2.5); this.add(light1); // -x_right - const light2 = new Mesh(geometry, this.createAreaLightMaterial(122)); + const light2 = new Mesh(geometry, this.createAreaLightMaterial(80)); light2.position.set(-14.0, 14.0, -4.0); light2.scale.set(0.1, 2.5, 2.5); this.add(light2); @@ -123,4 +123,4 @@ export default class EnvironmentSceneAlt extends Scene { material.color.setScalar(intensity); return material; } -} +} \ No newline at end of file From 5dd28f53bd99c2bea411267c1fa81c42c374be5c Mon Sep 17 00:00:00 2001 From: thomastgt Date: Mon, 5 Apr 2021 22:36:01 -0500 Subject: [PATCH 3/4] adjust +X to bring the lighting value to conformity --- .../model-viewer/src/three-components/EvironmentSceneAlt.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts b/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts index bf19ce35cf..49b20e7979 100644 --- a/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts +++ b/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts @@ -88,7 +88,7 @@ export default class EnvironmentSceneAlt extends Scene { // +x - const light3 = new Mesh(geometry, this.createAreaLightMaterial(16)); + const light3 = new Mesh(geometry, this.createAreaLightMaterial(23)); light3.position.set(14.0, 12.0, 0.0); light3.scale.set(0.1, 5.0, 5.0); this.add(light3); From c0e9300e85b5c60376d6520b7c34eb04b6f9137f Mon Sep 17 00:00:00 2001 From: thomastgt <75750117+thomastgt@users.noreply.github.com> Date: Mon, 26 Apr 2021 15:59:34 -0500 Subject: [PATCH 4/4] Update EvironmentSceneAlt.ts add description on +x --- .../model-viewer/src/three-components/EvironmentSceneAlt.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts b/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts index 49b20e7979..f83ff743b9 100644 --- a/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts +++ b/packages/model-viewer/src/three-components/EvironmentSceneAlt.ts @@ -87,7 +87,7 @@ export default class EnvironmentSceneAlt extends Scene { - // +x + // +x only on light const light3 = new Mesh(geometry, this.createAreaLightMaterial(23)); light3.position.set(14.0, 12.0, 0.0); light3.scale.set(0.1, 5.0, 5.0); @@ -123,4 +123,4 @@ export default class EnvironmentSceneAlt extends Scene { material.color.setScalar(intensity); return material; } -} \ No newline at end of file +}