Commit Graph

11655 Commits

Author SHA1 Message Date
Jeremy Ong 5c2ce583cd Merge pull request #7356 from aws-lumberyard-dev/Atom/ShaderDefinitions
Add "Definitions" field to shader asset
2022-02-02 12:05:18 -07:00
moudgils 608411ab99 Metal pso caching support via MTLBinaryArchive (#7212)
* PipelineLibrary (PSO Caching) support for Metal

- API changes to handle Metal drivers implictly doing save/load of PipelineLibrary data
- Fixed up code related to Metal device selection
- PipelineLibrary support for Mac and ios

Signed-off-by: moudgils <moudgils@amazon.com>

* Fix compile errors for Dx12, Vulkan backend + Unit tests

Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com>

* Fixed errors related to M1 GPU

Signed-off-by: moudgils <moudgils@amazon.com>

* Fix a minor 'tab' validation issue

Signed-off-by: moudgils <moudgils@amazon.com>

* Addressed feedback

Signed-off-by: moudgils <moudgils@amazon.com>

* Minor feedback

Signed-off-by: moudgils <moudgils@amazon.com>

* Added a few asserts

Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com>

* Fix a typo

Signed-off-by: moudgils <moudgils@amazon.com>
2022-02-02 10:50:37 -08:00
jromnoa 9a30c5366c Merge pull request #7302 from aws-lumberyard-dev/Atom/scottmur/P1_decal_null
P1 Decal tests for null renderer
2022-02-02 10:43:07 -08:00
antonmic 3d2f9528f2 Merge pull request #6443 from aws-lumberyard-dev/Atom/antonmic/BasePBR
Atom/antonmic/base pbr
2022-02-02 10:35:03 -08:00
Danilo Aimini daeab4bbb1 Focus Mode | Switch instance referencing in Prefab Focus Handler to use more reliable Instance handles (#7304)
* Add function to Prefab Instances allowing to get a reference to a nested instance by alias.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Refactor the Prefab Focus Handler to use RootAliasPaths to store the reference to the currently focused prefab instance instead of the previous method (entityId of the prefab container).

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Use existing FindNestedInstance method instead of adding new one.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor fixes to style and comments

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Removing indexing in GetInstanceReferenceFromRootAliasPath, turn variables into constants where possible.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Modified the Prefab Focus test fixture to ensure the entity hierarchy is generated under the Prefab EOS, allowing tests to work with the new implementation of the focus mode handler.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Ensure RootAliasPath is iterated by reference in GetInstanceReferenceFromRootAliasPath

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-02-02 09:17:59 -08:00
amzn-mike c1b53f1284 [LYN-4034] Asset Processor: Sqlite inclusivity fix (#7291)
* Update sqlite package for windows

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add assert to make sure sqlite header and lib version match

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update linux

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update Builting Package / Mac for Sqlite 3.37.2-rev1

Signed-off-by: spham <82231385+spham-amzn@users.noreply.github.com>

* Re-add newline at end of file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Inclusivity: change sqlite_master to sqlite_schema alias

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

Co-authored-by: spham <82231385+spham-amzn@users.noreply.github.com>
2022-02-02 09:04:27 -08:00
amzn-mike 4f47f26249 Move Runtime dependency on AssetBuilder from AssetProcessor.Static to AssetProcessor and AssetProcessorBatch. (#7298)
This dependency was causing all of the asset processor modules to have to build gems, namely the unit tests which did not actually require the gems.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2022-02-02 09:04:18 -08:00
Qing Tao 584f9abf16 Add new function to DynamicDrawInterface to support submiting cached DrawPacket (#7337)
New function:
void AddDrawPacket(Scene* scene, ConstPtr<RHI::DrawPacket> drawPacket)
Deprecated function (still supported) :
void AddDrawPacket(Scene* scene, AZStd::unique_ptr<const RHI::DrawPacket> drawPacket)

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2022-02-02 08:52:53 -08:00
Gene Walters 059550a311 Merge pull request #6113 from aws-lumberyard-dev/scspaldi_basic_networking_automation_test
Basic networking automation test
2022-02-02 07:16:06 -08:00
Benjamin Jillich 5e85e0e397 ImGui: Added FindContainerByName() helper (#7313)
Added a helper function to find a container by name in the histogram container.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2022-02-02 09:55:39 +01:00
Jeremy Ong 743ade1765 Add "Definitions" field to shader asset
Shaders can now specify a top-level field "Definitions" which
accepts an array of string values. Each string will be appended
to the set of preprocessor definitions defined globally and forwarded
to the MCPP preprocessor on shader build. The shader-reload soak test
was modified to accept a new shader to test this feature in the ASV.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
2022-02-02 00:23:55 -07:00
antonmic 7534193234 merging dev for good luck after failed AR
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2022-02-01 22:50:38 -08:00
santorac d6c419d630 Merge pull request #7250 from aws-lumberyard-dev/Atom/santorac/RemixableMaterialTypes3_UpdatedStandardPbr
Updated StandardPbr.materialtype to follow the new file material type format
2022-02-01 19:08:35 -08:00
antonmic ba76d304dc merging latest dev
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2022-02-01 16:54:00 -08:00
santorac 8042a6e97a Merge branch 'development' into Atom/santorac/RemixableMaterialTypes3_UpdatedStandardPbr
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-01 16:39:20 -08:00
antonmic 5b9bc3b479 address PR feedback
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2022-02-01 16:08:10 -08:00
Guthrie Adams 4b91a86ace Merge pull request #7276 from aws-lumberyard-dev/Atom/guthadam/atom_tools_move_document_boilerplate_to_base_class
Atom Tools: move boilerplate document management code to atom tools framework
2022-02-01 16:19:14 -06:00
santorac 7cbcd5e145 Merge pull request #7328 from aws-lumberyard-dev/Atom/santorac/ShaderOptionValueUtils
Minor cleanup of some shader option related unit tests.
2022-02-01 13:59:16 -08:00
dmcdiarmid-ly 7413842227 Merge pull request #7275 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-13886
DiffuseProbeGrid Visualization
2022-02-01 14:47:01 -07:00
srikappa-amzn fd20b028a6 Deprecate IsPrefabSystemForLevelsEnabled and use IsPrefabSystemEnabled everywhere (#7327)
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
2022-02-01 13:37:47 -08:00
Guthrie Adams 670d22cb5b Added notifications after re opening a document
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-02-01 15:34:20 -06:00
santorac 3441c02637 Minor cleanup of some shader option related unit tests.
Added new utility functions for easily creating the value set for a ShaderOptionDescriptor.
Made ShaderOptionDescriptor default value optional, picking the first available value as the default ... by default.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-01 11:42:50 -08:00
Guthrie Adams ca0006f570 Minor changes and comments after PR feedback
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-02-01 13:32:49 -06:00
Scott Murray 157149928b lower casing materials in path to avoid Linux casing issues
Signed-off-by: Scott Murray <scottmur@amazon.com>
2022-02-01 11:24:51 -08:00
Brian Herrera 31f39930af Add overall timeout for the AR pipeline #7261 2022-02-01 09:57:21 -08:00
Scott Murray 9081a0db90 use material included and remove unused decal material
Signed-off-by: Scott Murray <scottmur@amazon.com>
2022-02-01 09:51:22 -08:00
Benjamin Jillich 30de4e92e0 Motion Matching: Added example level and assets for an automatic demo #7317
* Added camera controller script canvas graph that follows the character and rotates slowly around it.
* Added simple motion matching anim graph using the automatic target mode that doesn't need user input and just makes the character run around in the level.
* Added example level.

Note: As O3DE can't locate level files from within the gems asset folder, the level file needs to manually be copy & pasted to the ${YourProject}\Levels\ folder.

Signed-off-by: Benjamin Jillich jillich@amazon.com
2022-02-01 18:05:58 +01:00
Steve Pham 71cc3a2568 Remove -Wno-comment warning suppression
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2022-02-01 09:04:32 -08:00
Mike Balfour 3f63cf3546 Misc SurfaceData Optimizations (#7299)
* Misc SurfaceData Optimizations.
This includes a few different optimizations found while trying to make the bulk query APIs faster:
* Switches mutexes over to shared_lock to optimize for the multi-reader-single-writer pattern
* Surface provider point creation now uses a pre-created set of masks to initialize with, and uses std::move() to move the created point into the output list instead of copying it.
* Splits CombineSortAndFilterNeightboringPoints so that the FilterPoints() can occur separately and efficiently with erase/remove_if, and avoids making a copy of the output points.
* Optimized SurfaceDataShapeComponent::ModifySurfacePoints
* Fixed potential bug where the sort wasn't stable since it only compared the Z value, and could have produced unexpected results for differing points with the exact same Z value.
* Fixed up a couple small bugs and missing checks in the unit tests

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed syntax on unit tests.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-02-01 10:44:14 -06:00
bosnichd ff4529fc60 Terrain ray cast benchmarks and optimization. (#7303)
* Terrain ray cast benchmarks and optimization:
- Added some benchmarks that exercise terrain ray casting.
- Optimized terrain ray casting by removing an unnecessary AABB intersection check (this was suggested by @invertednormal in the original review, but I forgot to actually remove it until now).
- Fixed a bug where we were not normalizing the ray direction before performing the Moller-Trumbore ray<->triangle intersection calculations.

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Update to make work with changes pulled down from mainline.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2022-02-01 09:36:44 -07:00
Gene Walters 9d002860f7 Merge pull request #7293 from aws-lumberyard-dev/LYN-6769_TestingRPCs
AutomatedTesting: Adding Multiplayer Authority->Client RPC Test
2022-02-01 08:32:17 -08:00
Luis Sempé eb84f54138 Merge pull request #7262 from aws-lumberyard-dev/scripting/screenshot_toolbutton
Script Canvas: Added a toolbar button to capture a screenshot
2022-02-01 07:25:11 -08:00
Chris Galvan ec147cc4fe Merge pull request #7301 from aws-lumberyard-dev/cgalvan/RemoveLegacyPropertyResourceCtrl
Removed legacy PropertyResourceCtrl
2022-02-01 08:51:26 -06:00
jiaweig 1dd4898713 LYN-8551 Terrain: Renderer: Create compute pass for clipmaps (#7116)
* Allocate a pass that will be used to generate clipmap

Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>

* Fix some small issues

Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>

* Rename the pass to avoid future conflict. Move assets to terrain gem.

Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>

* Turn the pass off

Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>

* Move pass templates to Terrain gem

Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>

* move load template to private

Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>

* Add macro texture compute pass

Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>

* Fix uncleaned code from previous commit

Signed-off-by: jiaweig <51759646+jiaweig-amzn@users.noreply.github.com>
2022-02-01 08:47:11 -06:00
SergeyAMZN c6a0d76843 Merge pull request #7248 from aws-lumberyard-dev/TerrainMaterialsFix
Fixed crash and asserts when heightfield is used without Terrain World
2022-02-01 10:29:54 +00:00
Ignacio Martinez 27b84761de Adding Collapse All tooltip in the Asset Browser (#7236)
* Added Collapse All Tooltip

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Changed tooltip duration

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Changed tooltip from .ui file

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Removed custom tooltip duration

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
2022-02-01 09:55:03 +00:00
Tom Hulton-Harrop dd0f21b460 Fix incorrect icon rendering (#6454)
* fix incorrect icon rendering

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add redundant parens

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add tests for icon display fixes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update references to EditorVisibleEntityDataCache to EditorVisibleEntityDataCacheInterface

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following review feedback and remaining updates for EditorVisibleEntityDataCacheInterface

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2022-02-01 09:36:42 +00:00
AMZN-nggieber f5fcab75d6 Display Gem Icons in Gem Catalog (#7294)
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2022-01-31 17:06:06 -08:00
Guthrie Adams 66be8543cd fixing merge issues
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-31 19:04:54 -06:00
Guthrie Adams 8617d34724 updated comment
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-31 19:04:52 -06:00
Guthrie Adams 9ded52b141 Wrapping redundant save logic into function in the material editor document class
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-31 19:04:50 -06:00
Guthrie Adams e273f3ef6a Updating comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-31 19:04:47 -06:00
Guthrie Adams dc598a8b3c Atom Tools: move boilerplate document management code to atom tools framework
• Moved all of the common save and load code to the document base class
• Moved undo and redo support to document base class but will probably extract to its own class or replace with one from AzTF
• Streamlined material editor, shader management console, and other tools with updated document code
• Cleaned up some of shader management console loading code, added support for saving, as well as getting and setting the shader variant list source data structure

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-31 19:04:45 -06:00
Danilo Aimini e1c7dce7a7 Fixes issue with painters being saved and not restored in some cases, which would print numerous warnings in the VS console. (#7296)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-01-31 15:45:34 -08:00
Scott Murray ad6392e364 decal P1 test for null renderer
Signed-off-by: Scott Murray <scottmur@amazon.com>
2022-01-31 15:03:17 -08:00
Steve Pham 2dbc961ea8 Reorder and Remove unnecessary GCC ignore warning flags
- Reordered warning flags (#7297)
- Removed unnecessary ignore warning flags

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2022-01-31 14:31:24 -08:00
hershey5045 96dcd1fc26 Atom/rbarrand/export screenshot diff (#7300)
* Small refactor on ImageComparison utils.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>

* Add aznumeric cast.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>

* Correction on aznumeric cast.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>

* Add unit test for new image comparison function.

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>

* Use span instead of array_view

Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>
2022-01-31 14:27:55 -08:00
Ken Pruiksma b455b915a8 Making terrain query resolution a single float instead of a Vector2 (#7186)
* Making terrain query resolution a single float instead of a Vector2

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Keeping the concept of different x/y step sizes in region queries since that may be useful and is separate from query resolution. Also keeping the concept of different x/y step sizes in physics since that's independent of the terrain gem.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Formatting cleanups

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* A few more minor cleanups

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Added support to convert serialized Vector2 query resolution to a single float.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Switch ray intersection check back to using separate values for x and y resolution

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixing new unit tests added to use float query resolution.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Updating automated test

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2022-01-31 16:10:03 -06:00
Chris Galvan 564596fcf0 Removed legacy PropertyResourceCtrl
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-31 15:34:42 -06:00
rgba16f 0a5e61b834 Update default AZStd thread priority on Apple platforms to avoid being prevented from using 100% of a core (#7295)
PAL-ified default thread priority for pthread platforms.
Fix threads not getting named on Apple platforms by setting the thread name ptr on the thread_info struct.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2022-01-31 14:17:20 -06:00