Commit Graph

738 Commits

Author SHA1 Message Date
rgba16f bc40dd7e5e Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-23 18:35:18 -05:00
evanchia-ly-sdets 4abe63e046 Merge pull request #289 from aws-lumberyard-dev/test_metrics_build_config
Adding test metrics field to build config file
2021-04-23 15:54:12 -07:00
Guthrie Adams fb26308a26 Merge pull request #291 from aws-lumberyard-dev/Atom/guthadam/ATOM-15326
ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
2021-04-23 17:39:27 -05:00
Mike Balfour b1920182ad Merge pull request #293 from aws-lumberyard-dev/mbalfour/lyn-3265
[LYN-3265] Vegetation broken in launcher because it needed more RedCode
2021-04-23 16:41:41 -05:00
Esteban Papp 5d13ad963a SPEC-6437 Dlls should go to bin instead of profile (#287)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed

* putting dlls/exe in the right place, with the right output subdirectory

* setting runtime dependencies for the dlls that we link against

* singular target location

* code review comments/fixes

* Fixing identation
2021-04-23 14:41:18 -07:00
evanchia-ly-sdets d04057d2a6 Merge pull request #285 from aws-lumberyard-dev/minor_readme_update
Minor update to readme file for editor python test tools
2021-04-23 14:19:37 -07:00
AMZN-tpeng 0071e783a4 Merge pull request #259 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-15175
Atom/tonypeng/atom 15175
2021-04-23 14:09:06 -07:00
evanchia 06dd4e9378 adding containsKey() in jenkinsfile 2021-04-23 14:01:18 -07:00
evanchia 3ac0008bc2 fixing jenkinsfile to use containsKey() 2021-04-23 13:59:11 -07:00
evanchia 9abd112a7e chaged boolean type to string 2021-04-23 13:42:55 -07:00
Aaron Ruiz Mora 45fbc86d2d Fix cloth with MeshOptimization ON
- Reexport cloth assets with AssImp ON. These was necessary because AssImp collects a different name for the color streams than FbxSDK and therefore they needed to be reassigned in the cloth rule.
- Adding '_optimized' string to a global variable and using StringFunc RChop to remove it for a string.
2021-04-23 21:42:17 +01:00
Esteban Papp 2d02839c9d Repository cleanup (#288) 2021-04-23 13:19:58 -07:00
mbalfour 9b8aed1852 [LYN-3265] Vegetation failed to display in the launcher because we hadn't deleted enough legacy code out of the system yet.
The actual bug was the "if (!m_engine)" early-out in CreateInstanceNode that needed to be removed, but all the rest of this legacy-based merged mesh code was ripe for removal as well.
2021-04-23 14:56:29 -05:00
Chris Burel 01c04367e9 Include Meshes in all Actor assets in the AutomatedTesting project (#182) 2021-04-23 12:13:08 -07:00
Chris Burel 61fe298319 Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
Ken Pruiksma 256eb0d49e Merge pull request #275 from aws-lumberyard-dev/pruiksma/ATOM-15316
ATOM-15316 Fixing crash in disk light delegate drawing aux geom.
2021-04-23 14:03:20 -05:00
Aaron Ruiz Mora 5fd8c35878 Fixing cloth working with Actors by reading directly from ModelAsset instead from EMFX Mesh. (#235)
- Fixing cloth working with Actors by reading directly from ModelAsset instead from EMFX Mesh.
- Actor caches map from joint indices in skin metadata to skeleton indices so they can be query later.
- Actor cloth skinning reads indices and weights from Model Asset instead from EMFX Mesh.
- Actor cloth skinning with unlimited skinning bones.
- Sort out cloth unit tests by disabling them until there is a way to create an Atom mesh
- Addressing feedback.
2021-04-23 19:46:57 +01:00
Peng 176f7fdef2 ATOM-15175 put back include vkvalidation cmake file again 2021-04-23 11:37:09 -07:00
Vincent Liu a4e1abf6df [LYN-2470] Integrate resource mapping tool with engine python environment (#17)
1. Add support to use engine python runtime environment. Ideally we should use project executable directory which contains required qt binaries after build. But currently Qt plugins are not put under proper subdirectory which causes huge overhead of loading plugin binaries (see details in this jira https://jira.agscollab.com/browse/LYN-2669 ). The temporary solution is to use AWSCore.Editor target to create a subdirectory for our use case.   
2. **Minor Fix** After migrating to engine python environment, see boto3 warning while using debug mode, seems like a existing issue for a long time https://github.com/boto/boto3/issues/454. Register a after call event to close connection   
3. **Minor Fix** After migrating to engine python environment, see Qt multithread warning while using debug mode, change direct setter function call to qt signal
2021-04-23 11:34:37 -07:00
evanchia 4d88cab139 Adding test metrics field to build config file 2021-04-23 11:32:44 -07:00
evanchia c7dbabcfb4 modifying LyTestTools README 2021-04-23 11:31:01 -07:00
amzn-mike 16ca036ea8 Merge pull request #256 from aws-lumberyard-dev/amzn-mike/lyn-2249-disable-cancel
Disable Asset Load Cancellation
2021-04-23 13:10:56 -05:00
guthadam 923f234d71 ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
This change adds support for streaming image thumbnails in the asset browser tree and thumbnail widget.

This is a prerequisite for displaying image previews inside of the material inspector.

https://jira.agscollab.com/browse/ATOM-15326

https://jira.agscollab.com/browse/ATOM-14003
2021-04-23 13:07:20 -05:00
mrieggeramzn 0629e20b35 Merge pull request #269 from aws-lumberyard-dev/Atom/mriegger/LCR
Removing unneeded function
2021-04-23 11:05:03 -07:00
Scott Romero 59ccaa9495 LYN-2421: Initial CPackIFW support for Windows
Merge pull request #224 from aws-lumberyard-dev/cpack_installer
2021-04-23 10:48:09 -07:00
evanchia bd19a6450f Minor update to readme file for editor python test tools 2021-04-23 10:44:55 -07:00
evanchia-ly-sdets 9b36b70df2 Merge pull request #282 from aws-lumberyard-dev/gitignore_python_packages
updating gitignore for python packages
2021-04-23 10:33:43 -07:00
Benjamin Jillich 9bbcc7ec68 [LYN-3252] EMotion FX: Morph target buffer only found on first Atom mesh (#280)
We were using the first Atom mesh to check for morph target buffers by getting access to the buffer asset from the buffer asset view. This won't work for models with multiple meshes while the first mesh is not morphed.
2021-04-23 19:11:43 +02:00
rhongAMZ 6583178a4c EMotionFX: Removing the Motions after corresponding Motionset is removed from the active Animgraph crashes the Editor (#276)
LYN-3200 EMotionFX: Removing the Motions after corresponding Motionset is removed from the active Animgraph crashes the Editor
2021-04-23 09:54:09 -07:00
Nicholas Van Sickle 3eaa749191 Merge pull request #277 from aws-lumberyard-dev/nvsickle/MoreMainFixes
Cherry-pick several 1.0 viewport fixes to main
2021-04-23 09:50:07 -07:00
Chris Burel eb12687933 Fix Atom test that expects file to not end with a newline 2021-04-23 09:43:46 -07:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
Esteban Papp 1c13b301fe SPEC-5070 Move ctest_scripts to scripts/ctest
* removing unused function and moving ctest_scripts to scripts/ctest

* Re-adding ebp-test

* Fixing typo that is making this test run in parallel with other tests

* Fixing hang when parameters are passed

* passing absolute path as a project

* small tweak to not print out during Python execution

* Moving the timeout to be in the build step

* Disable ebo_sanity_smoke_no_gpu

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-04-23 09:43:11 -07:00
Benjamin Jillich 0fa00a117c [ATOM-14477] Add clone function to model and/or model asset (#135)
* Added clone methods for the buffer, model lod and model assets.
* Cloning works via the creators.
* Mesh handle/instance now knows about the model asset it originated from as well as the cloned model asset that we need for instancing until instancing works without the dependencies to the asset ids.
* MeshComponentRequestBus returns the original asset id and the model asset. If you need access to the clone, go by the model.
* Cloth component mesh now gettings its model asset from the model as it needs to work on the clone.
* Moved the requires cloning function from the mesh loader in the mesh feature processor to the mesh component controller.
* As we need the model asset to be loaded before we can check if it requires cloning or not, we couldn't pass in a bool from the controller but had to use a callback.
* Using asset hint instead of asset id for the model lod asset creator error.
* Storing a map of source buffer asset ids and the actual cloned buffer assets rather than just their ids.
* Using the buffer assets from the new map directly and removed the search process in the mesh loop where the asset views are created.
* Fixed the vegetation mocks.
* Using the actor's mesh asset when emitting the on model ready event for the mesh component notification bus.
* Mesh components notifications connection policy changed to adapt to cloned model asset.
* Handling empty meshes in model lod asset creator.
* Removed the requires cloning callback from the mesh feature processor and made it a parameter to the acquire mesh function
* Fixing mocks and unit tests
2021-04-23 18:33:00 +02:00
evanchia 77d40cbd84 updating gitignore for python packages 2021-04-23 09:27:59 -07:00
AMZN-daimini e772afa06e Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
2021-04-23 09:23:31 -07:00
evanchia-ly-sdets 1dd1f85d2b Merge pull request #274 from aws-lumberyard-dev/egg_file_removal
removing egg files
2021-04-23 09:17:11 -07:00
Peng e15146a409 Merge branch 'main' into ATOM/tonypeng/ATOM-15175 2021-04-23 09:08:18 -07:00
amzn-mike d25179303d Add jira ticket for disabled tests 2021-04-23 10:50:58 -05:00
amzn-mike c61b244416 Use a const to toggle asset cancellation on and off 2021-04-23 09:56:59 -05:00
nvsickle 12468fd81a Fix spacing from merge 2021-04-23 02:08:50 -07:00
nvsickle f835372c0f Fix capitalization... 2021-04-23 00:27:39 -07:00
nvsickle 228fa7ff6b Fix search and replace fail 2021-04-23 00:27:37 -07:00
nvsickle e6cfe36a03 Fix typo 2021-04-23 00:27:34 -07:00
nvsickle 9e6244dc99 Fix game mode camera components not working in-Editor
Ensures RPI::View updates always make it back to the ViewportContext, even if you talk directly to the View
2021-04-23 00:26:53 -07:00
nvsickle e1ae61ca06 Fix ImGui sometimes not respecting the viewport resolution in-Editor
ImguiAtomSystemComponent isn't guaranteed to initialize before ImGuiManager, which caused some issues.
Additionally, because we allow the user to configure ImGui's render resolution, I've refactored the window size override into a new OverrideRenderWindowSize API in ImGuiManager to decouple it from the target render resolution.
2021-04-23 00:26:13 -07:00
nvsickle 795ce4dfca Revert accidental change 2021-04-23 00:26:11 -07:00
nvsickle fb2ca8e02c Fix Editor crash in test teardown calling set_view_pane_layout
If Atom isn't initialized and able to produce a ViewportContext, the Editor would crash. This attempts to make the initialization fail a bit more gracefully and fixes the crash in the cases I've tested.
2021-04-23 00:26:09 -07:00
dmcdiarmid-ly 104262e048 Merge pull request #191 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14951
[ATOM-14951] Move clearcoat into the forward pass and remove render target
2021-04-22 23:49:10 -07:00
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 2021-04-22 23:36:29 -07:00