Skip to content

Commit

Permalink
Change default exposure to 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Joel committed Feb 27, 2019
1 parent 1a72782 commit 60c467f
Show file tree
Hide file tree
Showing 33 changed files with 33 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/features/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {$needsRender, $onModelLoad, $renderer, $scene, $tick} from '../model-vie

const DEFAULT_BACKGROUND_COLOR = '#ffffff';
const DEFAULT_SHADOW_STRENGTH = 0.0;
const DEFAULT_EXPOSURE = 0.9;
const DEFAULT_EXPOSURE = 1.0;

const WHITE = new Color('#ffffff');

Expand Down
4 changes: 1 addition & 3 deletions src/three-components/Renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ export default class Renderer extends EventDispatcher {
// ACESFilmicToneMapping appears to be the most "saturated",
// and similar to Filament's gltf-viewer.
this.renderer.toneMapping = ACESFilmicToneMapping;
this.renderer.toneMappingExposure = 0.9;

} catch (error) {
this.context = null;
console.warn(error);
Expand All @@ -96,7 +94,7 @@ export default class Renderer extends EventDispatcher {
set exposure(exposure) {
const exposureIsNumber =
typeof exposure === 'number' && !self.isNaN(exposure);
this.renderer.toneMappingExposure = exposureIsNumber ? exposure : 0.9;
this.renderer.toneMappingExposure = exposureIsNumber ? exposure : 1.0;
}

get exposure() {
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/alpha-blend-litmus/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/alpha-blend-litmus.glb"
experimental-pmrem
exposure="0.9"
background-image="../../../examples/assets/quick_4k.png"
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/damaged-helmet-hdr-pmrem/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/DamagedHelmet/DamagedHelmet.gltf"
background-image="../../../examples/assets/aircraft_workshop_01_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/damaged-helmet-solid-color-pmrem/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/DamagedHelmet/glTF/DamagedHelmet.gltf"
background-color="#BEA6CC"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-2CylinderEngine/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/2CylinderEngine/glTF/2CylinderEngine.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 1024px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-AlphaBlendModeTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/AlphaBlendModeTest/glTF/AlphaBlendModeTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 1024px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-AntiqueCamera/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/AntiqueCamera/glTF/AntiqueCamera.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 512px; height: 1024px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-Avocado/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/Avocado/glTF/Avocado.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-BoomBox/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/BoomBox/glTF/BoomBox.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-BoxVertexColors/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/BoxVertexColors/glTF/BoxVertexColors.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-Buggy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/Buggy/glTF/Buggy.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-CesiumMilkTruck/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/CesiumMilkTruck/glTF/CesiumMilkTruck.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-Corset/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/Corset/glTF/Corset.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-Cube/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/Cube/glTF/Cube.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-Duck/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/Duck/glTF/Duck.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-EnvironmentTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/EnvironmentTest/glTF/EnvironmentTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 1024px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-GearboxAssy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/GearboxAssy/glTF/GearboxAssy.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-Lantern/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/Lantern/glTF/Lantern.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-MetalRoughSpheres/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/MetalRoughSpheres/glTF/MetalRoughSpheres.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-MultiUVTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/MultiUVTest/glTF/MultiUVTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-NormalTangentMirrorTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/NormalTangentMirrorTest/glTF/NormalTangentMirrorTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-NormalTangentTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/NormalTangentTest/glTF/NormalTangentTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-OrientationTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/OrientationTest/glTF/OrientationTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-SciFiHelmet/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/SciFiHelmet/glTF/SciFiHelmet.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-SpecGlossVsMetalRough/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/SpecGlossVsMetalRough/glTF/SpecGlossVsMetalRough.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-Suzanne/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/Suzanne/glTF/Suzanne.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-TextureCoordinateTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/TextureCoordinateTest/glTF/TextureCoordinateTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-TextureSettingsTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/TextureSettingsTest/glTF/TextureSettingsTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-TextureTransformTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/TextureTransformTest/glTF/TextureTransformTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-UnlitTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/UnlitTest/glTF/UnlitTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/khronos-VertexColorTest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/glTF-Sample-Models/2.0/VertexColorTest/glTF/VertexColorTest.gltf"
background-image="../../../examples/assets/pillars_4k.hdr"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down
1 change: 1 addition & 0 deletions test/fidelity/pbr-spheres/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<body>
<model-viewer src="../../../examples/assets/pbr-spheres.glb"
background-image="../../../examples/assets/quick_4k.png"
exposure="0.9"
experimental-pmrem
style="width: 768px; height: 768px;">
</model-viewer>
Expand Down

0 comments on commit 60c467f

Please sign in to comment.