Skip to content
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

Jump to bottom

Initial Sky Atmosphere #9649

Merged
merged 49 commits into from
Aug 11, 2022
Merged

Initial Sky Atmosphere #9649

merged 49 commits into from
Aug 11, 2022

Commits on Apr 3, 2022

  1. WIP 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Apr 3, 2022
    Configuration menu
    Copy the full SHA
    e1810e9 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. WIP 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    e63b51a View commit details
    Browse the repository at this point in the history

  2. Support atmospheres at any location 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    77be766 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2022

  1. Only update Transmittance LUT when values changed. 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Apr 26, 2022
    Configuration menu
    Copy the full SHA
    585af86 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2022

  1. Add atmosphere origin modes and fast sky prep 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Apr 29, 2022
    Configuration menu
    Copy the full SHA
    ce7c782 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Atom/sky/initial' of https://github.com/aws-lumberyard-… 

    …dev/o3de into Atom/sky/initial

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/Feature/Common/Assets/Shaders/SkyAtmosphere/SkyAtmosphereCommon.azsli
#	Gems/Atom/Feature/Common/Assets/Shaders/SkyAtmosphere/SkyRayMarching.azsl
#	Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyAtmosphere/SkyAtmosphereFeatureProcessorInterface.h
#	Gems/Atom/Feature/Common/Code/Source/SkyAtmosphere/SkyAtmosphereFeatureProcessor.cpp
#	Gems/Atom/Feature/Common/Code/Source/SkyAtmosphere/SkyAtmosphereFeatureProcessor.h
#	Gems/Atom/Feature/Common/Code/Source/SkyAtmosphere/SkyAtmospherePass.cpp
#	Gems/Atom/Feature/Common/Code/Source/SkyAtmosphere/SkyAtmospherePass.h
#	Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyAtmosphere/SkyAtmosphereComponentConfig.h
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyAtmosphere/EditorSkyAtmosphereComponent.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyAtmosphere/EditorSkyAtmosphereComponent.h
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyAtmosphere/SkyAtmosphereComponentConfig.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyAtmosphere/SkyAtmosphereComponentController.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyAtmosphere/SkyAtmosphereComponentController.h
    @AMZN-alexpete
    AMZN-alexpete committed Apr 29, 2022
    Configuration menu
    Copy the full SHA
    55f4d1e View commit details
    Browse the repository at this point in the history

Commits on May 5, 2022

  1. WIP 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 5, 2022
    Configuration menu
    Copy the full SHA
    bc88271 View commit details
    Browse the repository at this point in the history

  2. Support atmospheres at any location 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 5, 2022
    Configuration menu
    Copy the full SHA
    4f96459 View commit details
    Browse the repository at this point in the history

  3. Only update Transmittance LUT when values changed. 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 5, 2022
    Configuration menu
    Copy the full SHA
    191935d View commit details
    Browse the repository at this point in the history

  4. Add atmosphere origin modes and fast sky prep 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 5, 2022
    Configuration menu
    Copy the full SHA
    7442785 View commit details
    Browse the repository at this point in the history

  5. WIP 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 5, 2022
    Configuration menu
    Copy the full SHA
    0513aaf View commit details
    Browse the repository at this point in the history

  6. Automatically update sun transform on config change 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 5, 2022
    Configuration menu
    Copy the full SHA
    a5cb059 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2022

  1. Add fast sky LUT for inside atmosphere 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 10, 2022
    Configuration menu
    Copy the full SHA
    fb5ffa9 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2022

  1. Fix scaled objects getting culled incorrectly 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 13, 2022
    Configuration menu
    Copy the full SHA
    e2ff7d6 View commit details
    Browse the repository at this point in the history

  2. Fix duplicate sun field 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 13, 2022
    Configuration menu
    Copy the full SHA
    5cbb3e0 View commit details
    Browse the repository at this point in the history

  3. WIP atmosphere shadows 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 13, 2022
    Configuration menu
    Copy the full SHA
    4135d06 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Atom/sky/initial' of https://github.com/aws-lumberyard-… 

    …dev/o3de into Atom/sky/initial

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/Feature/Common/Assets/Passes/OpaqueParent.pass
#	Gems/Atom/Feature/Common/Assets/Passes/PassTemplates.azasset
#	Gems/Atom/Feature/Common/Assets/Passes/SkyAtmosphere.pass
#	Gems/Atom/Feature/Common/Assets/Passes/SkyAtmosphereParent.pass
#	Gems/Atom/Feature/Common/Assets/Passes/SkyRayMarching.pass
#	Gems/Atom/Feature/Common/Assets/Shaders/SkyAtmosphere/SkyAtmosphereCommon.azsli
#	Gems/Atom/Feature/Common/Assets/Shaders/SkyAtmosphere/SkyRayMarching.azsl
#	Gems/Atom/Feature/Common/Assets/Shaders/SkyAtmosphere/SkyRayMarching.shader
#	Gems/Atom/Feature/Common/Assets/Shaders/SkyAtmosphere/SkyTransmittanceLUT.azsl
#	Gems/Atom/Feature/Common/Assets/atom_feature_common_asset_files.cmake
#	Gems/Atom/Feature/Common/Code/Include/Atom/Feature/SkyAtmosphere/SkyAtmosphereFeatureProcessorInterface.h
#	Gems/Atom/Feature/Common/Code/Source/SkyAtmosphere/SkyAtmosphereFeatureProcessor.cpp
#	Gems/Atom/Feature/Common/Code/Source/SkyAtmosphere/SkyAtmosphereFeatureProcessor.h
#	Gems/Atom/Feature/Common/Code/Source/SkyAtmosphere/SkyAtmospherePass.cpp
#	Gems/Atom/Feature/Common/Code/Source/SkyAtmosphere/SkyAtmospherePass.h
#	Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/SkyAtmosphere/SkyAtmosphereComponentConfig.h
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyAtmosphere/EditorSkyAtmosphereComponent.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyAtmosphere/SkyAtmosphereComponentConfig.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyAtmosphere/SkyAtmosphereComponentController.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/atomlyintegration_commonfeatures_public_files.cmake
    @AMZN-alexpete
    AMZN-alexpete committed May 13, 2022
    Configuration menu
    Copy the full SHA
    276a88c View commit details
    Browse the repository at this point in the history

Commits on May 14, 2022

  1. Fix cube map renderer never finishing 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 14, 2022
    Configuration menu
    Copy the full SHA
    8df7a75 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2022

  1. WIP use shader variants for shadows, sun 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 17, 2022
    Configuration menu
    Copy the full SHA
    56a8c2b View commit details
    Browse the repository at this point in the history

Commits on May 18, 2022

  1. Merge remote-tracking branch 'upstream/development' into Atom/sky/ini… 

    …tial
    @AMZN-alexpete
    AMZN-alexpete committed May 18, 2022
    Configuration menu
    Copy the full SHA
    60d66a4 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2022

  1. Use shader variants and fix editor groups 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 19, 2022
    Configuration menu
    Copy the full SHA
    2870689 View commit details
    Browse the repository at this point in the history

  2. Revert specular background color change in passes 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 19, 2022
    Configuration menu
    Copy the full SHA
    a9fe70d View commit details
    Browse the repository at this point in the history

  3. Revert clear value change for reflection output 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 19, 2022
    Configuration menu
    Copy the full SHA
    412fadf View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. Fix tabs, add credit, minor cleanup 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 20, 2022
    Configuration menu
    Copy the full SHA
    817da6d View commit details
    Browse the repository at this point in the history

Commits on May 24, 2022

  1. Simplify SkyAtmosphereFeatureProcessorInterface 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 24, 2022
    Configuration menu
    Copy the full SHA
    493e22d View commit details
    Browse the repository at this point in the history

  2. Fix tabs, add comments 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 24, 2022
    Configuration menu
    Copy the full SHA
    c55da3a View commit details
    Browse the repository at this point in the history

Commits on May 25, 2022

  1. Manage LUT update in pass instead of component 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 25, 2022
    Configuration menu
    Copy the full SHA
    990be2d View commit details
    Browse the repository at this point in the history

  2. Fix failing to bind shadow pass in skyviewlut 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 25, 2022
    Configuration menu
    Copy the full SHA
    cca1308 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2022

  1. Merge remote-tracking branch 'upstream/development' into Atom/sky/ini… 

    …tial
    @AMZN-alexpete
    AMZN-alexpete committed May 26, 2022
    Configuration menu
    Copy the full SHA
    0881a2f View commit details
    Browse the repository at this point in the history

Commits on May 27, 2022

  1. Do not set background to black if not enabled 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed May 27, 2022
    Configuration menu
    Copy the full SHA
    3118286 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2022

  1. Merge remote-tracking branch 'upstream/development' into Atom/sky/ini… 

    …tial
    @AMZN-alexpete
    AMZN-alexpete committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    a7b69c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. Fix missing AZ::Color include 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    60b16ca View commit details
    Browse the repository at this point in the history

  2. Update to use latest shadow API 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    1d7a703 View commit details
    Browse the repository at this point in the history

  3. Attempt to prevent entire entity from re-activating on changes 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    54e58ad View commit details
    Browse the repository at this point in the history

  4. Fix issue SRG constants not being applied 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    2ffe8f4 View commit details
    Browse the repository at this point in the history

  5. Add CubeMap capture support 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    5dafe09 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Merge remote-tracking branch 'upstream/development' into Atom/sky/ini… 

    …tial
    @AMZN-alexpete
    AMZN-alexpete committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    7833b5e View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2022

  1. Add near clip, fade and limit shadow to far clip 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    ab767cb View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. Merge remote-tracking branch 'upstream/development' into Atom/sky/ini… 

    …tial

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/Feature/Common/Assets/Passes/EnvironmentCubeMapPipeline.pass
    @AMZN-alexpete
    AMZN-alexpete committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    dc214ee View commit details
    Browse the repository at this point in the history

  2. Removing unnecessary slot info in parent pass 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    183eee8 View commit details
    Browse the repository at this point in the history

  3. Rename PassData to be less ambiguous 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    963835d View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2022

  1. Fix error when removing child pass 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    fdd4e0e View commit details
    Browse the repository at this point in the history

  2. Move SRG updating from Simulate to Render 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    19e4689 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Fix child pass creation outside build phase 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    b08fc97 View commit details
    Browse the repository at this point in the history

  2. Fix not detecting sun transform changes 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    047086f View commit details
    Browse the repository at this point in the history

  3. Remove unused lighting defines 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    3e0b454 View commit details
    Browse the repository at this point in the history

  4. Fixed shader asset case sensitive path 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    35ef904 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/development' into Atom/sky/ini… 

    …tial
    @AMZN-alexpete
    AMZN-alexpete committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    a4c0808 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2022

  1. Fix missing NameDictionary 

    Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
    @AMZN-alexpete
    AMZN-alexpete committed Aug 6, 2022
    Configuration menu
    Copy the full SHA
    d642aee View commit details
    Browse the repository at this point in the history