Allow changing the HDR tonemap #12160

jjspace · 2024-08-27T21:01:42Z

Description

Expose the tonemapper property of PostProcessStageCollection to allow changing the tonemap used when HDR is turned on
- Updated the HDR sandcastle to have a dropdown to switch this
Create a new tonemap for the PBR Neutral Tonemap from Khronos
- I think this one looks really good so I switched to use it as the default but I'm open to changing that.
Need to confirm how to test this as I got the color it's rendering but I don't know if it's correct...

Issue number and link

part of #12126

Testing plan

Check the updated HDR sandcastle and test the various tonemaps (local, ci)

Author checklist

I have submitted a Contributor License Agreement
I have added my name to CONTRIBUTORS.md
I have updated CHANGES.md with a short summary of my change
I have added or updated unit tests to ensure consistent code coverage
I have updated the inline documentation, and included code examples where relevant
I have performed a self-review of my code

github-actions · 2024-08-27T21:02:02Z

Thank you for the pull request, @jjspace!

✅ We can confirm we have a CLA on file for you.

packages/engine/Source/Scene/Tonemapper.js

packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js

ggetz

Thanks @jjspace! The new tonemapper looks great!

packages/engine/Source/Shaders/PostProcessStages/PBRNeutralTonemapping.glsl

packages/engine/Source/Scene/Tonemapper.js

packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js

packages/engine/Source/Shaders/PostProcessStages/PBRNeutralTonemapping.glsl

packages/engine/Source/Renderer/ShaderProgram.js

packages/engine/Source/Scene/PostProcessStageCollection.js

packages/engine/Source/Scene/PostProcessStageLibrary.js

packages/engine/Source/Scene/Tonemapper.js

packages/engine/Source/Shaders/Builtin/Functions/pbrNeutralTonemapping.glsl

packages/engine/Source/Scene/PostProcessStageCollection.js

packages/engine/Source/Shaders/PostProcessStages/AcesTonemappingStage.glsl

packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js

Apps/Sandcastle/gallery/High Dynamic Range.html

lilleyse · 2024-08-30T14:04:35Z

We should switch to the Khronos PBR Neutral Tone Mapper for models as well. Should be a small change here:

cesium/packages/engine/Source/Shaders/Model/LightingStageFS.glsl

Lines 118 to 124 in 349364c

    
                   // In HDR mode, the frame buffer is in linear color space. The 
        
                   // post-processing stages (see PostProcessStageCollection) will handle 
        
                   // tonemapping. However, if HDR is not enabled, we must tonemap else large 
        
                   // values may be clamped to 1.0 
        
                   #ifndef HDR 
        
                       color = czm_acesTonemapping(color); 
        
                   #endif

jjspace · 2024-08-30T15:19:40Z

We should switch to the Khronos PBR Neutral Tone Mapper for models as well. Should be a small change here:

Yup! This is already included, thanks @lilleyse

jjspace · 2024-08-30T18:57:01Z

@ggetz updated based on your comments, thanks. The biggest thing I've changed was a slight overhaul on the tests to actually test multiple colors as you suggested using small helper function. It may change the stacktrace a bit as you mentioned but the extra withContext helps a lot tracking down what number actually failed and it'd be really messy to duplicate those everywhere

Opened #12175 to track the bug I found with the modified Reinhard tonemap

ggetz

Thanks @jjspace, this is really close!

packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js

CHANGES.md

packages/engine/Source/Scene/PostProcessStageCollection.js

ggetz · 2024-08-30T19:32:47Z

@jjspace I see quite a few failing specs when running locally:

Failing test logs

1) renders tileset with custom up and forward axes
     Scene/Cesium3DTileset
     Expected 107 to be less than 64.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:705:27 <- Build/Specs/SpecList.js:147593:27
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 107 to be less than 64.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:706:27 <- Build/Specs/SpecList.js:147594:27
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>

2) sets colorBlendMode
     Scene/Cesium3DTileset
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3335:25 <- Build/Specs/SpecList.js:149683:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3336:25 <- Build/Specs/SpecList.js:149684:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 58 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3351:25 <- Build/Specs/SpecList.js:149694:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3364:25 <- Build/Specs/SpecList.js:149704:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3384:25 <- Build/Specs/SpecList.js:149719:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 48 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3398:25 <- Build/Specs/SpecList.js:149730:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 94 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3420:25 <- Build/Specs/SpecList.js:149747:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 251 to be less than 251.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3428:25 <- Build/Specs/SpecList.js:149753:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 106 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3431:25 <- Build/Specs/SpecList.js:149756:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3439:25 <- Build/Specs/SpecList.js:149762:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3440:25 <- Build/Specs/SpecList.js:149763:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3449:25 <- Build/Specs/SpecList.js:149770:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3462:25 <- Build/Specs/SpecList.js:149780:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>

3) sets colorBlendMode when vertex texture fetch is not supported
     Scene/Cesium3DTileset
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3335:25 <- Build/Specs/SpecList.js:149683:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3336:25 <- Build/Specs/SpecList.js:149684:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 58 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3351:25 <- Build/Specs/SpecList.js:149694:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3364:25 <- Build/Specs/SpecList.js:149704:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3384:25 <- Build/Specs/SpecList.js:149719:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 48 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3398:25 <- Build/Specs/SpecList.js:149730:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 94 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3420:25 <- Build/Specs/SpecList.js:149747:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 251 to be less than 251.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3428:25 <- Build/Specs/SpecList.js:149753:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 106 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3431:25 <- Build/Specs/SpecList.js:149756:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3439:25 <- Build/Specs/SpecList.js:149762:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3440:25 <- Build/Specs/SpecList.js:149763:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3449:25 <- Build/Specs/SpecList.js:149770:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3462:25 <- Build/Specs/SpecList.js:149780:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>

4) sets colorBlendMode for textured tileset
     Scene/Cesium3DTileset
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3335:25 <- Build/Specs/SpecList.js:149683:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3336:25 <- Build/Specs/SpecList.js:149684:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 58 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3351:25 <- Build/Specs/SpecList.js:149694:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3364:25 <- Build/Specs/SpecList.js:149704:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3384:25 <- Build/Specs/SpecList.js:149719:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 48 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3398:25 <- Build/Specs/SpecList.js:149730:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 93 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3420:25 <- Build/Specs/SpecList.js:149747:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 251 to be less than 251.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3428:25 <- Build/Specs/SpecList.js:149753:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 105 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3431:25 <- Build/Specs/SpecList.js:149756:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3439:25 <- Build/Specs/SpecList.js:149762:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3440:25 <- Build/Specs/SpecList.js:149763:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3449:25 <- Build/Specs/SpecList.js:149770:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3462:25 <- Build/Specs/SpecList.js:149780:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>

5) sets colorBlendMode for instanced tileset
     Scene/Cesium3DTileset
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3335:25 <- Build/Specs/SpecList.js:149683:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3336:25 <- Build/Specs/SpecList.js:149684:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 58 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3351:25 <- Build/Specs/SpecList.js:149694:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3364:25 <- Build/Specs/SpecList.js:149704:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3384:25 <- Build/Specs/SpecList.js:149719:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 48 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3398:25 <- Build/Specs/SpecList.js:149730:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 94 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3420:25 <- Build/Specs/SpecList.js:149747:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 251 to be less than 251.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3428:25 <- Build/Specs/SpecList.js:149753:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 106 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3431:25 <- Build/Specs/SpecList.js:149756:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3439:25 <- Build/Specs/SpecList.js:149762:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3440:25 <- Build/Specs/SpecList.js:149763:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3449:25 <- Build/Specs/SpecList.js:149770:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3462:25 <- Build/Specs/SpecList.js:149780:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>

6) sets colorBlendMode for vertex color tileset
     Scene/Cesium3DTileset
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3335:25 <- Build/Specs/SpecList.js:149683:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3336:25 <- Build/Specs/SpecList.js:149684:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 58 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3351:25 <- Build/Specs/SpecList.js:149694:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3364:25 <- Build/Specs/SpecList.js:149704:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3384:25 <- Build/Specs/SpecList.js:149719:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 48 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3398:25 <- Build/Specs/SpecList.js:149730:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 94 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3420:25 <- Build/Specs/SpecList.js:149747:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 251 to be less than 251.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3428:25 <- Build/Specs/SpecList.js:149753:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 106 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3431:25 <- Build/Specs/SpecList.js:149756:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3439:25 <- Build/Specs/SpecList.js:149762:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 115 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3440:25 <- Build/Specs/SpecList.js:149763:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 73 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3449:25 <- Build/Specs/SpecList.js:149770:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 43 to be less than 25.
    at <Jasmine>
    at packages/engine/Specs/Scene/Cesium3DTilesetSpec.js:3462:25 <- Build/Specs/SpecList.js:149780:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>

8) grey
     Scene/PostProcessStageCollection HDR tonemapping Reinhard
     without HDR: Expected to render [127,127,127,255], but actually rendered [128,128,128,255].
    at <Jasmine>
    at validateTonemapper (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:414:50 <- Build/Specs/SpecList.js:212703:51)
    at UserContext.<anonymous> (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:436:11 <- Build/Specs/SpecList.js:212721:11)
    at <Jasmine>

9) grey
     Scene/PostProcessStageCollection HDR tonemapping Modified Reinhard
     without HDR: Expected to render [127,127,127,255], but actually rendered [128,128,128,255].
    at <Jasmine>
    at validateTonemapper (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:414:50 <- Build/Specs/SpecList.js:212703:51)
    at UserContext.<anonymous> (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:478:11 <- Build/Specs/SpecList.js:212754:11)
    at <Jasmine>

10) red
     Scene/PostProcessStageCollection HDR tonemapping Modified Reinhard
     without HDR: Expected to render [127,0,0,255], but actually rendered [128,0,0,255].
    at <Jasmine>
    at validateTonemapper (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:414:50 <- Build/Specs/SpecList.js:212703:51)
    at UserContext.<anonymous> (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:485:11 <- Build/Specs/SpecList.js:212761:11)
    at <Jasmine>

11) green
     Scene/PostProcessStageCollection HDR tonemapping Modified Reinhard
     without HDR: Expected to render [0,127,0,255], but actually rendered [0,128,0,255].
    at <Jasmine>
    at validateTonemapper (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:414:50 <- Build/Specs/SpecList.js:212703:51)
    at UserContext.<anonymous> (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:492:11 <- Build/Specs/SpecList.js:212768:11)
    at <Jasmine>

12) blue
     Scene/PostProcessStageCollection HDR tonemapping Modified Reinhard
     without HDR: Expected to render [0,0,127,255], but actually rendered [0,0,128,255].
    at <Jasmine>
    at validateTonemapper (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:414:50 <- Build/Specs/SpecList.js:212703:51)
    at UserContext.<anonymous> (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:499:11 <- Build/Specs/SpecList.js:212775:11)
    at <Jasmine>

13) grey
     Scene/PostProcessStageCollection HDR tonemapping Filmic
     without HDR: Expected to render [127,127,127,255], but actually rendered [128,128,128,255].
    at <Jasmine>
    at validateTonemapper (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:414:50 <- Build/Specs/SpecList.js:212703:51)
    at UserContext.<anonymous> (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:512:11 <- Build/Specs/SpecList.js:212787:11)
    at <Jasmine>

14) grey
     Scene/PostProcessStageCollection HDR tonemapping ACES
     without HDR: Expected to render [127,127,127,255], but actually rendered [128,128,128,255].
    at <Jasmine>
    at validateTonemapper (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:414:50 <- Build/Specs/SpecList.js:212703:51)
    at UserContext.<anonymous> (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:530:11 <- Build/Specs/SpecList.js:212804:11)
    at <Jasmine>

15) grey
     Scene/PostProcessStageCollection HDR tonemapping PBR Neutral
     without HDR: Expected to render [127,127,127,255], but actually rendered [128,128,128,255].
    at <Jasmine>
    at validateTonemapper (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:414:50 <- Build/Specs/SpecList.js:212703:51)
    at UserContext.<anonymous> (packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js:553:11 <- Build/Specs/SpecList.js:212826:11)
    at <Jasmine>

16) renders with HDR when available
     Scene/Scene
     Expected 250 to equal 0.
    at <Jasmine>
    at packages/engine/Specs/Scene/SceneSpec.js:839:25 <- Build/Specs/SpecList.js:221163:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>
     Expected 250 to equal 0.
    at <Jasmine>
    at packages/engine/Specs/Scene/SceneSpec.js:840:25 <- Build/Specs/SpecList.js:221164:25
    at compare (Specs/addDefaultMatchers.js:314:13 <- Build/Specs/karma-main.js:296:13)
    at <Jasmine>

jjspace · 2024-08-30T21:00:06Z

@ggetz thanks for catching those, I forgot to run all tests and had only verified the new ones work. It seems HDR is not possible in CI? if it is then i'm surprised those ones passed...? Either way they should all be updated now with the new colors as we discussed in person.
I also updated the changelog to hopefully account for everything now.

ggetz · 2024-09-03T13:38:37Z

Thanks @jjspace! I pushed a small change to the specs to allow for a 1-byte tolerance in the render tests. This allowed all the specs to pass on my machine.

ggetz · 2024-09-03T13:42:29Z

Looks awesome! 😎

allow changing the hdr tonemap, add pbr neutral tonemap

f75cc7a

jjspace requested a review from ggetz August 27, 2024 21:01

jjspace commented Aug 27, 2024

View reviewed changes

packages/engine/Source/Scene/Tonemapper.js Show resolved Hide resolved

jjspace commented Aug 27, 2024

View reviewed changes

packages/engine/Specs/Scene/PostProcessStageCollectionSpec.js Outdated Show resolved Hide resolved

ggetz requested changes Aug 28, 2024

View reviewed changes

jjspace added 2 commits August 28, 2024 13:05

change default tonemap when HDR is off

517884f

add exposure to tonemaps

ebc84ee

ggetz requested changes Aug 30, 2024

View reviewed changes

ggetz reviewed Aug 30, 2024

View reviewed changes

Apps/Sandcastle/gallery/High Dynamic Range.html Outdated Show resolved Hide resolved

various doc updates, shader adjustments and specs

0382d10

jjspace mentioned this pull request Aug 30, 2024

HDR Tonemap Modified Reinhard equation possibly wrong #12175

Open

update changes.md

3abde63

jjspace added the priority - next release label Aug 30, 2024

Merge remote-tracking branch 'origin/main' into hdr-tonemap-options

3138002

ggetz requested changes Aug 30, 2024

View reviewed changes

jjspace added 2 commits August 30, 2024 16:57

update changes, update tests for new hdr colors

ad49c0c

Merge remote-tracking branch 'origin/main' into hdr-tonemap-options

c75fb9c

jjspace and others added 2 commits August 30, 2024 17:02

remove extra test code

90917e5

Add small tolerance to rendering specs

a108a5a

ggetz approved these changes Sep 3, 2024

View reviewed changes

ggetz merged commit c191e08 into main Sep 3, 2024
9 checks passed

ggetz deleted the hdr-tonemap-options branch September 3, 2024 13:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow changing the HDR tonemap #12160

Allow changing the HDR tonemap #12160

jjspace commented Aug 27, 2024 •

edited by ggetz

Loading

github-actions bot commented Aug 27, 2024

ggetz left a comment

lilleyse commented Aug 30, 2024

jjspace commented Aug 30, 2024

jjspace commented Aug 30, 2024 •

edited

Loading

ggetz left a comment

ggetz commented Aug 30, 2024 •

edited by jjspace

Loading

jjspace commented Aug 30, 2024

ggetz commented Sep 3, 2024

ggetz commented Sep 3, 2024

Allow changing the HDR tonemap #12160

Allow changing the HDR tonemap #12160

Conversation

jjspace commented Aug 27, 2024 • edited by ggetz Loading

Description

Issue number and link

Testing plan

Author checklist

github-actions bot commented Aug 27, 2024

ggetz left a comment

Choose a reason for hiding this comment

lilleyse commented Aug 30, 2024

jjspace commented Aug 30, 2024

jjspace commented Aug 30, 2024 • edited Loading

ggetz left a comment

Choose a reason for hiding this comment

ggetz commented Aug 30, 2024 • edited by jjspace Loading

jjspace commented Aug 30, 2024

ggetz commented Sep 3, 2024

ggetz commented Sep 3, 2024

jjspace commented Aug 27, 2024 •

edited by ggetz

Loading

jjspace commented Aug 30, 2024 •

edited

Loading

ggetz commented Aug 30, 2024 •

edited by jjspace

Loading