Skip to content

Commit

Permalink
Merge pull request #165 from o3de/cgalvan/gitflow_231005_o3de-multipl…
Browse files Browse the repository at this point in the history 
…ayersample-assets

Merged `stabilization/2310` to `main`
  • Loading branch information
@cgalvan
cgalvan authored Oct 9, 2023
2 parents d385172 + b24b0f4 commit c529209
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Gems/O3DEPopcornFXPlugin
Submodule O3DEPopcornFXPlugin updated 81 files
+40 −0 Assets/PopcornFX_Dependencies.xml
+13 −0 Assets/seedList.seed
+1 −1 Assets/shaders/Billboard/Default/Billboard.azsl
+11 −3 Assets/shaders/Billboard/Default/BillboardDistortion.azsl
+1 −1 Assets/shaders/Billboard/Legacy/BillboardLit_Legacy.azsl
+1 −1 Assets/shaders/Billboard/Legacy/Billboard_Legacy.azsl
+8 −0 Assets/shaders/Common/BillboardSrg.azsli
+1 −0 Assets/shaders/Common/LightingHelper.azsli
+8 −0 Assets/shaders/Common/MaterialSrg.azsli
+3 −3 Assets/shaders/Common/RendererFeatures.azsli
+0 −1 Assets/shaders/Depth/Billboard/DepthPass.azsl
+0 −1 Assets/shaders/Depth/Billboard/DepthPassBillboard.azsl
+20 −1 CMakeLists.txt
+5 −4 Code/CMakeLists.txt
+2 −2 Code/Platform/Linux/PAL_linux.cmake
+2 −2 Code/Platform/Mac/PAL_mac.cmake
+2 −2 Code/Platform/Windows/PAL_windows.cmake
+0 −27 Code/Source/Asset/PopcornFXAsset.h
+1 −6 Code/Source/Asset/PopcornFXAssetBuilderComponent.cpp
+23 −45 Code/Source/Asset/PopcornFXAssetBuilderWorker.cpp
+167 −142 Code/Source/Components/Attributes/PopcornFXEditorAttributeList.cpp
+28 −17 Code/Source/Components/Attributes/PopcornFXEditorAttributeList.h
+1 −1 Code/Source/Components/Attributes/TrackView/PopcornFXTrackViewAttribute.cpp
+132 −81 Code/Source/Components/Emitter/PopcornFXEmitterEditorComponent.cpp
+14 −9 Code/Source/Components/Emitter/PopcornFXEmitterEditorComponent.h
+42 −0 Code/Source/Components/Emitter/PopcornFXEmitterRuntime.cpp
+3 −3 Code/Source/Components/Emitter/PopcornFXEmitterRuntime.h
+5 −5 Code/Source/Components/Samplers/PopcornFXSamplerAnimTrack.cpp
+1 −1 Code/Source/Components/Samplers/PopcornFXSamplerImage.cpp
+5 −0 Code/Source/Components/Samplers/PopcornFXSamplerShape.cpp
+6 −6 Code/Source/Components/Samplers/PopcornFXSamplerShape.h
+26 −145 Code/Source/Integration/Editor/BakerManager.cpp
+0 −3 Code/Source/Integration/Editor/PackLoader.cpp
+1 −1 Code/Source/Integration/Editor/PackLoader.h
+1 −5 Code/Source/Integration/File/FileSystemController_O3DE.cpp
+10 −4 Code/Source/Integration/Managers/RenderManager.cpp
+1 −1 Code/Source/Integration/Managers/SceneViewsManager.cpp
+5 −2 Code/Source/Integration/Managers/StatsManager.cpp
+2 −2 Code/Source/Integration/Managers/StatsManager.h
+91 −29 Code/Source/Integration/Managers/WindManager.cpp
+28 −9 Code/Source/Integration/Managers/WindManager.h
+73 −57 Code/Source/Integration/PopcornFXIntegration.cpp
+8 −0 Code/Source/Integration/PopcornFXIntegration.h
+1 −0 Code/Source/Integration/PopcornFXIntegrationBus.h
+7 −6 Code/Source/Integration/PopcornFXUtils.h
+4 −2 Code/Source/Integration/Render/AtomIntegration/AtomFrameCollectorTypes.h
+8 −1 Code/Source/Integration/Render/AtomIntegration/AtomPipelineCache.cpp
+1 −0 Code/Source/Integration/Render/AtomIntegration/AtomPipelineCache.h
+1 −1 Code/Source/Integration/Render/AtomIntegration/AtomRenderDataFactory.cpp
+145 −162 Code/Source/Integration/Render/AtomIntegration/AtomRendererCache.cpp
+0 −2 Code/Source/Integration/Render/AtomIntegration/AtomRendererCache.h
+50 −10 Code/Source/Integration/Render/AtomIntegration/BillboardBatchDrawer.cpp
+31 −5 Code/Source/Integration/Render/AtomIntegration/LightBatchDrawer.cpp
+12 −3 Code/Source/Integration/Render/AtomIntegration/MeshBatchDrawer.cpp
+27 −13 Code/Source/Integration/Render/AtomIntegration/PopcornFXFeatureProcessor.cpp
+6 −4 Code/Source/Integration/Render/AtomIntegration/PopcornFXFeatureProcessor.h
+13 −2 Code/Source/Integration/Render/AtomIntegration/RibbonBatchDrawer.cpp
+0 −1,390 Code/Source/Integration/Render/BasicEditorRendererFeatures.cpp
+0 −446 Code/Source/Integration/Render/BasicEditorRendererFeatures.h
+4 −0 Code/Source/Integration/ResourceHandlers/ImageResourceHandler.cpp
+4 −0 Code/Source/Integration/ResourceHandlers/ImageResourceHandler.h
+4 −0 Code/Source/Integration/ResourceHandlers/MeshResourceHandler.cpp
+4 −0 Code/Source/Integration/ResourceHandlers/MeshResourceHandler.h
+111 −66 Code/Source/Integration/SceneInterface/SceneInterface.cpp
+2 −5 Code/Source/Integration/SceneInterface/SceneInterface.h
+115 −522 Code/Source/Integration/Startup/PopcornFxStartup.cpp
+1 −1 Code/Source/Integration/Startup/PopcornFxStartup.h
+8 −4 Code/Source/PopcornFXModule.cpp
+0 −2 Code/Source/PopcornFXPreviewersSystemComponent.h
+1 −1 Code/Source/PopcornFXSystemComponent.cpp
+3 −9 Code/Source/PopcornFX_precompiled.h
+2 −3 Code/Source/Previewer/PopcornFXEffectPreviewer.cpp
+6 −3 Code/Source/Previewer/PopcornFXEffectPreviewerFactory.cpp
+0 −15 Code/popcornfx_builder_files.cmake
+0 −21 Code/popcornfx_editor_files.cmake
+2 −0 Code/popcornfx_files.cmake
+15 −0 Code/popcornfx_previewer_files.cmake
+0 −4 Code/popcornfx_shared_files.cmake
+2 −2 README.md
+2 −3 Registry/AssetProcessorPlatformConfig.setreg
+4 −4 gem.json

0 comments on commit c529209

Please sign in to comment.