Commit Graph

60 Commits

Author SHA1 Message Date
Vicky e4509dbe68 Merge pull request #322 from aws-lumberyard-dev/Atom/qingtao/ATOM-6088
ATOM-6088 Unified approach to send draws to a single viewport

    Created a template class TagRegistery which implements the previous DrawListTagRegistry. The template is used for both DrawListTagRegistry and DrawFilterTagRegistry
    Added DrawFilterTag to DrawItemKeyPair
    Added DrawFilterMask support in DrawPacket and DrawPacketBuilder
    Added CreateDynamicContext for render pipeline which allows draw to selected render pipeline.
    Updated RasterPass's BuildCommandListInternal function to filter draw items for its owner RenderPipeline.
2021-04-27 14:34:27 -07:00
qingtao 60db6b55d0 Address feedback of PR for ATOM-6088.
* Rename DrawItemKeyPair to DrawItemProperties.
* Switch back to use Ptr<DrawListTagRegistry> instead of DrawListTagRegistry
* Updated some comment.
2021-04-27 13:26:43 -07:00
qingtao 12f528d744 ATOM-6088 Unified approach to send draws to a single viewport
- Created a template class TagRegistery which implements the previous DrawListTagRegistry. The template is used for both DrawListTagRegistry and DrawFilterTagRegistry
- Added DrawFilterTag to DrawItemKeyPair
- Added DrawFilterMask support in DrawPacket and DrawPacketBuilder
- Added CreateDynamicContext for render pipeline which allows draw to selected render pipeline.
- Updated RasterPass's BuildCommandListInternal function to filter draw items for its owner RenderPipeline.
- Updated RHI unit tests.
2021-04-26 13:52:30 -07:00
Aaron Ruiz Mora 45fbc86d2d Fix cloth with MeshOptimization ON
- Reexport cloth assets with AssImp ON. These was necessary because AssImp collects a different name for the color streams than FbxSDK and therefore they needed to be reassigned in the cloth rule.
- Adding '_optimized' string to a global variable and using StringFunc RChop to remove it for a string.
2021-04-23 21:42:17 +01:00
Chris Burel 61fe298319 Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
Nicholas Van Sickle 3eaa749191 Merge pull request #277 from aws-lumberyard-dev/nvsickle/MoreMainFixes
Cherry-pick several 1.0 viewport fixes to main
2021-04-23 09:50:07 -07:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
Benjamin Jillich 0fa00a117c [ATOM-14477] Add clone function to model and/or model asset (#135)
* Added clone methods for the buffer, model lod and model assets.
* Cloning works via the creators.
* Mesh handle/instance now knows about the model asset it originated from as well as the cloned model asset that we need for instancing until instancing works without the dependencies to the asset ids.
* MeshComponentRequestBus returns the original asset id and the model asset. If you need access to the clone, go by the model.
* Cloth component mesh now gettings its model asset from the model as it needs to work on the clone.
* Moved the requires cloning function from the mesh loader in the mesh feature processor to the mesh component controller.
* As we need the model asset to be loaded before we can check if it requires cloning or not, we couldn't pass in a bool from the controller but had to use a callback.
* Using asset hint instead of asset id for the model lod asset creator error.
* Storing a map of source buffer asset ids and the actual cloned buffer assets rather than just their ids.
* Using the buffer assets from the new map directly and removed the search process in the mesh loop where the asset views are created.
* Fixed the vegetation mocks.
* Using the actor's mesh asset when emitting the on model ready event for the mesh component notification bus.
* Mesh components notifications connection policy changed to adapt to cloned model asset.
* Handling empty meshes in model lod asset creator.
* Removed the requires cloning callback from the mesh feature processor and made it a parameter to the acquire mesh function
* Fixing mocks and unit tests
2021-04-23 18:33:00 +02:00
nvsickle 12468fd81a Fix spacing from merge 2021-04-23 02:08:50 -07:00
nvsickle f835372c0f Fix capitalization... 2021-04-23 00:27:39 -07:00
nvsickle 228fa7ff6b Fix search and replace fail 2021-04-23 00:27:37 -07:00
nvsickle e6cfe36a03 Fix typo 2021-04-23 00:27:34 -07:00
nvsickle 9e6244dc99 Fix game mode camera components not working in-Editor
Ensures RPI::View updates always make it back to the ViewportContext, even if you talk directly to the View
2021-04-23 00:26:53 -07:00
rgba16f ca1a684c95 Merge pull request #266 from aws-lumberyard-dev/FixGameLauncherConsole
Fix GameLauncher Imgui DebugConsole so that it renders
2021-04-22 23:40:13 -05:00
rgba16f 0bf7c29506 Fix GameLauncher Imgui DebugConsole so that it renders 2021-04-22 19:11:27 -05:00
greerdv 62a3b7635b Merge branch 'main' into non-uniform-scale-mesh 2021-04-21 10:56:36 +01:00
greerdv 496891b4c0 feedback from PR 2021-04-21 10:55:05 +01:00
Tommy Walton b95865b2d8 Simple Motion component doesn't animate actors (#179)
Buffers that have InputAssembly bind flags but also have ShaderRead flags should create buffer views
2021-04-21 08:37:51 +01:00
nvsickle ba5e0170a2 Fix ImGui rendering in-Editor
-Ensure ViewportContext rendertick notifications always fire
-Use viewport size to determine ImGui resolution, ensure OnViewportSizeChanged is always up-to-date for the default viewport context
2021-04-20 15:27:36 -07:00
mbalfour 5aa4642c12 Added another implicit converter to MaterialPropertyValue so that generated images can be used with material properties more easily.
(cherry picked from commit 66d7e9672ca0d6ced068dd95d8b52f88b5492c1f)
2021-04-20 09:29:43 -05:00
greerdv fd8b42c45e Merge branch 'main' into non-uniform-scale-mesh 2021-04-20 10:29:55 +01:00
qingtao c9153b0353 ATOM-15272 Running game with Actor spams asserts in the log resulting in low framerate
The condition was setup wrongly when introducing DynamicInputAssembly.
2021-04-19 11:47:57 -07:00
greerdv e497b7ac33 Merge branch 'main' into non-uniform-scale-mesh 2021-04-19 11:05:10 +01:00
dmcdiar 46b9f1934d Removed commented line 2021-04-18 23:15:02 -07:00
dmcdiar 456bcb3bf9 Updated the EnvironmentCubeMapPipeline to match recent changes to the MainPipeline.
Set the multisample state on the EnvironmentCubeMapPipeline render settings.
2021-04-18 14:57:52 -07:00
Vicky 9195abe5c6 Merge pull request #102 from aws-lumberyard-dev/Atom/qingtao/ATOM-15252
ATOM-15252 [Atom 0.8.5] Track View capture crashes when scene contains certain postfx
2021-04-16 15:50:37 -07:00
Alex Peterson 6924621cc1 Merge pull request #112 from aws-lumberyard-dev/github/staging
Integrating github/staging through commit ef88e6e
2021-04-16 15:21:17 -07:00
hershey5045 8378f52ba6 Fix bug in ShaderVariantAssetBuilder. Add cvar in MeshDrawPacket class. (#61)
Fix bug in ShaderVariantAssetBuilder. Add a console variable to force root shader variant usage.
2021-04-16 12:06:05 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
qingtao 0aae99c491 Merge branch 'main' into Atom/qingtao/ATOM-15252 to first the blast test issue in AR. 2021-04-16 11:23:30 -07:00
qingtao 8e34d784e6 ATOM-15252 [Atom 0.8.5] Track View capture crashes when scene contains certain postfx
The crash was because the "BlendColorGradingLutImageAttachmentId" attachment got imported to attachment database twice.
This fix avoids import this attachment twice. It also avoid crash but only report a warning if an imported attachment wasn't used in any scope.
Enable both RHI and RPI validation (no visiable performance impact observed.
2021-04-16 09:47:03 -07:00
moudgils ca86068d83 Minor update 2021-04-15 20:55:54 -07:00
moudgils d0435b4489 Minor update 2021-04-15 20:46:48 -07:00
moudgils 05359187c4 Test update 2021-04-15 20:45:53 -07:00
moudgils 89a935cd29 Minor update 2021-04-15 20:44:01 -07:00
moudgils 3c631e4a85 Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder 2021-04-15 19:16:29 -07:00
Vicky 8743155b73 Merge pull request #76 from aws-lumberyard-dev/Atom/qingtao/ATOM-13791
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
LYN-2908 Pressing Home button crashes the Editor
2021-04-15 15:19:25 -07:00
moudgils abf26eede1 Bump REsourcePoolBuilder as the bufferBindFlags were updated 2021-04-15 14:00:40 -07:00
dmcdiar 20c1454e4b Added the ShaderRead buffer bind flag to the static and dynamic input assembly pools, and one creation of a static input assembly buffer. 2021-04-15 03:41:20 -07:00
greerdv 4c582a2b0a Merge branch 'main' into non-uniform-scale-mesh 2021-04-15 08:29:57 +01:00
greerdv d8169e08fb merging from main 2021-04-15 08:18:11 +01:00
qingtao fa7f61cf0d ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
2021-04-14 22:48:46 -07:00
moudgils 3d3f43b0b9 Merge pull request #36 from aws-lumberyard-dev/Atom/moudgils/MacRuntimeFixes
Atom/moudgils/mac runtime fixes
2021-04-14 20:57:40 -07:00
AMZN-mnaumov c97dae47b7 Merge pull request #22 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14904_2
[ATOM-14904] Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets
2021-04-14 18:53:23 -07:00
moudgils 6f67aabd67 Minor cleanup 2021-04-14 09:42:13 -07:00
greerdv 2fb2813b48 updating atom mesh component to support non-uniform scale component 2021-04-14 14:05:59 +01:00
moudgils 9aec30a608 Merge branch 'main' into Atom/moudgils/MacRuntimeFixes 2021-04-13 21:48:17 -07:00
moudgils 68d58f48ae Merge branch 'main' into Atom/moudgils/MacRuntimeFixes 2021-04-13 19:45:18 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
moudgils 16ba08c917 Mac compile fixes, Fix imgui rendering, Introduce a new RHI::BufferBindFlag, Fix a crash in AsyncStreaming, Fix shader build errors 2021-04-13 11:03:27 -07:00