Commit Graph

5359 Commits

Author SHA1 Message Date
T.J. McGrath-Daly 5231cb9b53 Shortcut keys issue
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2022-01-06 10:14:26 +00:00
tjmgd 457007e037 Negative distances invalid (#6288)
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
2021-12-22 11:51:11 -08:00
tjmgd 515e363151 added pass class (#6244)
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-22 11:50:14 -08:00
tjmgd 5867e65720 The search cursor on the Node Palette interface does not cover the (#6218)
searched keywords completely

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-22 11:34:48 -08:00
Luis Sempé 454d6405b0 Merge pull request #6465 from aws-lumberyard-dev/scripting/catalog_load
Code maintenance, improved OnCatalogLoaded logic and track additions …
2021-12-22 09:50:57 -08:00
rgba16f d5e6ec5758 Change the nvidia Aftermath integration to use c strings directly rather than convert to an AZStd::string (#6535)
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-12-22 11:30:32 -06:00
rgba16f 67689d48cc Add precise keyword to the depth and forward pass shaders. (#6536)
* Add precise keyword to the depth and forward pass shaders. Make sure metal shader pipeline passes the invariant along

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update with VickyAtAZ's feedback, split the preserve invariance into a separate string

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix attribute comment alignment in the shaders

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-12-22 11:29:48 -06:00
Esteban Papp 74f0cb5b98 Removes LuxCore (#6491)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-22 09:06:28 -08:00
Mike Balfour aafb9e8110 Misc Bugfixes (#6530)
* Bugfix: AreaIds don't compare correctly when the priority bus doesn't have a listener.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
(cherry picked from commit eb9e95fcb3884dee638b9032785b828359b0d8c0)

* Bugfix: Only deactivate a component if it's currently active.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
(cherry picked from commit 7c9e4b7de49e8fe009616651d6e09f66c356db38)

* Switched shared_lock to unique_lock, since the data is being written to.

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

* Moved Legacy::CryCommon build dependency to correct location.
It was a public build dependency in FastNoise and GradientSignal, but really only should be a private dependency in Vegetation due to the vegetation system needing some init/shutdown events.
Fixing this up also required cleanup of a few unused legacy remnants in other files.

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

* InWorldBounds was incorrectly checking the X bounds against the Z bounds.

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

* Removed some additional unneeded legacy code that was now causing compile errors.

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

* Addressed PR feedback.

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

* Adjusted cmake dependencies again, based on what's needed in the public header files in the gems.

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

* Second attempt at the Deactivate() fix, this time by tracking the nested component state.

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

* Addressed PR feedback, made operation symmetrical.

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

* Added CryCommon privately to other veg modules too, since they all reference AreaSystemComponent, which uses the legacy events.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-12-22 10:38:04 -06:00
sphrose 4aaf0defd7 Merge pull request #6163 from aws-lumberyard-dev/terrain/sphrose/SurfaceDataConstants
LYN-7056 SurfaceDataConstants should be revised to have no terrain references
2021-12-22 14:13:55 +00:00
sphrose 9aec7d3113 Fix compile issues in tests
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-12-22 10:43:37 +00:00
Mike Balfour 845525a722 Add support for loading Png data directly from a memory buffer. (#6527)
* Add support for loading Png data directly from a memory buffer.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
(cherry picked from commit 6193dcf603d3c16ee193e1e6dc868bd6d04f89bc)

* Addressed PR feedback.

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

* Addressed PR feedback.
Simplified LoadInternal() by having it always use a GenericStream.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-12-21 16:28:44 -06:00
allisaurus 704aef8cad Add pytest to Resource Mapping Tool requirements.txt (#6259)
* Add pytest to Resource Mapping Tool requirements.txt

Signed-off-by: allisaurus <34254888+allisaurus@users.noreply.github.com>
2021-12-21 11:11:45 -08:00
Mike Balfour 37bb001040 Merge pull request #6517 from aws-lumberyard-dev/mbalfour/gitflow_211220_stabilization_2111RTE
Merge from stabilization/2111RTE
2021-12-21 08:21:58 -06:00
sphrose 657e56edf7 revew changes
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-12-21 09:55:29 +00:00
sphrose 89894ed52b Merge branch 'development' into terrain/sphrose/SurfaceDataConstants 2021-12-21 09:50:56 +00:00
Roman 366a7118ab Attachment: expose more function from AttachmentComponentRequestBus to behavior context (#6456)
Signed-off-by: rhhong <rhhong@amazon.com>
2021-12-20 22:00:47 -08:00
Mike Balfour 92b0514b48 Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE
# Conflicts:
#	Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp

Also fixed bad merge on ScripCanvas MainWindow.cpp

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-12-20 15:24:47 -06:00
Mike Balfour 2dcf206b35 Merge commit 'd7dc2579270d2f78786c14d69648692e714a11bc' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:50:27 -06:00
Mike Balfour 2c8a93fb9c Merge commit 'a2bb968371194a92bdd6e2841f73c85a79ce2a20' into mbalfour/gitflow_211220_stabilization_2111RTE
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

# Conflicts:
#	Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
#	Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
#	Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp
#	Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.h
#	Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
#	Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
#	Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
#	Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
#	Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
#	Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.cpp
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasFileHandling.h
#	Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h
#	Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
#	Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h
#	Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
#	Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Modifier.cpp
#	Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.cpp
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
#	Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
#	Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
2021-12-20 14:42:47 -06:00
tjmgd 7cce6dde41 Hide the invalid parameters in the EnhancedPBR in the Material Editor (#6298)
* Hide the invalid parameters in the EnhancedPBR in the Material Editor

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

* Fixed headers

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-20 14:09:00 -06:00
bosnichd d5b9cf10cf Collection of miscellaneous PAL changes required for restricted platforms. (#6482)
Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-12-20 08:15:10 -07:00
lumberyard-employee-dm 86d22c8bb3 Updated GraphCanvasSystemComponent::OnCatalogLoaded to use
TranslationRequests::Restore

The TranslationDatabase::Restore function will clear out the database
before merging in all the translation .names files making it idempotent.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-12-17 18:32:14 -06:00
lumberyard-employee-dm 20d55c6267 Fixed the translation error messages for GraphCanvas
It was unconditionally logging an AZ_Warning and AZ_Error if a
translation entry with the same key was added to the database.
This didn't account for the same key and value being added to the
database, so loading the same translation file twice would result in
error messages for each entry.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-12-17 18:32:05 -06:00
carlitosan c6eead4efa remove uber build exceptions (#6466)
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-17 15:23:14 -08:00
Tom Hulton-Harrop ddfcccfe2a Add EditorPythonBindings as an explicit dependency of the White Box Tool (#6479)
* add EditorPythonBindings as an explicit dependency of the White Box Tool

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

* add Gem::EditorPythonBindings.Editor as a runtime dependency to White Box Tool Gem

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

* remove redundant target scope

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-12-17 16:24:16 -06:00
carlitosan 9c7a558ccb basic refactor of assets (#6467)
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-17 12:36:05 -08:00
lsemp3d c7c96d8baf Code maintenance, improved OnCatalogLoaded logic and track additions and removals
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-12-16 17:20:37 -08:00
dmcdiarmid-ly 8dc5f9b07c Merge pull request #6461 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16956
Disable DiffuseProbeGridDownsamplePass
2021-12-16 17:39:56 -07:00
carlitosan ae8f724124 Merge pull request #6394 from aws-lumberyard-dev/carlitosan-sc-redcode-asset
redcoding asset handler, holder, tracker, memory asset
2021-12-16 16:29:58 -08:00
Chris Burel f52d49834a [EMotionFX] Prefer #pragma once (#6435)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-12-16 13:42:38 -08:00
Maxim Ivanov 285d92ff0d [AudioSystem] ACE bug fix: Ctrl-S doesn't work correctly when a level is loaded. (#6411)
Signed-off-by: Maxim Ivanov <imginimg@gmail.com>
2021-12-16 14:53:22 -06:00
dmcdiarmid-ly a08881cdf8 Merge branch 'development' into Atom/dmcdiar/ATOM-16956 2021-12-16 13:27:27 -07:00
antonmic ad5f3f0e53 Merge pull request #6439 from aws-lumberyard-dev/Atom/antonmic/ClearPass
Atom/antonmic/clear pass
2021-12-16 12:12:36 -08:00
hershey5045 d7dc257927 Add MainPipeline to pass hierarchy for when HDR color grading component requests for the lut generation's image attachment. (#6436)
Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com>
2021-12-16 12:07:37 -08:00
antonmic 53cf7b462b Changing all ClearPass to SlowClearPass
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-12-16 11:03:20 -08:00
antonmic 2bc381811d addressed PR feedback
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-12-16 10:42:53 -08:00
amzn-sj fc3c5fbd09 [Mac] Fix build error in (#6410)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-12-16 09:43:00 -08:00
Qing Tao 94ddafc7a2 Atom/qingtao/image builder fixes (#6432)
* LYN-8837 o3de Material Editor - Texture Settings Editor - Hangs when converting texture (#6359)

Fixed a editor hanging issue when preview texture with astc format (starts multiple job threads inside a job thread)
Fixed an issue of changing texture setting didn't trigger image re-process.
Fixed an issue with image asset which has texture setting may have dependency with wrong preset
Added a EIF_HDR for source image in hdr format.
Fixed astc compression issue which may wrongly compress image to HDR astc format

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
(cherry picked from commit d9f0a3012d)

* ATOM-16958 [Image Builder] Alpha data would be removed for source image with alpha content (#6412)

Fixed a regression issue with image builder which it can choose proper preset for images with alpha content.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
(cherry picked from commit b640f6d691)
2021-12-16 09:19:44 -08:00
sphrose 195764a427 review changes
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
2021-12-16 15:03:53 +00:00
Tom Hulton-Harrop d065eb9498 Initial improvements to fix viewport icon selection and draw order (#6284)
* wip fixes for entity viewport icons displaying in the correct order and handling selection correctly

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

* add additional comment about z value

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

* move manual sorting and some small tidy-up

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

* update comment

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

* updates following initial round of PR feedback

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

* additional changes to support tests for entity icon intersection

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

* add support to enable/disable icons separately from helpers

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

* final tests added and small tidy-up to display EntityId correctly

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

* update some manipulator test framework calls after utility functions were moved

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

* fix for implicit cast

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

* move icon scale values to AZ_CVARS

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

* fix failing tests caught in AR and update some naming conventions for tests

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

* update naming convention for members of ProjectedViewportRay

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

* update other references to ProjectedViewportRay

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

* update more references to ProjectedViewportRay change

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

* update menus for python tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-12-16 09:35:23 +00:00
carlitosan 73e0bdbe6e fix version deletion error
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-15 21:49:01 -08:00
dmcdiarmid-ly c800b38ef9 Merge branch 'development' into Atom/dmcdiar/ATOM-16956 2021-12-15 21:23:31 -07:00
dmcdiarmid-ly a1be8f832e Build BLAS objects from the BLAS instance list instead of the mesh list
Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
2021-12-15 19:38:39 -07:00
antonmic 18bb69a5cb removed unnecessary lines
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-12-15 18:37:48 -08:00
moudgils fb36145e2e Rte fixes for stability (#6434)
* Fixed SRG updated related crash

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

* Fixed SRG compile issue with metal which leads to multiple gpu crashes inlucde ImGuiPass render crash (#6315)

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>

Co-authored-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-12-15 18:35:17 -08:00
antonmic 0a8ba35738 Added ClearPass and automatic instantiation from ParentPass for slots specifying a clear action
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-12-15 18:32:59 -08:00
tjmgd cf9385fc39 Garbled name when using Chinese charaters (#6379)
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-15 17:42:14 -06:00
Roman 3a4eb3785a small bugfix (#6420)
Signed-off-by: rhhong <rhhong@amazon.com>
2021-12-15 13:21:22 -08:00
rgba16f f82b329291 Minor optimizations from profiling. (#6416)
Remove noisy profile marker in the SRG validator
Make the SRG compile marker say which srg is being compiled
Move some dx12 validation code behind the AZ_RHI_ENABLE_VALIDATION define

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-12-15 15:06:05 -06:00