Commit Graph

615 Commits

Author SHA1 Message Date
santorac cef1e200f6 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent 2021-10-22 16:42:09 -07:00
jromnoa 267d690171 Merge pull request #4770 from aws-lumberyard-dev/Atom/scottmur/Atom-16561
AtomComponentProperties class for atom_constants to store property paths and other constant values
2021-10-22 11:56:22 -07:00
santorac 0972c4f1a3 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent 2021-10-22 09:27:24 -07:00
allisaurus 136788bccf Update env var setting instructions in AWS Gem test README (#4791)
Signed-off-by: Stanko <stankoa@amazon.com>
2021-10-22 08:53:40 -07:00
santorac c6b209ace0 Made material property auto-rename procedure apply to Material Component at runtime. This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure.
I added an ApplyPropertyRenames function to MaterialTypeAsset very similar to the one in MaterialTypeSourceData.
Updated the MaterialAssignment class to apply any property renames when it discovers the old name doesn't work. This will be written to disk when the level or prefab is saved.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-10-21 23:18:08 -07:00
jromnoa 6c1b2fa84c Merge pull request #4883 from aws-lumberyard-dev/Atom/jromnoa/fix-atom-testsuite-main-gpu-AR-logs
Fix log lines in main GPU tests for Atom
2021-10-21 14:43:30 -07:00
AMZN-AlexOteiza ea442b80d1 Renamed ctest_pytest.ini to pytest.ini so it is used by default, added TestSuite_ as collection file (#4822)
* Fixed warnings of unused marks, renamed ctest_pytest.ini to pytest.ini to better consistency on runs

* Fixed some test suites to run propertly

* Fix missing arguments

* Fixed missing cmakelists and renamed missing file

* Temp disable editor_testing_tests as timeout in jenkins
2021-10-21 22:03:18 +01:00
jromnoa 94f54e8586 re-add the 'Captured data successfully.' log line to test_AtomFeatureIntegrationBenchmark() test, removed on accident
Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-10-21 12:52:05 -07:00
jromnoa 3fc32675fd removes general.log() checks for pass/fail status as these do not appear in AR and only appear locally
Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-10-21 12:39:09 -07:00
chiyenteng 7316802941 Add Detach and Duplicate Prefab basic workflow auto test (#4506)
- Add a new automated test PrefabBasicWorkflow_CreateReparentAndDetachPrefab for verifying prefab detachment basic workflow.
- Add a new automated test PrefabBasicWorkflow_CreateAndDuplicatePrefab for verifying prefab detachment basic workflow.
- Fix a bug related to sets of entity ids in Reparent helper function .
2021-10-21 12:08:00 -07:00
jckand-amzn 3a6cc2498b Skipping GraphUpdate test due to LC node issue in Debug configuration (#4847)
* Skipping GraphUpdate test due to LC node issue in Debug configuration

Signed-off-by: jckand-amzn <jckand@amazon.com>

* Reverting test type for GraphUpdates test to EditorSharedTest

Signed-off-by: jckand-amzn <jckand@amazon.com>

* Updating xfail reason for GraphUpdates test with GitHub issue link

Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-10-21 09:16:48 -07:00
Scott Murray 0c7e732527 removing return type Union which is not supported
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-20 14:20:49 -07:00
Scott Murray 2c0e78cb0d more development freshening
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-20 13:30:56 -07:00
Sean Sweeney 26f23cc3a5 Merge pull request #4836 from aws-lumberyard-dev/flakytest
Moved atom flaky tests to sandbox
2021-10-20 13:21:59 -07:00
AMZN-AlexOteiza af27906598 Moved atom flaky tests to sandbox 2021-10-20 20:00:53 +01:00
Scott Murray eb41ec5978 bringing in latest development
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-20 11:24:32 -07:00
LesaelR 67532ed18f Updating FBX_Tests and test asset files (#4477)
* Updating FBX_Tests and test asset files

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

* Updating fbx_tests to removed marker from helper function.

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

* Update to add Motion Test to FBX Tests.

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

* Update fbx_tests.py

Removing unnecessary sandbox mark.

Signed-off-by: LesaelR <LesaelR@amazon.com>
2021-10-20 13:12:38 -05:00
AMZN-AlexOteiza 7ccde16b0d Rename prefab -> Prefab (#4825)
* Rename part 1

* Rename part 2

* Rename part 3
2021-10-20 18:50:47 +01:00
AMZN-AlexOteiza 181d12625f Reorganized Prefab tests and standarization (#4786)
* Reorganized Prefab tests and standarization

* Restore changed file by accident
2021-10-20 16:16:04 +01:00
AMZN-AlexOteiza 38f9dcb8ca Added option to reopen if the current level is the same. This contributes to stability for batched tests (#4043)
* Added option to reopen if the current level is the same. This contributes to stability for batched tests

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments

* Addressed PR and cleaned Base level that had an entity by accident

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Cleaned up params

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments
2021-10-20 14:55:20 +01:00
Scott Murray 5bc334be70 updating docstrings for formatting and typos
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-19 11:21:00 -07:00
AMZN-ScottR 1b1ef46d9d Merge branch 'development' into atom_cpu_profiler_gem_promotion
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-19 10:58:35 -07:00
jonawals 0031016548 Merge pull request #4785 from aws-lumberyard-dev/pytest_editor_testcase_name_fix
Fix for PyTest editor test case names.
2021-10-19 16:13:56 +01:00
amzn-sean 82b731b673 Increase the timeout for ForceRegion_LinearDampingForceOnRigidBodies. (#4784)
The Test runs with a wait_for_condition, and the original timeout was right on the edge of how long the test takes to reach that condition.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-10-19 13:59:00 +01:00
John ae6005545e Fix for PyTest editor test case names.
Signed-off-by: John <jonawals@amazon.com>
2021-10-19 13:23:23 +01:00
Scott Murray 9f7c80ce23 removing an extra blank line and fixing a docstring
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-18 16:30:01 -07:00
Scott Murray 5b70b2a8a9 reordering constant and class in file
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-18 14:37:57 -07:00
Scott Murray 268b9da857 atom constant component property class
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-18 14:21:34 -07:00
evanchia bc479a362f removing remote console smoke test
Signed-off-by: evanchia <evanchia@amazon.com>
2021-10-18 13:39:21 -07:00
Allen Jackson fbedd8126d {lyn7251} Add material component example in Python (#4724)
* {lyn7251} Add material component example in Python

adds a AZ::Render::EditorMaterialComponent as an example of how to
override the default material from the scene building pipeline

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Only set the cube to a gray material
Skip loading the asset, instead just set the outPrefabAssetPath for the Prefab system to load

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* stablizing the sub-id of procedural prefab groups

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-10-18 12:48:38 -05:00
moraaar 7a450d02cb Deleted PhysXSamples gem (#4753)
Removing PhysXSamples gem since its assets are outdated generating issues:

- Uses old material file format .mtl
- All FBXs info assets (.fbx.assetinfo) were generated before Assimp and the mesh unification work.
- All script canvas were created before new Physics API, which reflected events differently as AZ::Events.
- It heavily depends on slices (legacy system)

sig/core approved this removal at 15-OCT/2021 meeting: https://github.com/o3de/sig-core/blob/main/meetings/notes/SIG-Core-Notes%20-%202021-OCT-15.md

Signed-off-by: moraaar moraaar@amazon.com
2021-10-18 12:53:16 +01:00
AMZN-ScottR 15cbea28c2 [atom_cpu_profiler_gem_promotion] registered new Profiler gem with engine and the AutomatedTesting project
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-15 19:22:26 -07:00
smurly d1d4bf812e P0 PostFX Gradient Weight Modifier component parallel test automation (#4709)
* PostFX Gradient Weight Modifiere component P0 parallel test

Signed-off-by: Scott Murray <scottmur@amazon.com>

* fixing some comment step numbering

Signed-off-by: Scott Murray <scottmur@amazon.com>

* fixing PostFX casing and method camel casing of the test function

Signed-off-by: Scott Murray <scottmur@amazon.com>

* changing the casing of the file name

Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-15 09:18:46 -07:00
amzn-mike 969a55170e Procedural Prefabs: Entity parenting fixes (#4669)
* Parent top level entities to container entity when creating prefab

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add to_json method to PythonProxyObject to allow serializing any AZ serialializable type

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update scene_mesh_to_prefab.py to parent entities in a chain

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove redundant eval

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Improve error handling in ToJson

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add maybe_unused for commonRoot since it's not used

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-10-15 07:33:01 -05:00
Tommy Walton 2dd00e2983 Move wrinkle mask data out of default object srg (#4578)
* Refactored depth, shadow, and motion vector shaders to support custom object srgs. Added a new skin object srg and moved wrinklemask data out of the default object srg. Added a new minimal morph target asset for testing wrinkle masks to AutomatedTesting.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Fix copyright header

Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-10-14 08:58:50 -07:00
Guthrie Adams f30965eed9 Merge pull request #4641 from aws-lumberyard-dev/Atom/scottmur/Atom-16573
PostFX Shape Weight Modifier component P0 parallel tests
2021-10-14 10:14:28 -05:00
jromnoa 922a991443 change expected_lines to something that appears in both AR + locally (#4680)
Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-10-14 00:15:29 -04:00
Scott Murray 408e27e0f1 wait_for_condition added and merged development
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-13 15:01:58 -07:00
Scott Murray 718fc97bb6 changes from review feedback
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-13 12:57:31 -07:00
jromnoa 150060441e Re-add pytest.mark.test_case_id markers (#4621)
* add some test case id markers

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

* re-added pytest.mark.test_case_id markers for test cases

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

* re-add directional light log lines that were missing and re-add directional light test case id

Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-10-13 09:50:44 -07:00
amzn-sean 5bf7330f35 made some physX tests less flaky (#4632)
Joints_BallLeadFollowerCollide - changed the idle_wait to a wait_for_condition of the lead and follower colliding with a 10 second timeout. It was a 2 second timeout which is on the edge of the time from start to collision (~1.5sec).

Joints_HingeNoLimitsConstrained - now measures the angle the joint is at and waits for the follower to raise up and over the lead, or fail after a 10sec timeout. This use to 'catch' the follower joint in a force region and check the position of the follower to determine pass/fail.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-10-13 12:50:11 +01:00
Artur K 80db67e90a Remove many unused variables and unused setting files (#4607)
* Remove many unused variables and unused setting files

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove a few more dead config vars

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* fix android test_ConfigureSettings_DefaultValues_SetsValues

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-10-12 17:06:15 -05:00
Sean Sweeney 960e3fc1b9 Merge pull request #4427 from aws-lumberyard-dev/sample_editor_for_qa_automation
Sample Editor test for QA Automation project
2021-10-12 14:08:01 -07:00
Scott Murray c35b0e5efa fix a test string to indicate PostFX Layer
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-12 13:46:02 -07:00
Scott Murray 4c5906a8d4 PostFX Shape Weight Modifier component P0 parallel test
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-12 13:21:55 -07:00
smurly 7fcaeb16c4 PostFX Layer component P0 parallel test (#4619)
* PostFX Layer component P0 parallel test

Signed-off-by: Scott Murray <scottmur@amazon.com>

* removing an unused import

Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-12 14:23:29 -04:00
Terry Michaels ff14c2d991 Merge pull request #4471 from aws-lumberyard-dev/jckand/LCXfailUpdate
Removing xfail from optimized Landscape Canvas suite and disabling non-optimized suites
2021-10-12 12:24:00 -05:00
Qing Tao 01448c5c49 ATOM-16658 Remove PBSreferenceMaterials gem which is a gem for legacy cry3dengine (#4616)
Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-12 09:11:50 -07:00
jckand-amzn 52ced4a4ee Merge branch 'development' of https://github.com/o3de/o3de into jckand/LCXfailUpdate 2021-10-11 18:29:39 -05:00
smurly 9dee92a708 Mateiral component P0 tests editor script (#4585)
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-11 16:09:11 -07:00