Commit Graph

6383 Commits

Author SHA1 Message Date
jckand-amzn 789d5904da More test filename cleanup/re-org and enabled existing tests alongside optimized tests
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 18:18:19 -05:00
jckand-amzn cb1d680a56 Removing sandbox tests from main suite
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:43:16 -05:00
jckand-amzn 2f8d029832 Moving 2 tests to sandbox that are intermittently failing on Jenkins but passing locally
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:35:11 -05:00
jckand-amzn 4458a245d1 Adding xfail marker to test run, and updating CMakeLists to point to the optimized test file
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:19:01 -05:00
jckand-amzn fb39aa5b86 Removing old test files
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:14:15 -05:00
jckand-amzn b466788cc4 Updating editor_test.py to allow for per-test null_renderer overrides
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:10:36 -05:00
jckand-amzn 8c1ab46901 Removing unneeded periodic suite test file
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:02:01 -05:00
jckand-amzn fc44063a0a Renaming test files for standardization. Keeping old, unoptimized files temporarily.
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:00:45 -05:00
jckand-amzn b2a9908a5c Merge branch 'development' of https://github.com/o3de/o3de into jckand/EditorAutomationOptimization 2021-08-24 14:48:29 -05:00
Ken Pruiksma ef5b49fc2b Adjust the sharpness of TAA's Catmull-Rom filter based on local area luminance (#3400)
* Adjust the sharpness of TAA's Catmull-Rom filter based on local area luminance.
This helps prevent ringing artifacts in high contrast areas. Due to Catmull-Rom's use of negative weights, it's possible to have a very high value neighbor sample with a negative weight completely overwhelm the result leading to a negative output. This change reduces the sharpness of the catmull rom filter in high contrast areas so the negative weights contribute less to the final result.

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

* PR review feedback fixes - more comments and updated the way the sharpness equation was written for clarity.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-08-24 15:10:39 -04:00
AMZN-AlexOteiza 426ba2f4a6 Added conversion of physics tests using new optimizations. Fixed issue on editor test framework to close the AP correctly (#3145)
* Commit

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Removed xfail

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Fix for ap not closing for optimized tests

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* renamed tests to _Optimized

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Added xfail so the test will run in jenkins without affecting outcomes

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
2021-08-24 20:54:48 +02:00
carlitosan 4e0399b283 Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
JSON serialization of SC Editor Assets
2021-08-24 11:45:18 -07:00
Mike Balfour 40f41689ee Initial Terrain System (#3401)
This represents the very beginnings of the Terrain System presented in Sig-Content RFC 4 ( https://github.com/o3de/sig-content/blob/main/rfcs/rfc-4-terrain-system.md ). There is some basic working functionality in this PR, but the system as a whole should not be considered working yet. The gem is disabled by default in all projects.

All of the code below is contained in the Terrain Gem, which is disabled by default. The following components exist and can be experimented with, but should not be expected to be functionally complete yet:

Terrain World - level component for enabling terrain
Terrain World Debugger - level component for enabling terrain debugging features
Terrain Layer Spawner - component for defining a region of terrain
Terrain Height Gradient List - component for defining a list of gradients to use as terrain heights

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-08-24 13:29:50 -05:00
Sean Sweeney f9c2dd62f7 Merge pull request #3363 from aws-lumberyard-dev/remote_console_fix
Adds a verification response for the remote console connecting
2021-08-24 11:12:30 -07:00
Shirang Jia ce85bb3b7d Add awsi deployment as a non-blocking step in nightly pipeline (#3397)
* Add awsi deployment as a non-blocking step in nightly pipeline

* Make step fail if it's not a non-blocking step
2021-08-24 10:43:17 -07:00
AMZN-koppersr 0d74d3ed5d Merge pull request #3377 from aws-lumberyard-dev/mnaumov/LYN-4539
Allowing prefabs with missing components to load, and clarifying error message
2021-08-24 10:42:40 -07:00
Esteban Papp cd9621f16e Remove unnecessary ALIGN macros 2021-08-24 10:35:14 -07:00
SergeyAMZN de4f2fc629 Merge pull request #3411 from aws-lumberyard-dev/MPWeaponSQ2
Added a helper function for constructing CollisionGroup from CollisionGroups::Id. Removed remaining touch bending related code
2021-08-24 18:23:42 +01:00
jckand-amzn bfbfdabef9 Merge branch 'development' of https://github.com/o3de/o3de into jckand/EditorAutomationOptimization 2021-08-24 11:48:15 -05:00
jckand-amzn 871cb6761e More Editor automation conversions to TestAutomationBase
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 11:47:46 -05:00
Mikhail Naumov 6c1ae1e618 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-24 09:45:01 -07:00
Guthrie Adams 6bb29f9715 Merge pull request #3125 from ppinfel/development
Corrected audio component links to documentation
2021-08-24 10:45:11 -05:00
Guthrie Adams 701e36f493 Merge pull request #2752 from greenrazer/ExposeLodControls
Expose lod controls
2021-08-24 10:41:24 -05:00
Guthrie Adams 660caf6557 Merge pull request #3381 from aws-lumberyard-dev/Atom/guthadam/atomtools_document_main_window_base_class
AtomTools: moved remaining document and window common code from ME and SMC to base class
2021-08-24 10:38:11 -05:00
Esteban Papp a901a41b3a Merge branch 'development' into cmake/remove_align_macros
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-24 08:27:07 -07:00
hultonha 8c573979a9 Updates to camera tests to support different delta times and some further tidy-up (#3324)
* updates to camera tests to support different delta times and some further tidy-up

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* support variable delta time in mouse move test

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-24 16:25:08 +01:00
pereslav 21605f15cc CR Feedback addressing
Signed-off-by: pereslav <pereslav@amazon.com>
2021-08-24 16:00:00 +01:00
amzn-sean ef9666cb10 fixed case where the Physics Asset could not be set correctly (#3390)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-08-24 13:43:19 +01:00
pereslav 7d4f8e4281 Added a helper function for constructing CollisionGroup from CollisionGroups::Id. Removed remaining touch bending related code
Signed-off-by: pereslav <pereslav@amazon.com>
2021-08-24 13:39:54 +01:00
Mikhail Naumov 90912759f7 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-23 17:08:00 -07:00
Esteban Papp b820c36c80 clang is more specific where the modifier should be
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 16:17:10 -07:00
Mike Chang a92684c0b8 Jenkinsfile LFS fix for iOS/Mac pulls (#3396)
* Add git lfs install and pull into Jenkins Git pull stage

Signed-off-by: Mike Chang <changml@amazon.com>
2021-08-23 16:07:02 -07:00
chcurran 794c22c02e merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-23 16:02:58 -07:00
evanchia eabd963e28 Fixed comment in remote console unit test
Signed-off-by: evanchia <evanchia@amazon.com>
2021-08-23 16:00:23 -07:00
chcurran 13188f8958 Simplify codegen of baseclass
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-23 15:56:45 -07:00
AMZN-Phil 5a3c289fac Merge pull request #2882 from aws-lumberyard-dev/Prism/RemoveTabFocus
Change Focus From Tabs in o3de.exe, Refactor Project Page Create, Sort Projects Alphabetically
2021-08-23 15:49:12 -07:00
santorac 60d137c5b6 Merge pull request #2746 from aws-lumberyard-dev/Atom/santorac/OptionalSceneApiMaterialConversion3
Made Model Material Conversion Optional

Added a new registry setting that disables automatic conversion of materials from model files like FBX.

By default, processing of model files (like FBX) automatically convert the included materials to Atom materials, using StandardPBR. This adds a job dependency on StandardPBR.materialtype, which propagates to any related azsl files as well. Thus any change to azsl code will cause all model files in the project to rebuild.

Some game teams have no interest in using the auto-converted materials; they always use a Material Component to apply material overrides for every mesh. This new setting allows teams to disable material auto-conversion for the entire project, thus removing the job dependency on StandardPBR.materialtype. Instead, every mesh will be assigned the same default material. Any change to azsl code will cause that one default material to rebuild, but this will not trigger any models to rebuild.

Details:
- Added /O3DE/SceneAPI/MaterialConverter registry settings for configuring the scene material converter. It includes an enable flag, and a default material to use when conversion is disabled.
- Added SceneBuilderDependencyRequests::AddFingerprintInfo which allows SceneAPI components to modify the scene builder analysis fingerprint. We use this to reprocess scene files when the material converter settings change.
- Updated SceneAPI's material asset builder to skip the StandardPBR dependency when material conversion is disabled.
- Added some code to MaterialComponentController to handle an edge case that may when disabling material conversion on an existing project, and assigned materials disappear.

Testing:
- Changing the registry setting does trigger a rebuild of the fbx files.
- When material conversion is disabled, changing an azsl file does not cause fbx files to rebuild, but the shader still reloads as expected.
- Made a test level using multiple models with multiple meshes, made various adjustments to the material slots for each mesh, and tried switching the material conversion registry setting from true to false. (Details below)
- Merged this change to a customer's fork and tested on their existing content.

Details about my test level:
- Made a new test level AtomTest project
- Added two entities, both using multi-mat_mesh-groups_1m_cubes.fbx
- Added a material component to both entities
  - Entity 1 material assignments
    - Blue_Zaxis: left as-is
    - Green_Yaxis: exported the material
    - Red_Xaxis: exported the material, and changed the material instance color to pink
    - StingrayPBS1: exported the material, scaled the UVs in the exported material source, and changed the material instance color to green.
    - With_Texture: selected an existing brick material, changed the material instance color to red.
  - Entity 2 material assignments
    - Default Material: set to an existing brick material
    - Blue_Zaxis: manually assigned built-in material that was converted from fbx
    - Green_Yaxis: manually assigned built-in material that was converted from fbx, and changed the material instance color to orange
2021-08-23 15:24:21 -07:00
Luis Sempé 6ab776a3a6 Merge pull request #3354 from aws-lumberyard-dev/scripting/autogenfixes
Fixed categories not being properly applied for Nodeables & removed old code generator tags

> LG, I guess old NodeableCodegen definitions have all been migrated to new xml format file?

correct
2021-08-23 15:09:57 -07:00
chcurran 95a812b238 fixup codegen, remove android errors
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-23 15:07:42 -07:00
Mike Balfour 97a053a540 Initial stub terrain gem (#3368)
This is the initial Terrain Gem. In this PR, it doesn't do anything, but it contains all of the initial code, icons, and build scripts for the gem to compile and build successfully. The follow-up PR will contain the first round of functioning code.

Also, with the creation of the gem, the TerrainSurfaceDataSystemComponent is getting relocated from the SurfaceData Gem to the Terrain Gem. This should have no impact, as that component has provided no active functionality in o3de. (It will start working again with the initial terrain system code in the next PR)

This also adds a couple of null guards to prefab code to prevent AP crashes, and fixed an incorrect service dependency in the VegetationSystemComponent that was exposed by moving the TerrainSurfaceDataSystemComponent.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-08-23 15:41:57 -05:00
Mikhail Naumov f7eaa4490f fixing syntax errors
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-23 13:40:01 -07:00
AMZN-Phil ea5bfe0269 Merge pull request #3389 from aws-lumberyard-dev/Prism/UseGemDisplayNames
Improves Gem Catalog Search, Gem Display Names now used in Gem Catalog
2021-08-23 13:37:34 -07:00
William Hayward d45ec58cd7 Merge pull request #3323 from aws-lumberyard-dev/readme-updates
Readme updates
2021-08-23 16:25:42 -04:00
Jacob Hilliard 246621fda5 Visualizer: finish deserialization of captures (#3293)
* Visualizer: Initial capture loading support

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: Deserialize thread id

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: Quality of life improvements throughout

- Decrease row size for more information onscreen
- Remove fudge factors in drawing logic
- Add comments to deserialization logic
- Fix Editor text scaling bug
- Early out for data culling to avoid erase_if call

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-08-23 13:14:00 -07:00
michabr 89cc27fdef Fix input priority conflict with LyShine and ImGuiPass (#3329)
* Fix input priority conflict with LyShine and ImGuiPass

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

* Add GetPriorityDebugUI() input listener priority

Signed-off-by: abrmich <abrmich@amazon.com>
2021-08-23 13:05:19 -07:00
Mikhail Naumov f224d657be Ronald's feedback
Co-authored-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-23 13:02:12 -07:00
Mikhail Naumov 875918deda Allowing prebas with missing components to load, and clarifying error message
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-23 12:59:13 -07:00
santorac b6dfb86007 Removed unnecessary #include
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-23 12:53:33 -07:00
santorac de932c62b3 Reverted changes in MaterialComponentController for an obsucre edge case. We'll handle the case of missing material assets more generally as a separate task.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-23 12:50:11 -07:00
Kyle B dfc5baae34 fixed casting errors
Signed-off-by: Kyle B <kylebirnbaum@gmail.com>
2021-08-23 12:46:00 -07:00