Commit Graph

10532 Commits

Author SHA1 Message Date
Jeremy Ong 174e27cbfb Merge pull request #6559 from aws-lumberyard-dev/NullVariableInterfaceOptimization
Disambiguate null interface case
2021-12-24 10:33:58 -07:00
Jeremy Ong 6660c365b9 Disambiguate null interface case
In some cases, the interface being queried may be persistently nullptr
(e.g. a gem isn't active, or a feature was disabled by a cvar). In this
case, querying the interface would always enter the writer-lock branch
with existing code because nullptr was synonmous with "we haven't
queried for this variable yet."

This PR adds an additional state variable that is set when s_instance is
assigned to, so that after the variable is queried and found to be null,
future queries can enter the read-lock branch.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-12-23 16:25:44 -07:00
Mike Balfour 3e9b76cdee Image Gradient: Switch to shared_mutex (#6558)
* Improve lock contention by switching to a shared_lock.
ImageGradient is accessed via a many-reader-one-writer pattern, so a shared_lock causes less contention in the common "read" case.

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

* Remove chatty profile marker.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-12-23 14:16:22 -06:00
tjmgd f1a1cb3ec0 Fix: Lua directory empty and always loading in editor (#6207)
* Fix: Lua directory empty and always loading in editor

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

* fixed naming convention errors

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

* Tidy up

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-23 12:12:40 -08:00
tjmgd c2373f1f59 Fix: search results not expanded when searching for .lua files (#6211)
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-23 12:12:27 -08:00
Sean Sweeney 1f31f14e9b Merge pull request #6534 from aws-lumberyard-dev/remove_failing_test
removing outdated remote console test
2021-12-23 10:01:27 -08:00
Mike Balfour 17f928cddd Removed chatty profile markers. (#6556)
* Removed chatty profile markers.
These 4 markers removed tens of thousands of events, which reduced an example capture from 1685 ms to 1614 ms and made it far more readable.

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

* Restored one marker

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-12-23 11:53:17 -06:00
Mike Balfour 227eea2cf6 Restore BusDisconnect() that got accidentally removed on a recent commit. (#6557)
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-12-23 11:53:01 -06:00
Mike Chang ce709b99d0 Development dockerfile for Linux (#6532)
This is the initial Dockerfile used for local development or for remote CI environments for Ubuntu. Build and test instructions are in the Dockerfile comments.

Signed-off-by: Mike Chang <changml@amazon.com>
2021-12-22 14:58:31 -08:00
Michael Pollind 7dac0bac0d chore: remove "using namespace " from AZCore Math (#6372)
* chore: remove "using namespace " from AZCore Math

REF: https://github.com/o3de/o3de/issues/6281

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

* chore: fix formatting

Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-12-22 13:11:41 -08:00
Michael Pollind cb740a3b3e chore: remove "using namespace AZ" from AZCore Script (#6366)
* chore: remove "using namespace AZ" from AZCore Script

REF: https://github.com/o3de/o3de/issues/6281

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

* chore: address changes

Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-12-22 11:51:47 -08:00
tjmgd a6240ff6bc Editor issue after clicking Find Layer in Asset Browser and (#6327)
Find Slice in Asset Browser in Slice mode

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-22 11:51:33 -08: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
tjmgd 254906cd83 The line number displayed by Breakpoints in Lua Editor is 1 larger than (#6299)
the actual line number of the code.

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-22 11:32:40 -08:00
tjmgd 33495e4858 Slice save path incorrect, and error message incomplete (#6214)
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-22 11:32:14 -08:00
tjmgd 7b99b6a1e2 Fix: next and prev tabs incorrectly implemented (#6208)
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:31:49 -08:00
tjmgd 38bbf9659e Fix: jumps disordered (Go to Line,Transpose Lines UP,Transpose Lines (#6210)
Down,Comment Selected Block and UnComment Selected Block)

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 10:54:49 -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
tjmgd 3f766629bc Lua Editor log - text ghosted (#6329)
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
2021-12-22 09:36:34 -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
Michael Pollind 1a26ea439a bugfix[Linux]: resolve Lua script file not found (#6369)
* bugfix: resolve Lua script file not found

REF: https://github.com/o3de/o3de/issues/5899

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

* chore: user lowcase version of assetIdLower

Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-12-22 09:07:42 -08: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
Jeremy Ong 436709b1a8 Merge pull request #6533 from aws-lumberyard-dev/Pix2108Runtime
Fix compile issues blocking adoption of Pix 2108
2021-12-21 15:35:30 -07: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
evanchia 09c041559c removing outdated remote console test
Signed-off-by: evanchia <evanchia@amazon.com>
2021-12-21 13:13:57 -08:00
Jeremy Ong a96387ee35 Fix compile issues blocking adoption of Pix 2108
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-12-21 13:52:20 -07:00
Junbo Liang 44744d95b0 Fix the cmake issue for AWSI automation tests (#6531)
Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
2021-12-21 12:28:54 -08: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
John Jones-Steele 219653a75b Fixes rounding error display in Slider control (#6477)
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2021-12-21 10:43:18 +00: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
dependabot[bot] a4df91b718 Bump pyyaml in /scripts/build/build_node/Platform/Common (#6514)
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.3.1 to 5.4.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](https://github.com/yaml/pyyaml/compare/5.3.1...5.4)

---
updated-dependencies:
- dependency-name: pyyaml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-20 17:38:47 -08:00
Mike Balfour 1845eba6ee Fixed compile error.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-12-20 16:33:36 -06: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 832e78e588 Merge commit 'fc3c5fbd09ed410305cc4f436155850117203701' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:50:21 -06:00
Mike Balfour f49df9c474 Merge commit '94ddafc7a2c5c1987e25bfca845c16d03b35f1fc' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:50:16 -06:00
Mike Balfour ac6f005240 Merge commit 'fb36145e2e1f34574948233aa65eaa97f20e6e67' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:47:27 -06:00
Mike Balfour f23798a10a Merge commit '58b6a9c1acfc4e1344e9d0b79b5572ef173c030c' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:43:30 -06:00
Mike Balfour f6faad4adb Merge commit '2fa10d7e6a99c38d578fe5ed969cfd07c5f0df28' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:43:24 -06:00
Mike Balfour 065a3144fc Merge commit 'a60fba5bec8180ca4859be29d9c37ea0e14300bf' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:43:19 -06:00
Mike Balfour a07534ea51 Merge commit '7e5115114ca9500abf67095acb71fbb6087d06c8' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:43:13 -06:00