Commit Graph

211 Commits

Author SHA1 Message Date
Vicky 1681e97a0c ATOM-15369 LYN-3352 Expose sorting paramers to DynamicDrawContext's draw functions (#451) (#463)
* ATOM-15369 Expose sorting paramers to DynamicDrawContext's draw functions
 LYN-3352 LyShine: First element in Hierarchy does not properly draw in UI Editor

Add function to DynamicDrawContext to support set sort key for followed draw calls.
Use different sort key for background draw and top layer draw in UI canvas.
2021-04-30 11:19:13 -07:00
Ken Pruiksma 07780e137b Merge pull request #440 from aws-lumberyard-dev/pruiksma/ATOM-15427
Cherry pick [ATOM-15427] from 1.0 to main.
2021-04-29 18:44:31 -05:00
moudgils 4fd9ad5341 Merge pull request #414 from aws-lumberyard-dev/Atom/moudgils/DisableMetalShaders
Disable metal shaders that dont cross compile correctly
2021-04-29 16:37:07 -07:00
pruiksma 109605a733 Cherry pick 06044522763512b78ae504f658a3e7cb5f99996c from 1.0 to main.
[ATOM-15427] Fixing crash in DirectionalLightFeatureProcessor caused by incorrect use of a container.
2021-04-29 16:44:24 -05:00
hershey5045 a746223c65 Change AtomSampleViewer screenshots to use png (#336)
Add functionality to capture png screenshots.
2021-04-29 12:01:32 -07:00
Nicholas Van Sickle 3c5c692148 Merge pull request #411 from aws-lumberyard-dev/nvsickle/FixBoxSelect
Fix viewport box selection
2021-04-29 11:19:28 -07:00
dmcdiarmid-ly b1807cc337 Merge pull request #415 from aws-lumberyard-dev/Atom/dmcdiar/SPEC-6486
[SPEC-6486] DiffuseProbeGrid Resultcode initialized but not referenced in release builds
2021-04-29 10:57:41 -07:00
AMZN-koppersr 5e4094b258 Revamped AzFramework::Scene (#332)
Updated AzFramework::Scene to allow it to serve as the one-stop location for localized singletons. Localized singletons in this case are instance that can only occur once in an environment but multiple times within an application. As an example, this allows settings up a single camera per viewport for instance.

Highlights of changes:

Replaced the original ebuses with interfaces and events for easy of use and performance.
Removed the Entity Context specific code and moved that to new locations within the Entity Context itself.
Allowed basic inheritance. If a subsystem isn't found in a scene the parent can optionally be searched.
Scenes can enter a zombie state and avoid immediately being deleted. This is needed for situations where subsystems can't be destroyed until async calls have been completed.
2021-04-29 08:50:48 -07:00
dmcdiar f65ef56654 Added maybe_unsed to result codes that are only used in Asserts. 2021-04-29 01:02:47 -07:00
moudgils 389846c45c Disable metal shaders that dont cross compile correctly 2021-04-28 21:24:10 -07:00
lumberyard-employee-dm 3dec5d3b71 LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
2021-04-28 21:38:43 -05:00
nvsickle 9311dc4cb9 Fix RenderViewportWidget::ViewportWorldToScreen, which fixes box selection 2021-04-28 17:42:43 -07:00
AMZN-tpeng 4d7d870385 Merge pull request #217 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-14947
[ATOM][RHI][Vulkan][Android] Fix screen blur crash and constant buffer limits
2021-04-28 13:50:58 -07:00
Mike Balfour 18c2069b64 Merge pull request #359 from aws-lumberyard-dev/mbalfour/misc-viewport-fixes
ViewportContext - fix ebus connections
2021-04-28 15:43:30 -05:00
Peng 7c42ff959e Merge branch 'main' into ATOM/tonypeng/ATOM-14947 2021-04-28 11:50:51 -07:00
Peng 0e092d6cb7 ATOM-14947 Took out jira links, just use the ticket number 2021-04-28 10:45:18 -07:00
Guthrie Adams 3c8421036a Merge pull request #389 from aws-lumberyard-dev/Atom/guthadam/ATOM-15371
ATOM-15371 Adding missing RHI dependency to Atom tools
2021-04-28 12:35:21 -05:00
Guthrie Adams 518c6cb760 Merge pull request #385 from aws-lumberyard-dev/Atom/guthadam/ATOM-14003
ATOM-14003 adding image thumbnails to material inspector properties
2021-04-28 12:34:54 -05:00
hershey5045 9ffca4df5d [SMC] UI Updates (#270)
* Update SMC prompt texts. Add progress dialog in shader variant generation script. Add "Generate Shader Variant List" command in context menu for shader files in Asset Browser.
2021-04-28 09:56:55 -07:00
guthadam 33749519db ATOM-15371 Adding missing RHI dependency to Atom tools
This was causing error message spam and possibly other issues when launching the tools.

https://jira.agscollab.com/browse/ATOM-15371
2021-04-28 11:10:55 -05:00
Guthrie Adams 167b7f36a6 Merge pull request #373 from aws-lumberyard-dev/Atom/guthadam/ATOM-15370
ATOM-15370 Fix thumbnail scaling and sizing issues
2021-04-28 11:01:14 -05:00
Guthrie Adams 428feb6967 Merge pull request #376 from aws-lumberyard-dev/Atom/guthadam/ATOM-15372
ATOM-15372 Restoring material browser filter logic
2021-04-28 11:00:45 -05:00
guthadam 5cac07b4c1 ATOM-14003 adding image thumbnails to material inspector properties
https://jira.agscollab.com/browse/ATOM-14003
2021-04-28 00:17:58 -05:00
kberg-amzn 409489e938 Merge pull request #365 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components
2021-04-27 18:59:41 -07:00
AMZN-mnaumov a4047baccb Merge pull request #265 from aws-lumberyard-dev/Atom/mnaumov/ATOM-13851
[ATOM-13851] Adding custom title to PropertyAssetCtrl
2021-04-27 17:42:23 -07:00
dmcdiarmid-ly 17d5febda5 Merge pull request #337 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15355
[ATOM-15355] Raytracing mesh transforms are incorrect after initial load
2021-04-27 17:39:51 -07:00
mnaumov 793d60f150 Merge main 2021-04-27 17:07:42 -07:00
Peng ac900a7b57 ATOM-14947 Take out redundant else case for setting depthclip flag. 2021-04-27 16:51:17 -07:00
guthadam 1d093f9c29 Merge branch 'main' into Atom/guthadam/ATOM-15370 2021-04-27 18:46:26 -05:00
guthadam bd742519fb Merge branch 'main' into Atom/guthadam/ATOM-15372 2021-04-27 18:45:44 -05:00
guthadam 5593350f84 ATOM-15372 Restoring material browser filter logic
Restoring material browser filter logic to only show folders with content that matches the filter.

This change was originally introduced with the functionality to create a new folder within the material browser.  Creating a new, empty folder would not display the folder in the browser because it did not have any content that matched the filter.  While that makes sense to address the issue with the create folder command, it makes it extremely difficult and navigate the browser to find assets that match the filter because every folder that does not match the filter is also displayed in the tree.  We can revisit issues with the create folder action later.

https://jira.agscollab.com/browse/ATOM-15372
2021-04-27 17:12:42 -05:00
guthadam eeafb5eaa3 ATOM-15370 Fix thumbnail scaling and sizing issues
TLDR
Thumbnails size will be removed from the system.
Each thumbnail class is responsible for determining its stored size.
Images and other thumbnail types can be scaled up or down within reason without blurring.

The thumbnail system uses the concept of context and size organize thumbnails by size based on their intended use.  However, most of the thumbnail classes do not respect or use the specified size, which is 16 by 16 pixels and really only usable for small icons.

The thumbnails are currently being used in the asset browser tree control, the larger asset browser previews, the material component property asset controls, the material component inspector for the large preview, and other places.  Each of these places use completely different sizes, some of which are large and change dynamically. Whenever the thumbnails are painted they are scaled to the desired size.

Material and mesh thumbnails were always being captured at 512x512 regardless of what the rest of the thumbnail system said.  Source, product, and folder thumbnails would be stored at the original asset size.  The loading movie thumbnail was always drawn at 16 by 16 and scale up so it was always blurry.  Image thumbnails were always scaled down to 16 by 16 and scale up for larger previews.

Rather than worrying about the size of each context, each thumbnail class will store the image at whenever it deems to be a large enough size that can be scaled down when used.

This may eliminate the need for multiple thumbnail contexts which are not being used anyway.

https://jira.agscollab.com/browse/ATOM-15370
2021-04-27 16:43:06 -05:00
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
karlberg 16c31cde3e Fix issue found in PR 2021-04-27 13:53:18 -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
karlberg 901428668c Merging latest origin 2021-04-27 13:03:31 -07:00
karlberg 8cb1edb7d7 Updates ImGui to release version 1.82, builds out some better initial multiplayer metrics 2021-04-27 11:37:56 -07:00
mbalfour d753215d4b Reversing the fix to RayTracing, this isn't desired because it masks other problems. 2021-04-27 13:12:56 -05:00
mnaumov 5f33337fec Merge main 2021-04-27 11:05:22 -07:00
mbalfour 251929d071 Two misc bugfixes:
1) RayTracing will sometimes crash by dereferencing a null ptr.  This guards against it.
2) ViewportContext was missing some BusConnect / BusDisconnect calls.
2021-04-27 12:54:20 -05:00
Peng 76423a1cc8 Merge branch 'main' into ATOM/tonypeng/ATOM-14947 2021-04-27 09:15:33 -07:00
dmcdiar 73f3ec66b5 Set non-uniform scale in SetMesh. 2021-04-27 02:05:06 -07:00
Peng a8a60eeea7 ATOM-14947
-Fix vulkan graphics pipeline creation failure having depth clamp off with devices not supporting depth clip.
-Added reason for the mobile version of screen space reflection
2021-04-26 18:12:50 -07:00
mnaumov fdcb19f45a Reverting some unused code 2021-04-26 17:48:49 -07:00
mnaumov 91f027a05c PR feedback 2021-04-26 17:42:49 -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
Peng 41a2be2a71 Merge branch 'main' into ATOM/tonypeng/ATOM-14947 2021-04-26 09:22:49 -07:00
antonmic ddd26c3321 addressed review feedback and resolved issues from merge with main 2021-04-25 23:22:02 -07:00
antonmic fb369541cb Changing specularF0 variables back to specularF0Factor 2021-04-24 11:27:13 -07:00
antonmic 7ed49cb20b Merging main 2021-04-24 11:14:49 -07:00