Commit Graph

8319 Commits

Author SHA1 Message Date
Guthrie Adams 799290aefc Created custom JSON serializer for editor material component
The editor component contains an editor specific, dynamically generated version of the material slots to display all the possible options, organize properties for the user interface, and add custom actions.
The critical data is already stored inside of the component controller configuration, which only stores a map of modified or overridden values.
This change disables serialization of the redundant data for prefabs.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-30 17:36:07 -05:00
Tommy Walton 4ccbb964f3 Add missing dependencies to pass builder (#4884) (#5099)
* 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-29 10:53:31 -07:00
AMZN-Phil 8aecd6668a Merge pull request #5113 from aws-lumberyard-dev/Prism/ReposExceptionFix
Fix thrown exceptions if repos does not exist in the manifest
2021-10-29 10:40:46 -07:00
Alex Peterson 65d23c7ed6 Merge pull request #5086 from aws-lumberyard-dev/Prism/RefreshRepoButtonDisablesRepo
Removed Gem Repo Enable Button
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-29 10:38:11 -07:00
Alex Peterson 5db6ffb6f3 Disable custom titlebar on Mac, Linux, fix resize (#4973) (#5114)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-29 09:21:20 -07:00
Alex Peterson b4dd4c8f02 Add engine name, folder and fix refresh crash (#5112)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-29 09:20:52 -07:00
Adi Bar-Lev 5fe2207892 Merge pull request #5095 from aws-lumberyard-dev/Atom/barlev/Stabilization_MaterialMetalicBugFix
Material - enbale/disable metallic scale according to texture selection
2021-10-29 11:12:14 -04:00
John Jones-Steele 021917ad27 Fix bug 4198 (#5107)
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-10-29 09:42:40 +01:00
AMZN-Phil d355942e8b Fix an additional location
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-10-28 16:36:54 -07:00
AMZN-Phil 5971f1176e Fix thrown exceptions if repos does not exist in the manifest
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-10-28 16:17:28 -07: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
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
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
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
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
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
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
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
Ken Pruiksma a661189ea9 Fix for rendering artifacts on height map update. (#5066)
* Fix for rendering artifacts on height map update. This was being caused by not always lining up update aabbs with the query resolution correctly. In the future the float -> integer aabb calculations should be abstracted away. Some of this is done in the detail material ID work, but doesn't exist in the stabilization branch so we can circle around to it later.

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

* PR review updates - fixing cast, making constexpr for bytes per pixel.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-10-28 10:53:57 -05:00
greerdv 8d7eb4767a Merge pull request #5081 from aws-lumberyard-dev/ragdoll-joint-rotation
make sure joint frame rotations are editable for ragdoll setup
2021-10-28 15:38:09 +01:00
nggieber 8117798949 Removed gem repo enable button
Signed-off-by: nggieber <nggieber@amazon.com>
2021-10-28 07:00:21 -07:00
Olex Lozitskiy 837831a919 Bug fix: hierarchical components serve as multiplayer input drivers
- Network Hierarchy Root and Child components can now act as MultiplayerInputDriver for components with NetworkInputs
2021-10-28 09:33:06 -04:00
greerdv 9b2afbc39b fix explicit qualification of member function addresses
Signed-off-by: greerdv <greerdv@amazon.com>
2021-10-28 12:51:33 +01:00
greerdv dd0780f6ec make sure joint frame rotations are editable for ragdoll setup
Signed-off-by: greerdv <greerdv@amazon.com>
2021-10-28 12:26:05 +01:00
Chris Galvan caab78d930 Merge pull request #5065 from aws-lumberyard-dev/cgalvan/RenameToolGemTemplates
Renamed the C++ and Python tool gem templates
2021-10-27 21:15:14 -05:00
Chris Galvan 8bbd8f9807 Renamed the C++ and Python tool gem templates after review.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-10-27 16:01:02 -05:00
Alex Peterson 59c898fc48 Fix notification queue and add gem action (#4985) (#5024)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-27 13:55:32 -07:00
Chris Galvan d23df465dd Merge pull request #5043 from aws-lumberyard-dev/cgalvan/CherryPickPythonGemTemplate
Cherry picked PythonGem template to stabilization.
2021-10-27 14:00:06 -05:00
John Jones-Steele 35467b63d9 Unit tests for Heightfield collider (#5042)
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-10-27 19:31:30 +01:00
Qing Tao 9e0756f3c1 ATOM-16656 PassTree tool: ParentPass image attachment preview doesn't work (#5032)
Move imageAttachmentCopy instance from RenderPass to Pass so it can support preview image for all passes but not only for RenderPass.
Fixed an issue with image attachment preview when switching render pipeline with attachment preview on.

Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-27 11:28:21 -07:00
Vincent Liu 30c366366e Improve gamelift unit test by checking handler invocation (#5030)
Signed-off-by: onecent1101 <liug@amazon.com>
2021-10-27 09:56:30 -07:00
AMZN-Phil 3165cf2838 Merge pull request #5011 from aws-lumberyard-dev/Prism/FixGemSelectedFilter
Gem Catalog Selected Gems Now Filters For Gems to be Enabled in Current Session
2021-10-27 09:28:16 -07:00
AMZN-Phil 7fc0f14a1b Merge pull request #5006 from aws-lumberyard-dev/Prism/FixRemovedProjectStillShown
Fix Issue When Removed Project is Still Shown if it Was The Last Project
2021-10-27 09:28:06 -07:00
AMZN-Olex 1190fb5c91 Merge branch 'stabilization/2110' of https://github.com/o3de/o3de into Network/olexl/hierarchy_as_multiplayer_input_driver 2021-10-27 11:54:22 -04:00
Chris Galvan ee57885d64 Cherry picked PythonGem template to stabilization.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-10-27 10:10:59 -05:00
galibzon cf90d7a594 ShaderVariantAssetBuilder: Provide registry property to disable (#5029)
The registry property name is:
"/O3DE/Atom/Shaders/BuildVariants"
Default value is <true>.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-10-27 10:05:26 -05:00
Chris Galvan d332f7c4c7 Merge pull request #5023 from aws-lumberyard-dev/cgalvan/AddComponentTypeIconAPI
Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls.
2021-10-27 08:04:53 -05:00
moraaar a29623e5f0 Fixed editor crash using cylinder shape component (#5037)
Fixed cylinder shape by considering shape config list to be empty.

The crash came from clearing shape config list when cylinder height is zero, but when the height is restored to zero it was expecting an element in the list.

The code to set the shape configuration was the same for many shape types, so it has been refactored to a helper function.

Fixes #4999
2021-10-27 13:34:43 +01:00
santorac 049112d8fa Merge pull request #5027 from aws-lumberyard-dev/Atom/santorac/MoveDoubleSided
Removed reference to opacity.doubleSided property that no longer exists.
2021-10-26 18:54:12 -07:00
Chris Burel e4c69a29fa [Linux] Update Qt package to include xcb GL integration plugin (#4976)
Fixes #3132.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-10-26 18:45:33 -05:00
AMZN-Olex 250a91dd96 Network Hierarchy Root and Child components can now act as MultiplayerInputDriver for components with NetworkInputs
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-10-26 19:10:46 -04:00
galibzon 42a14079f2 Fix naming for DisableOptimizations vs DxcDisableOptimizations (#5016)
Signed-off-by: garrieta <garrieta@amazon.com>
2021-10-26 17:48:28 -05:00
santorac 8fd3461863 Removed reference to opacity.doubleSided property that no longer exists.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-10-26 15:38:09 -07:00
Chris Galvan 78b0683313 Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-10-26 15:47:17 -05:00