Skip to content

Update Neutral Lighting environment (aesthetics) #2249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 3, 2021
Merged

Update Neutral Lighting environment (aesthetics) #2249

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5b81bd
Merge pull request #1 from google/master
thomastgt Apr 1, 2021
021ee9d
update neutral lighting to reduce huge specular on top of the object
thomastgt Apr 2, 2021
8d8b909
update -x side to adjust light value compatible to the rest
thomastgt Apr 6, 2021
5dd28f5
adjust +X to bring the lighting value to conformity
thomastgt Apr 6, 2021
c0e9300
Update EvironmentSceneAlt.ts
thomastgt Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 32 additions & 19 deletions packages/model-viewer/src/three-components/EvironmentSceneAlt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(80));
light1.position.set(-14.0, 10.0, 8.0);
light1.scale.set(0.1, 2.5, 2.5);
this.add(light1);

// +x
const light3 = new Mesh(geometry, this.createAreaLightMaterial(18));
light3.position.set(14.0, 9.0, 0.1);
// -x_right
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);



// +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);
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 {
Expand Down