Commit Graph

8750 Commits

Author SHA1 Message Date
Adi Bar-Lev 0ee7ab9df5 Merge commit '837831a91990861220d982ca21a302197178092a' into barlev/gitflow_211028_O3DE 2021-10-28 19:17:28 -04:00
Adi Bar-Lev 759b75a477 Merge commit 'caab78d9300762b283cf60856753fd090367e193' into barlev/gitflow_211028_O3DE 2021-10-28 19:17:21 -04:00
Adi Bar-Lev c26ce47805 Merge commit '59c898fc4853f898fc01ff6145a71bebad3caac6' into barlev/gitflow_211028_O3DE 2021-10-28 19:17:15 -04:00
Adi Bar-Lev ca9c7da168 Merge commit 'd23df465dd34d961bdbc5a73b7989abdb301ea47' into barlev/gitflow_211028_O3DE 2021-10-28 19:17:10 -04:00
Adi Bar-Lev fcd5e1e5fa Merge commit '35467b63d9964f8c308c7a4c07b9373181c48b6c' into barlev/gitflow_211028_O3DE 2021-10-28 19:17:04 -04:00
Adi Bar-Lev 8184c526f7 Merge commit '9e0756f3c11ae5218246fec732e1ceb4da14caeb' into barlev/gitflow_211028_O3DE 2021-10-28 19:16:57 -04:00
hershey5045 9dac727092 Add component activation in LUT activation script. (#5101)
Signed-off-by: rbarrand <rbarrand@amazon.com>

Co-authored-by: rbarrand <rbarrand@amazon.com>
2021-10-28 15:21:47 -07:00
Chris Galvan b2a8e40569 Merge pull request #5100 from aws-lumberyard-dev/cgalvan/GemplateImprovements
Improvements to C++/Python tool gemplates
2021-10-28 17:20:07 -05:00
amzn-mike 899bda4631 Add additional logging for Fingerprint test. (#5104)
This logging is to help track down a Jenkins only automated test failure.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-10-28 17:17:18 -05:00
Guthrie Adams 7d1b20d480 Merge pull request #5057 from aws-lumberyard-dev/Atom/guthadam/material_instance_editor_indicator_changes
Material component property inspector indicator changes
2021-10-28 17:06:13 -05:00
AMZN-ScottR 9bc0422f0b [profiler_capture_api] added trailing newlines to a couple new files
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-28 14:39:17 -07:00
Allen Jackson 29f5fb1271 {lyn7352} adding more logging around mock_asset_builder.py (#5103)
o3de\AutomatedTesting\Gem\PythonTests\PythonAssetBuilder\mock_asset_builder.py
- adding more logging
- updated keys for platforms (pc, server)

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-10-28 16:38:27 -05:00
Alex Peterson 6cce184340 Enforce unique gem names in catalog (#5063)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-28 14:33:24 -07:00
AMZN-ScottR e67db19a63 [profiler_capture_api] add sample python script to test Profiler System interface bindings
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-28 14:26:22 -07:00
AMZN-ScottR 90509c7fa2 [profiler_capture_api] removed now unnecessary ProfilerRequests EBus alias after AZ::Interface conversion
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-28 14:18:04 -07:00
Mike Balfour 86270339d8 Added terrain surface data notifications (#5067)
* Fix notifications for surface data changes.
Separated the notifications from the surface component and the height component to add a reason to a RefreshArea request.  This makes it possible to distinguish between surface changes and height changes and provide the appropriate OnTerrainDataChanged flags.

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

* Reworked to use a changeMask instead of separate calls.

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

* PR Feedback
Judicious use of "using" to reduce a bunch of bulky namespaces.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-10-28 16:17:38 -05:00
Scott Murray 7536073df0 remove and unused import
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-28 13:36:48 -07:00
Shirang Jia b8ced0d461 Fix AP log path on S3 (#5068)
Signed-off-by: shiranj <shiranj@amazon.com>
2021-10-28 13:31:33 -07:00
Alex Peterson 00a49fa251 Use source model data instead of filtered (#5071)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-28 12:53:54 -07:00
Tommy Walton f350ba3042 Modify the AssetBundler to correctly identify the Gems that are enabled in the current active project (#5072)
* Modify the AssetBundler to correctly identify the Gems that are enabled in the current active project

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Removed unnecessary if() statement and updated the comment.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Disabling gem loading in the asset bundler tests, just like the asset bundler itself.

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-10-28 12:49:33 -07:00
Guthrie Adams 689f5b2a4a Merge pull request #5076 from aws-lumberyard-dev/Atom/guthadam/material_component_supports_scripting_enums
Fix issue setting enum values on material component from script
2021-10-28 14:41:56 -05:00
Guthrie Adams caf247fcab Merge pull request #5070 from aws-lumberyard-dev/Atom/guthadam/material_component_clear_default_material_fixes
Fix clearing material component default material not updating
2021-10-28 14:40:52 -05:00
amzn-mike b6d634c3ed Print all captured messages in Assert Absorber used by FingerprintTest to help debug crash (#5096)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-10-28 14:37:51 -05:00
Chris Galvan e56396a817 Improvements to C++/Python tool gemplates
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-10-28 14:30:14 -05:00
AMZN-ScottR eb713fb3a8 Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-28 12:19:50 -07:00
santorac ecae08fa95 Made some improvements for debugging shader hot reload issues.
Made ShaderReloadDebugTracker store its static data in Environment system variables, so they are shared across dlls. This fixes issues with inconsistent indenting when debug operations are performed in different libraries.
New ShaderReloadDebugTracker operations in FullscreenTrianglePass.
Added a ShaderReloadDebugTracker message to Shader::GetVariant that includes asset built timestamp infromation, which I think will be really helpful in sorting out reload issues.
Renamed some functions and variables to remove a redundant "ShaderAsset" term.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-10-28 12:05:56 -07:00
Guthrie Adams e5729fbefe Fix clearing material component default material not clearing materials or updating preview
• Changed thumbnail property control to track asset key even if image is overridden so that it will be restored if the image is cleared.
• Changed property asset control to disable the thumbnail image by default whenever the attribute is applied. It will only enable the thumbnail image if the pixmap is valid.
• Changed the material component controller to always use an empty material assignment map on deactivation so that no persistent materials are reapplied.
• Changed the material component controller to immediately send a notification that materials have updated if no materials were queued for load but the configuration contained pre created or persistent material instances. This mainly affects the material editor because it manages its own material instances.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-28 13:58:47 -05:00
AMZN-ScottR fc94ede439 [profiler_capture_api] fixed runtime issues with BehaviorInterfaceProxy reflection
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-28 11:55:49 -07:00
Guthrie Adams 5de24437ab fixed comment
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-28 13:53:26 -05:00
Guthrie Adams 1f4967b168 extending conversions from script to other numeric types
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-28 13:53:23 -05:00
Guthrie Adams b71e307de5 Fix issue setting enum values on material component from script
Replaced get and set functions with explicit types with templates
Added special case handling for setting enum values as strings or numbers from script

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-28 13:53:21 -05:00
lumberyard-employee-dm b9147c60a0 Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)
* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed the platform name from the bootstrap.game.*.setreg

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-10-28 13:45:19 -05:00
John Jones-Steele e288ae47b4 Fix for using too large values on Terrain World (#5091)
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-10-28 19:36:39 +01:00
Adi Bar-Lev bd6153f471 Material - enbale/disable metallic scale according to texture selection
Remark: resolves GitHub issue https://github.com/o3de/o3de/issues/2647 - ATOM-15614

Signed-off-by: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com>
2021-10-28 13:24:49 -04:00
Tommy Walton 67f90a9b37 Add missing dependencies to pass builder (#4884)
* Adding shaders and attimage files as runtime depenencies for pass files, so that they are included in asset bundles. Also using the correct job key for attimage files.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Use a reference to avoid a copy

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Bumping the AnyAsset builder version

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Revert "Bumping the AnyAsset builder version"

This reverts commit 778798ae9cdd93ebe93248b3113e4cfb7609020d.

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-10-28 10:22:20 -07:00
Gene Walters 6d673643be Re-merging latest dev after rebasing to fix DCO. Re-resolving conflicts
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:56:01 -07:00
Gene Walters b324b3a1a9 Minor code comment grammar change
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:47:17 -07:00
Gene Walters 013beafe7e Minor code warning grammar fix
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:47:15 -07:00
Gene Walters 131c415404 small fix: adding newline back to end of a merged file
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:47:12 -07:00
rhhong a803cdcbb3 Fix build error
Signed-off-by: rhhong <rhhong@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:47:09 -07:00
rhhong bf958686c9 Calculate camera view projection each frame so we can have a fixed size viewport.
Signed-off-by: rhhong <rhhong@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:47:07 -07:00
Nicholas Van Sickle 3dea8fc03d Add Generic DOM visitor interface (#4852)
* Add Generic DOM visitor interface

Just the visitor interface from the [Generic DOM RFC](https://github.com/o3de/sig-content/blob/main/rfcs/rfc-10-generic-dom.md) with a few hardening changes so that we can align on it early:
- Clarified Lifetimes with an enum, extended it to cover the by-ref opaque values as well
- Added an explicit error type so that serializers can provide logging friendly rejections
- Did a first pass on documentation
- Added Visitor capabilities introspection and support for raw strings

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:46:54 -07:00
Ken Pruiksma e9cf7cb624 Detail material Id texture created from surface weights. (#4984)
* Added some structs for detail materials

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

* Added some template functions for looking up materials. Added lookups for all the relevant detail material fields in StandardPBR.

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

* Added some structs for detail materials

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

* Added some template functions for looking up materials. Added lookups for all the relevant detail material fields in StandardPBR.

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

* Added support for generating a detail material texture with IDs populated from surface weights.

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

* Updated TerrainAreaMaterailRequestBus to have separate calls for region vs materials instead of the awkward out parameter
Update MaterialPropertyDescriptor so that you can retrieve enum names by ID
Several bug fixes / updates to the terrain feature processor dealing with detail materials.

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

* Updating detail material texture based on offsets. Not quite working yet but close. Added visualization for detail material in shader (currently on, will be turned off before final commit)

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

* Small bugfixes
* Fix compile error in non-unity builds
* Fixed backwards x/y loops causing the wrong pixels to update
* Fixed selection of surface type with multiple surface weights

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

* Adding seam to detail texture debug display. Offseting edges by a half-pixel to avoid bleed. Disabling debugging detail textures by default.

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

* Missing file from last commit for detail material change.

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

* Cleanups

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

* bug fix

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

* Bug fix in the terrain fp for TerrainAreaMaterialRequestBus returning incomplete materials on GetSurfaceMaterialMappings

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

* Some PR updates. Exposing detail material id debugging through a cvar.

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

* Various updates from review.

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

* PR updates dealing with debug texture boundary line.

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

* Hiding some fields from the terrain material

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

* Fixing type in generic lambda for linux / android

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

Co-authored-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:46:51 -07:00
Adi Bar-Lev 21b349fcfa Hair - bug fix of changing the method by which passes are acquired (#5015)
Signed-off-by: Adi-Amazon <barlev@amazon.com>
Signed-off-by: Adi-Amazon <82479970+Adi-Amazon@users.noreply.github.com>

Co-authored-by: Adi-Amazon <barlev@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:46:49 -07:00
Allen Jackson 63308c942a {lyn7677} updated test modules to pass AssetPipelineTests on Linux (#5017)
* {lyn7677} updated test modules to pass AssetPipelineTests on Linux

Fixes for Python AssetPipelineTests modules fail on Linux

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Separating the Linux and Mac concerns

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:46:46 -07:00
Michael Pollind 47266db100 bugfix: improve viewport overlay (#4939)
* bugfix: improve viewport overlay

- disable animation for window
- fix problem where vieport is offset from main window

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* update geometry of m_uiOverlay

Signed-off-by: Michael Pollind <mpollind@gmail.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:46:44 -07:00
Chris Burel 62e6b72e68 Use aznew where appropriate for EMotionFX Command subclasses (#4912)
Signed-off-by: Chris Burel <burelc@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:46:41 -07:00
sweeneys 0b9c792fda Fix AzTestRunner with correct lib
Signed-off-by: sweeneys <sweeneys@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:46:38 -07:00
sweeneys b9486036c3 Fix AzTestRunner smoke test on Linux
Signed-off-by: sweeneys <sweeneys@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:46:36 -07:00
santorac 9b41078774 Fixed potential unused variable 'originalVersion' with 'maybe_unused' attribute.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-28 09:46:33 -07:00