Commit Graph

11530 Commits

Author SHA1 Message Date
santorac c2e220ce49 Renamed property 'set' to property 'group' for consistency with the prior naming.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-27 16:11:26 -08:00
santorac 1de540ae3f Updated code to use span instead of array_view as this was replaced on the development branch.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-27 14:48:50 -08:00
santorac b9a80dee32 Fixed newline at end of file.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-27 14:17:09 -08:00
santorac 5e2bf1a468 Reverted changes to most of the material type files. I'll update those in a separate PR.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-27 14:14:50 -08:00
santorac 906db920d0 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes3
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-27 12:58:22 -08:00
Guthrie Adams 09ff46b445 Merge pull request #7177 from aws-lumberyard-dev/Atom/guthadam/atom_tools_move_me_performance_monitor_statusbar_labels_to_atf
Atom Tools: move performance metrics status bar widgets to base window
2022-01-27 14:47:42 -06:00
Scott Romero f7f17c98b4 [development] fixed ambiguous 'byte' type MSVC build error (#7184)
- fully quality 'byte' type in AZStd::span
- remove unnecessary 'using namespace AZStd;' statement from AssetCatalog tests

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2022-01-27 11:12:15 -08:00
greerdv b1492c1fb0 Merge pull request #7199 from aws-lumberyard-dev/nus-component-mode-fix
fix for changes in non-uniform scale component mode not persisting
2022-01-27 15:51:15 +00:00
Chris Galvan 753d15b0f8 Merge pull request #6758 from aws-lumberyard-dev/cgalvan/DraftStreamingImageAssetPixelAPI
Added pixel retrieval API to StreamingImageAsset
2022-01-27 09:32:30 -06:00
greerdv 61b494a3c7 fix for changes in non-uniform scale component mode not persisting
Signed-off-by: greerdv <greerdv@amazon.com>
2022-01-27 13:56:24 +00:00
Benjamin Jillich bbd91755ea EMotion FX: Recent files menu in Animation Editor also shows files from external gems (#7160)
Recent files were only shown from sub-folders of the project and assets from gems (inside project and external) were not visible.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2022-01-27 13:23:39 +01:00
santorac a4346de658 Code cleanup. New comments. Added some non-const find functions to MaterialTypeSourceData. Fixed places where I forgot to change m_name to GetName().
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-26 23:54:25 -08:00
Roman e2c4c0e5e3 Atom viewport render option bugfix (#7158)
* Render option bugfix

Signed-off-by: rhhong <rhhong@amazon.com>

* add aznumeric_cast

Signed-off-by: rhhong <rhhong@amazon.com>
2022-01-26 19:41:38 -08:00
santorac e0cee13747 Code cleanup.
Made PropertyDefinition::m_name private.
Moved code around for a cleaner diff in MaterialTypeSourceData.h.
Added API comments.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-26 18:10:02 -08:00
Guthrie Adams 413ce5a6ab Atom Tools: move performance metrics status bar widgets to base window
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-26 20:05:21 -06:00
Esteban Papp 75d39d9ce5 makes bucket variables atomic (#7179)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-26 17:51:20 -08:00
Mike Chang 5ebe3d12df Add file exists conditional for ebs_snapshot stash command (#7178)
Signed-off-by: Mike Chang <changml@amazon.com>
2022-01-26 17:11:58 -08:00
Chris Galvan f368997deb Modified the passing of span in test
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-26 19:06:57 -06:00
Chris Galvan 2f4ff1072c Merge pull request #7170 from aws-lumberyard-dev/cgalvan/RemovedLegacyEditorConfigSpec
Removed legacy Editor config spec
2022-01-26 19:03:11 -06:00
santorac ed21e97dcd Fixed StringFunc whitespace differences.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-26 16:55:45 -08:00
santorac 68e4970a2d Reverted the new Tokenize function I added, and used TokenizeVisitor instead.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-26 16:47:10 -08:00
mrieggeramzn 50982b8283 Exposing / Unifying the rasterstate depth bias values for all the shadowmap shaders (#7150)
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2022-01-26 16:04:12 -08:00
Chris Galvan f3fa731fef Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/DraftStreamingImageAssetPixelAPI 2022-01-26 16:46:58 -06:00
lumberyard-employee-dm b9824ed172 Updated all array_view uses with the C++20 span. (#7157)
* Updated all array_view uses with the C++20 span.

The updates were done in the following order
1. `AZStd::array_view<([^>].+)\* ?>`  -> `AZStd::span<\1 const>`
2. `AZStd::array_view<(?:const )(.+)>` -> `AZStd::span<const \1>`
3. `AZStd::array_view` -> `AZStd::span`

Removed the implementation of array_view.

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

* Added missing whitespace between `const` and the typename for spans.

Updated the ShaderTest comparison of the ShaderResourceGroupLayout span
to compare the sizes as well

Updated comments on some of the methods that stated that they return "an
array" to mention they return "a span".

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-26 16:15:47 -06:00
santorac 6caeabd961 Merge branch 'Atom/santorac/TokenizeToStringView' into Atom/santorac/RemixableMaterialTypes3
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-26 14:13:17 -08:00
Chris Galvan 0550167f9f Updated API to return false if there is any issue retrieving the data
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-26 16:09:03 -06:00
santorac 048b068c89 Updated StringFunc::Tokenize to support returning a list of string_view instead of string, which should be more efficient. string is still supported as well, but users should prefer the string_view version.
Testing:
Updated unit tests.
Reprocessed Atom material assets.
Ran AtomSampleViewer material screenshot test.
Opened, edited, saved materail in the Material Editor.
Opened a level, edited material property overrides, saved and reloaded.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-26 14:03:12 -08:00
Chris Galvan a4741f98d2 Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/RemovedLegacyEditorConfigSpec 2022-01-26 15:48:03 -06:00
Chris Galvan dbbb9fe6e8 Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/DraftStreamingImageAssetPixelAPI 2022-01-26 15:41:19 -06:00
Chris Galvan c2ae853d95 Fixed python bindings unit test
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-26 15:37:30 -06:00
Chris Galvan 670777f0f2 Moved the pixel value retrieval APIs from StreamingImageAsset to RPIUtils
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-26 15:25:47 -06:00
dependabot[bot] 48cea89910 Bump pywin32 in /scripts/build/build_node/Platform/Common (#7169)
Bumps [pywin32](https://github.com/mhammond/pywin32) from 228 to 301.
- [Release notes](https://github.com/mhammond/pywin32/releases)
- [Changelog](https://github.com/mhammond/pywin32/blob/main/CHANGES.txt)
- [Commits](https://github.com/mhammond/pywin32/commits)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-26 13:22:21 -08:00
dependabot[bot] b9910ac188 Bump rsa from 4.5 to 4.7 in /scripts/build/build_node/Platform/Common (#7168)
Bumps [rsa](https://github.com/sybrenstuvel/python-rsa) from 4.5 to 4.7.
- [Release notes](https://github.com/sybrenstuvel/python-rsa/releases)
- [Changelog](https://github.com/sybrenstuvel/python-rsa/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sybrenstuvel/python-rsa/compare/version-4.5...version-4.7)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-26 13:22:07 -08:00
dependabot[bot] 43219c7ab6 Bump jinja2 in /scripts/build/build_node/Platform/Common (#7167)
Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/2.11.2...2.11.3)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-26 13:21:51 -08:00
santorac aeb43c4012 Fixed up a few small things to get Material Editor working again.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-26 13:04:28 -08:00
Mike Chang 6eec5e1a21 EBS snapshot script (#6978)
Adding snapshot script, modify Jenkinsfile and build_config.json for each platform to use the snapshot tag

Signed-off-by: Mike Chang <changml@amazon.com>
2022-01-26 13:00:46 -08:00
Ken Pruiksma 453808eb90 Clipmap bounds class (#7134)
* ClipmapBounds class - This class is built to keep track of textures for clipmap like structures where there is a virtual center point and the edges need to be updated as the camera moves around the world

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

* Removing dead code

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

* Updates from PR feedback.

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

* comment update

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

* Updates from review suggestions

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

* More updates. Moved the snapped center point calculation out to a separate function so the constructor doesn't need to do unnecessary work.

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

* Removing unused variable.

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

* Fixing bug in unit test that was doing a comparison and throwing away the result instead of actually testing it.

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

* Adding some comments and constifying some functions.

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

* Fixing numeric casting issue on linux

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2022-01-26 14:30:13 -06:00
santorac 9b8bebbd70 Bumped the MaterialBuilder version number.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-26 12:21:43 -08:00
lumberyard-employee-dm 52f1ef84c7 Fixed string_view compilation in GCC 10+. (#7153)
* Fixed string_view compilation in GCC 10+.

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

* More GCC 10+ Fixes.

GCC 11 seems to have an issue with linkage regarding using a lambda as a default parameter in a function declaration.

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

* GCC10+ Fix - Fixed binding to a temporary references.

> error: loop variable ‘pathName’ of type ‘const QString&’ binds to a temporary constructed from type ‘const char* const’ [-Werror=range-loop-construct]
  415 |     for (const QString& pathName : { "CrySystem",

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-26 14:20:01 -06:00
santorac 4312c636af Got the RPI unit tests building and working again after merge. There were some incorrectly resolved conflicts that I had to re-resolve, especially in MaterialTypeSourceData::CreateMaterialTypeAsset.
I removed support for property rename version updates in MaterialTypeSourceData (i.e. ApplyPropertyRenames) because MaterialSourceData serialization no longer loads material property definitions from the .materialtype file, per a recent change on the development branch. The unit tests were broken and it wasn't worth updating them since we don't need this functionality anymore. Material property renames and other version updates are now exclusively applied by the MaterialAsset class.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-26 12:19:49 -08:00
Chris Galvan 8151856e83 Removed legacy Editor config spec
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-26 13:01:30 -06:00
Chris Galvan 7a45aa5bbf Merge pull request #6909 from aws-lumberyard-dev/6116_script_events
Remove error state when user attempts to save empty script event.
2022-01-26 11:29:21 -06:00
Chris Galvan 921c1e2201 Modified GetSubImagePixelValues API to be exclusive with bottom right coordinate, and documented as such
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-26 11:15:37 -06:00
Chris Galvan aa025a5e7d Updated unit tests per PR feedback
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-26 10:48:08 -06:00
lumberyard-employee-dm 62775add6d Implemented Support to allow project's to reference gems via the gem name (#7109)
* Implemented Support to allow project's to reference gems via the gem name

Updated the enable-gem command to add the name of the enabled gem to the "gem_names" array in the project.json
Updated the enable-gem test to validate this functionality

Centralized the CMake logic for locating external subdirectories to the Subdirectories.cmake script

Added an option to the edit-project-properties and edit-engine-properties o3de.py commands to add/remove/replace the "gem_names" field in the project.json and engine.json respectively

Added a CMake function to determine the root CMake "subdirectory" of any input path which is a parent of it.
This logic has been used to improve the installation of external gems to the <install-root>/External directory.

Tested out the install layout before submitting PR

fixes #7108

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

* Fixed the enable-gem test on Linux to resolve the mock path.

Renamed all of the o3de python test from "unit_test*.py" to "test*.py" to faciliate the python unittest module picking up the test automatically.

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

* Adding test for the disable_gem command.

Fixed some typos in engine_properties.py scrip.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-26 10:44:35 -06:00
Chris Galvan 93261022f1 Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/DraftStreamingImageAssetPixelAPI 2022-01-26 10:20:35 -06:00
Esteban Papp d605b5636d Merge pull request #5532 from aws-lumberyard-dev/optimization/unused_files
Optimization: remove unused files
2022-01-26 08:19:08 -08:00
Chris Galvan 7ef9a01d24 Fixed compile issue on Linux
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-26 10:16:31 -06:00
Esteban Papp 75f511d851 Merge pull request #6390 from aws-lumberyard-dev/memory/overrideshim_removal
Memory/overrideshim removal
2022-01-26 08:15:20 -08:00
Danilo Aimini 1a7a350880 Introduce a new Focus Mode API function to retrieve full list of EntityIds that are in focus. (#7159)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-01-26 08:12:34 -08:00