Commit Graph

12122 Commits

Author SHA1 Message Date
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
Santi Paprika 9c60bd008c Enable human skin profile via preprocessor define (https://github.com/o3de/o3de/pull/6428#discussion_r797699927)
Signed-off-by: Santi Paprika <santi.gonzalez.cs@gmail.com>
2022-02-02 18:47:11 +01:00
Santi Paprika 1087e45ce3 Fix typo (https://github.com/o3de/o3de/pull/6428#discussion_r797667772)
Signed-off-by: Santi Paprika <santi.gonzalez.cs@gmail.com>
2022-02-02 18:42:29 +01:00
Chris Galvan dd4ab4173d Changed to use a new enum for handling the output types in case we need to expand custom handling in the future
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-02-02 11:21:06 -06: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
Santi Paprika 1c47d719c8 Merge remote-tracking branch 'upstream/development' into thin-transmission 2022-02-02 16:15:00 +01:00
Benjamin Jillich 9eb101778d Merge branch 'development' into jillich/MM20220201
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2022-02-02 10:44:01 +01:00
Benjamin Jillich 0b63fed9c9 Motion Matching: Fixed several bugs and improved anim graph node RPE layout
* Fixed several crashes that happened when adjusting the cost function in the UI.
* Automatically hide the trajectory path radius and path speed properties when the mode is set to target-based.
* Re-ordered the properties for better grouping.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2022-02-02 10:38:58 +01: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
antonmic 50f34cf445 Changed how pass system controls pipeline tick rate
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2022-02-02 00:45:54 -08: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 a7bdb05d66 Tied up some loose ends with nested property group support.
Fixed the MaterialBuilder to report source dependencies on imported JSON files, so the material type will rebuild when you edit an imported file that contains shared property data.
Fixed a spot in LuaMaterialFunctorSourceData where it was only applying the old "prefix" feature and not the new name context.
Updated a couple built-in material functors to take advantage of the name context (they were using RuntimeContext::GetShaderResourceGroupLayout instead of the RuntimeContext::FindShaderInputConstantIndex wrapper utility function).
Fixed an issue with EnumeratePropertyGroups where it wasn't passing the right name context, so Material Editor wasn't able to load some material types.
Reordered the parameters in the MaterialTypeSourceData enumerate callback functions, I felt this order was more natural.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-01 22:37:47 -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
santorac 2c59f1b8a4 Added support for deeply nested material property groups.
The main addition here is the MaterialNameContext class which represents the concept of a namespace for properties, shader options, and SRG fields. This concept was already somewhat supported in LuaMaterialFunctor through bespoke "prefix" fields, but I have generalized it be available for all material functors. Note that I have not yet updated the other material functor types to ensure they take advantage of this feature, that will be in another commit.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-01 16:35:42 -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
Chris Galvan 578a19bf49 Removed unused parameters in the GSI.preset configuration
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-02-01 16:05:30 -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
Chris Galvan 85b8177efa Added preset for converting gsi images
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-02-01 15:32:53 -06:00
santorac b1cc469914 Merge branch 'Atom/santorac/ShaderOptionValueUtils' into Atom/santorac/RemixableMaterialTypes4_Layering
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-01 12:24:50 -08:00
santorac 5ecc5b7edb Merge branch 'development' into Atom/santorac/RemixableMaterialTypes4_Layering
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-01 12:24:14 -08: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
santorac a352807c87 Renamed MaterialFunctor code to use propertyId instead of propertyName, because 'name' is us for the short name of a property and 'ID' is for the full name including groups.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-01 09:56:27 -08:00
Gene Walters 23bdc52270 Merge branch 'upstream/development' into LYN-6769_TestingRPCs_AutonToAuth_ServerToAuth 2022-02-01 09:54:13 -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
Gene Walters 647982ea39 Minor py-code comments
Signed-off-by: Gene Walters <genewalt@amazon.com>
2022-02-01 09:30:54 -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
Benjamin Jillich 3eb661c4bc Motion Matching: Moved discard event check into consolidated IsFrameDiscarded() method
* Moved the extract events call and the check for a discard frame event to the IsFrameDiscarded() function.
* Added class description for the frame database and ported the comments to //! and //<

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2022-02-01 13:53:13 +01:00
Benjamin Jillich 83869d7064 Motion Matching: Fixed crash on empty KD-tree
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2022-02-01 13:49:02 +01:00