Merge pull request #171 from nick-l-o3de/merge_stabilization_2409_to_…

…main Merge stabilization 2409 to main for release 24.09.0
o3de · Oct 9, 2024 · 57736dc · 57736dc
2 parents c529209 + 1607599
commit 57736dc
Show file tree

Hide file tree

Showing 2 changed files with 743 additions and 184 deletions.
diff --git a/Gems/O3DEPopcornFXPlugin b/Gems/O3DEPopcornFXPlugin
+24 −0		.github/workflows/draft-release.yml
+1 −0		Assets/PopcornFX_Dependencies.xml
+0 −4		Assets/shaders/Billboard/Default/BillboardDistortion.azsl
+0 −14		Assets/shaders/Billboard/Legacy/BillboardLit_Legacy.azsl
+0 −4		Assets/shaders/Billboard/Legacy/Billboard_Legacy.azsl
+99 −99		Assets/shaders/Common/BillboardSrg.azsli
+174 −196		Assets/shaders/Common/LightingHelper.azsli
+44 −44		Assets/shaders/Common/MaterialSrg.azsli
+1 −2		Assets/shaders/Common/PopcornOptions.azsli
+219 −219		Assets/shaders/Common/RendererFeatures.azsli
+45 −45		Assets/shaders/Common/RendererSrg.azsli
+30 −30		Assets/shaders/Common/RibbonSrg.azsli
+24 −24		Assets/shaders/Depth/Basic/DepthPass.azsl
+19 −19		Assets/shaders/Depth/Basic/DepthPass.shader
+23 −23		Assets/shaders/Depth/Basic/DepthPassTransparentMax.shader
+21 −21		Assets/shaders/Depth/Basic/DepthPassTransparentMin.shader
+35 −35		Assets/shaders/Depth/Billboard/DepthPass.azsl
+34 −34		Assets/shaders/Depth/Billboard/DepthPassBillboard.azsl
+21 −21		Assets/shaders/Depth/Billboard/DepthPassBillboard.shader
+23 −23		Assets/shaders/Depth/Billboard/DepthPassTransparentMaxBillboard.shader
+21 −21		Assets/shaders/Depth/Billboard/DepthPassTransparentMinBillboard.shader
+0 −13		Assets/shaders/Mesh/Legacy/MeshLit_Legacy.azsl
+0 −4		Assets/shaders/Mesh/Legacy/Mesh_Legacy.azsl
+0 −4		Assets/shaders/Ribbon/Default/RibbonDistortion.azsl
+0 −39		Assets/shaders/Ribbon/Legacy/RibbonLit_Legacy.azsl
+0 −4		Assets/shaders/Ribbon/Legacy/Ribbon_Legacy.azsl
+19 −85		CMakeLists.txt
+24 −10		Code/CMakeLists.txt
+0 −6		Code/Include/PopcornFX/PopcornFXBus.h
+11 −3		Code/Platform/Linux/PAL_linux.cmake
+2 −2		Code/Platform/Mac/PAL_mac.cmake
+2 −2		Code/Platform/PopcornFXPackages.cmake
+2 −2		Code/Platform/Windows/PAL_windows.cmake
+1 −5		Code/Source/Components/Samplers/PopcornFXSamplerImage.cpp
+9 −1		Code/Source/Integration/Editor/BakerManager.cpp
+2 −0		Code/Source/Integration/Editor/BakerManager.h
+14 −3		Code/Source/Integration/Managers/RenderManager.cpp
+0 −4		Code/Source/Integration/Managers/StatsManager.cpp
+7 −3		Code/Source/Integration/Managers/WindManager.cpp
+2 −1		Code/Source/Integration/PopcornFXIntegration.cpp
+3 −4		Code/Source/Integration/Preloader/PopcornFXRendererLoader.cpp
+60 −0		Code/Source/Integration/Render/AtomIntegration/BillboardBatchDrawer.cpp
+16 −0		Code/Source/Integration/Render/AtomIntegration/MeshBatchDrawer.cpp
+13 −39		Code/Source/Integration/Render/AtomIntegration/PopcornFXFeatureProcessor.cpp
+14 −10		Code/Source/Integration/Render/AtomIntegration/PopcornFXFeatureProcessor.h
+16 −0		Code/Source/Integration/Render/AtomIntegration/RibbonBatchDrawer.cpp
+0 −4		Code/Source/Integration/ResourceHandlers/ImageResourceHandler.cpp
+0 −9		Code/Source/Integration/ResourceHandlers/MeshResourceHandler.cpp
+8 −8		Code/Source/Integration/Startup/PopcornFxPlugins.cpp
+27 −19		Code/Source/Integration/Startup/PopcornFxPlugins.h
+21 −0		Code/Source/Integration/Startup/PopcornFxStartup.cpp
+4 −0		Code/Source/PopcornFXSystemComponent.cpp
+2 −0		Code/Source/ScriptCanvas/PopcornFXBroadcastNodeable.h
+14 −2		Code/popcornfx_autogen_files.cmake
+2 −2		README.md
+4 −4		gem.json