Commit Graph

11018 Commits

Author SHA1 Message Date
Guthrie Adams 5fc40bbbf9 Merge pull request #7016 from aws-lumberyard-dev/Atom/guthadam/atom_tools_streamlining_smc
Atom Tools: Removing unnecessary modules, components, and dead code from SMC
2022-01-21 10:49:33 -06:00
Mike Balfour 145e3646a4 Asset catalog lock inversion fix. (#7045)
* Fix lock inversion.
This method was calling AssetCatalog->AssetManager at the same time that loading threads are calling AssetManager->AssetCatalog, causing a deadlock due to lock inversion. The fix is to make this method call AssetManager *outside* of the AssetCatalog call.

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

* Fixing the root cause in EnumerateAssets.
Also added a unit test that failed with the previous EnumerateAssets logic, and succeeds with the new logic.

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

* Make sure not to hold the secondary mutex lock either.

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

* Remove unused alias.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-01-21 10:34:00 -06:00
Nicholas Lawson 9328f053bd Updates EXPAT to use the latest packages (#7053)
* Update EXPAT to be latest package version

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2022-01-21 08:00:45 -08:00
Nicholas Van Sickle 32e2ba754b Add Dom::Path class for representing positions in a Dom (#7008)
* Add Dom::Path class for representing positions in a Dom

This also adds Value support for doing a path-based lookup.

The serialized representation is presently compliant with the JSON-pointer spec but the implementation supports Node types and may be later expanded if we require additional functionality (e.g. XPath style conditional querying).

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2022-01-20 16:53:33 -08:00
Shirang Jia 858a92f394 Deduplicate Jenkins parameters (#7035)
Signed-off-by: Shirang Jia <shiranj@amazon.com>
2022-01-20 15:47:53 -08:00
dmcdiarmid-ly 5ed7e91a62 Merge pull request #7022 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-17127
NumRaysPerProbe DiffuseProbeGrid setting
2022-01-20 16:14:53 -07:00
Nana Axel bd57a2832b Fix issues when configuring projects and gems (#7001)
The new `o3de_pal_dir` function raise an issue when configuring projects/gems. This commit apply a simple fix to pass parameters as strings.

Signed-off-by: Axel Nana <axel.nana@aliens-group.com>
2022-01-20 16:27:29 -06:00
Guthrie Adams 3977edb21e Atom Tools: Removing unnecessary modules, components, and dead code from SMC
Looking toward creating a bare bones template for a standalone application, simplifying and removing any boilerplate wherever possible. SMC followed patterns established by material editor, subdividing everything into multiple modules, which required manually adding static modules, implementing system components with little to no functionality, and a bunch of unnecessary files for such a simple application. This change deletes unnecessary boilerplate code, moving everything into a single module, making the application class responsible for reflecting classes and buses.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-20 16:05:08 -06:00
Guthrie Adams dd9c4e3f66 Merge pull request #7023 from aws-lumberyard-dev/Atom/guthadam/atom_tools_streamlining_me
Atom Tools: Removing unnecessary modules, components, and dead code from ME
2022-01-20 15:36:22 -06:00
santorac 74c6fa5f94 Merge pull request #7010 from aws-lumberyard-dev/Atom/santorac/MaterialAssetDeferredBaking3
Fixed Material Builder To Avoid Reading Material Type Source File
2022-01-20 13:25:15 -08:00
Chris Galvan 514f0c1546 Merge pull request #6935 from RoddieKieley/issue5299
issue5299: Resolved via change to not disable custom window decorations.
2022-01-20 15:17:37 -06:00
Nicholas Van Sickle 687a3f1092 Merge pull request #7013 from aws-lumberyard-dev/mnaumov/FixingEOOrdering_signofffix
Fixing entity outliner order when creating prefab
2022-01-20 13:09:03 -08:00
Steve Pham 59e43813f0 GCC Support for Linux
Updates and fixes to support GCC for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-20 13:00:02 -08:00
Terry Michaels 3479b6e2d9 Merge pull request #6974 from aws-lumberyard-dev/SJ/TerrainOptimization
[Terrain] Update Terrain components to use the new ProcessRegion API functions
2022-01-20 14:32:02 -06:00
dmcdiarmid-ly 61dc7623d2 Minor change to a comment
Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
2022-01-20 12:41:25 -07:00
santorac f4befb2242 Removed some dead code.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-20 11:39:28 -08:00
amzn-sj 8e08e42c86 Fix some warnings about unused parameters
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-20 11:01:00 -08:00
Chris Galvan 0ae1ab9eea Merge pull request #6441 from pollend/feature/5886-add-unhandled-exception-support
feature: add Exception Handler support for unix
2022-01-20 12:25:02 -06:00
santorac 232876de9e Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialAssetDeferredBaking3 2022-01-20 10:01:16 -08:00
Mikhail Naumov f599a30fae Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/FixingEOOrdering_signofffix
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2022-01-20 11:54:18 -06:00
amzn-sj d6cdd1d053 Update another comment
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-20 09:51:38 -08:00
amzn-sj d8226357f4 Merge
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-20 09:49:44 -08:00
amzn-sj 0a722b5a06 Update comment for clarity
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-20 09:48:15 -08:00
santorac 730daae1e6 Added code comments.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-20 09:33:21 -08:00
amzn-sj 3df7e239ac Fix build error on PC
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-20 09:32:42 -08:00
Chris Galvan 01dfd291a5 Merge pull request #7012 from aws-lumberyard-dev/jckand/DynVegTestFix
Fixing query areas for instance count validation in ShapeIntersectionFilter test
2022-01-20 10:50:23 -06:00
Ignacio Martinez e1b2458591 Asset Browser Collapse All Fix (#6996)
* Added Icon

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed indent in ui file

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
2022-01-20 13:09:00 +00:00
Guthrie Adams c98d14ad92 Atom Tools: Removing unnecessary modules, components, and dead code from ME
• Working toward creating a standalone application template
Removing application level modules and system components that make it difficult to navigate the project and add a lot of boilerplate code
• Temporarily keeping viewport module and components because shutting down the application deactivates module entities before system entities without respecting component service dependency order. This caused several RPI assets and names to leak because they were not being destroyed in the correct order.
• Fixing include paths not referenced source folders
• Mostly cleanup and reorganization, no behavioral changes

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-20 00:10:07 -06:00
Michael Pollind c95845d45b chore: replace isspace
Signed-off-by: Michael Pollind <mpollind@gmail.com>
2022-01-19 20:02:50 -08:00
dmcdiarmid-ly c27f73c66b Added a NumRaysPerProbe DiffuseProbeGrid setting
Added supervariants to the precompiled DiffuseProbeGrid shaders for the NumRaysPerProbe values

Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
2022-01-19 20:17:15 -07:00
amzn-sj 7bba4172ec Add a GetNumSamplesFromRegion function which returns the number of samples given a region and step size. Update Terrain Feature Processor to use this function to get the number of samples instead of computing num samples independently.
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-19 18:04:56 -08:00
AMZN-byrcolin 63d755b8f1 fix launcher not showing gems (#7015)
Signed-off-by: byrcolin <byrcolin@amazon.com>
2022-01-19 17:09:40 -08:00
amzn-sj 4b5f4042f2 Move common code used by multiple tests into functions to reduce code duplication.
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-19 16:05:51 -08:00
Mike Balfour 2b43ad8029 FastNoise GetValues() specialization (#7009)
* Add comparison operator for use from unit tests.

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

* First version of FastNoise benchmarks.

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

* Simplified unit tests and added initial benchmarks.

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

* Add GetValue vs GetValues unit test.

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

* Moved Gradient test code into helper files for use from FastNoise.
Also added benchmarks for each type of FastNoise so that we can have some comparative values handy.

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

* Specialization for GetValues().

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-01-19 17:10:37 -06:00
Chris Galvan 7adccd0d48 Merge pull request #6722 from tjmgd/bug-import-restrictions-95
Fix: only files can be selected
2022-01-19 16:36:29 -06:00
Mikhail Naumov f7c120b4b7 PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2022-01-19 15:15:15 -06:00
jromnoa bcc155049d Merge pull request #6916 from aws-lumberyard-dev/Atom/jromnoa/remove-old-light-component-test
Removes the old log lines test for Light component.
2022-01-19 13:01:36 -08:00
Mikhail Naumov 3506a39759 Merge branch 'mnaumov/FixingEOOrdering' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/FixingEOOrdering_signofffix
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2022-01-19 15:01:21 -06:00
jckand-amzn d223513ffe Updating query areas for instance count validation
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
2022-01-19 15:01:20 -06:00
jckand-amzn 3deac1e420 Merge branch 'development' of https://github.com/o3de/o3de into jckand/DynVegTestFix
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
2022-01-19 14:47:12 -06:00
santorac fbe17b0022 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialAssetDeferredBaking3 2022-01-19 12:30:58 -08:00
santorac b61238e50c Minor fixes to whitespace and comments.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-19 12:30:51 -08:00
Vincent Liu 5cac67bfad Silence aws logging for unit test and have a new AWSNativeSDK as entry point for test env (#6865)
* Silence aws logging for unit test
* Create a new AWSNativeSDK entry point for test environment only
* Update naming for target and file
2022-01-19 12:11:39 -08:00
Karl Berg 57394bc81d Merge pull request #6958 from Bindless-Chicken/fix-imgui-multiplayer
Fix missing ImGui::End in multiplayer windows
2022-01-19 11:53:31 -08:00
Nicholas Van Sickle cfd721bce1 A bit of Generic DOM tidying/fixup (#6914)
* A bit of Generic DOM tidying/fixup

- Refactor out a test fixture for all DOM tests / benchmarks
- Optimize `GetType` implementation to not use `AZStd::variant::visit` (benchmark included to A/B the implementations)
- Tag a few more mutating Value functions with "Mutable" to avoid astonishing copy-on-writes

Benchmark results for GetType implementation:
```
DomValueBenchmark/AzDomValueGetType_UsingVariantIndex              18.2 ns         18.0 ns     40727273 items_per_second=443.667M/s
DomValueBenchmark/AzDomValueGetType_UsingVariantVisit              32.2 ns         32.2 ns     21333333 items_per_second=248.242M/s
```

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2022-01-19 11:52:57 -08:00
dmcdiarmid-ly 8ec07031e3 Merge pull request #6959 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15740
Support supervariants in the PrecompiledShaderBuilder
2022-01-19 12:40:22 -07:00
Mike Balfour 83878e6377 Change GetValues() to take in const positions. (#6987)
* Change GetValues() to take in const positions.
To support this, span needed some template deductions to correctly convert from non-const containers to const ones.

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

* Removed the most problematic template deduction rules.

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

* Remove duplicate validate_iterator methods.
iterator type is a pointer, not a value, so "const iterator" and "const const_iterator" produce the same function signature.

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

* Fixed the span types.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-01-19 12:57:52 -06:00
Junbo Liang ca56770655 [AWSMetrics] Update the auto-generated code to follow O3DE coding standard (#6910)
* [AWSMetrics] Update the auto-generated code to follow O3DE coding standard

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
2022-01-19 10:50:56 -08:00
jckand-amzn 89e2836110 Merge branch 'development' of https://github.com/o3de/o3de into jckand/DynVegTestFix
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
2022-01-19 11:54:21 -06:00
Danilo Aimini a63ea12a1f System shortcuts crash the Editor when Global Preferences are open (#6994)
* Changes to the keyPressEvent override of the Editor Preferences Dialog to prevent infinite loops on focus switches.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Renaming function to clarify its purpose.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-01-19 09:52:27 -08:00