Commit Graph

233 Commits

Author SHA1 Message Date
hultonha a4b8db2f94 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 2021-04-26 11:01:48 +01:00
hultonha b27daeead5 updates to viewport ui switcher id and usage 2021-04-24 18:35:24 +01:00
rgba16f 92199d9f2e Merge pull request #240 from aws-lumberyard-dev/DisableAtomShim
Delete CryRenderAtomShim, Atom is no longer reachable through Cry rendering interfaces
2021-04-24 09:39:39 -05:00
Esteban Papp 29bf58cffc SPEC-6517 RedCode: some more folders identified for removal 1 (#290) 2021-04-23 17:11:28 -07:00
rgba16f bc40dd7e5e Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-23 18:35:18 -05: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
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
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
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
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 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
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
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 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
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 2021-04-22 23:36:29 -07:00
srikappa-amzn 11f811eb7e Merge pull request #260 from aws-lumberyard-dev/Prefab/CreatePrefab
Added undo and redo support for nested prefab creation
2021-04-22 17:51:01 -07:00
chiyenteng bac334a244 Fix serialization issues related to sequence node/track (#214) (#247)
* Fix serialization issues related to sequence node/track
2021-04-22 17:42:06 -07:00
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 2021-04-22 17:01:29 -07:00
daimini 8f79379bc8 Fixes as per Ram's review 2021-04-22 16:45:20 -07:00
daimini 76739de282 Fix spacing 2021-04-22 15:52:39 -07:00
daimini ea43eb3ac9 Set position of instantiated prefab 2021-04-22 15:49:13 -07:00
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 2021-04-22 14:54:01 -07:00
daimini c9a4b6f50b Better handle the default case for Instantiate 2021-04-22 14:53:07 -07:00
cgalvan 5d3774521f Merge pull request #251 from aws-lumberyard-dev/cgalvan/RemoveSetEditMode
[LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar.
2021-04-22 16:36:57 -05:00
AMZN-stankowi f44f06c9f0 AssImp set to be the default FBX processor (#78) (#136)
* AssImp set to be the default FBX processor (#78)

If you encounter issues, reach out to the Helios team with details, and then switch back to FBX SDK locally by changing FBXImporter.h

* Merge pull request #219 from aws-lumberyard-dev/sceneapi_scripting

LYN-3030: Fix to export_chunks_builder.py to match the AssImp node paths

* Hide some automated test folders from the asset processor for automatedtesting. This is necessary because these assets should only be processed when running the test, and not any time AP is launched for this project.

* Putting these test assets back to visible to Asset Processor. These tests need to be updated at some point to handle that, but they won't work with this change for now. Note that until this is addressed, these tests may randomly time out if they're the first tests run on a clean asset processor, and these tests launch AP without using a unique port, so the test can also fail if an Asset Processor executable is hanging open.

Grabbed the change I missed from the 1.0 branch merge, no idea how this got lost.

* Moved from main to periodic. Allen and Fuzzy were already on board, and I think with the potential flakiness in this test, we don't want this in main.

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-04-22 14:09:44 -07:00
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 2021-04-22 13:57:08 -07:00
amzn-mike 9e2836613f Merge branch 'main' into amzn-mike/lyn-2249-disable-cancel 2021-04-22 15:38:32 -05:00
amzn-mike 58e8233c2c Remove debug message 2021-04-22 15:27:16 -05:00
Chris Galvan 8e1eb32de7 [LYN-3160] Fixed python bindings unit test that was still looking for get/set_edit_mode functions. 2021-04-22 15:22:44 -05:00
amzn-mike 0428189bed Increase test difficulty 2021-04-22 15:18:54 -05:00
amzn-mike 39789c30d8 Remove container OnAssetCanceled event 2021-04-22 15:03:04 -05:00
amzn-mike 35a47932eb Disable weak references and unit tests for them. 2021-04-22 15:02:41 -05:00
Chris Galvan 607f786687 [LYN-3160] Fixed virtual destructor compile issue on linux. 2021-04-22 15:00:50 -05:00
sharmajs-amzn 957d1360da Custom UV Stream Names in assimp (#210) (#243)
* Custom UV Stream Names in assimp
https://jira.agscollab.com/browse/LYN-2506
2021-04-22 12:54:36 -07:00
Eric Phister 38f0203546 Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
Launch AssetProcessor from prebuilt SDK
- Look for AssetProcessor in a known SDK layout location if one in executable directory is not found.
- Adds more files to the CMake install to help fix some errors launching AP from SDK.
2021-04-22 14:32:14 -05:00
Chris Galvan 08bd4ee740 [LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar. 2021-04-22 14:28:42 -05:00
Terry Michaels d680995074 Renamed several non-inclusive terms (#236) 2021-04-22 13:31:26 -05:00
greerdv 1fa5728655 Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
support for non-uniform scale component with atom mesh component
2021-04-22 18:49:36 +01:00
amzn-mike 3907ffc173 Add unit test 2021-04-22 12:01:21 -05:00
mbalfour bd23944531 Fix issues with rapid asset cancellation / reload:
* Asset<T>::QueueLoad didn't trigger any loads in the case where an asset was in a Queued state, it simply returned the reference.  This caused problems in the case where an asset was in the process of being cancelled and garbage collected, as it could be in a queued state with nothing actively loading it.  The method now detects this case and calls GetAsset(), which triggers a new load.
* AssetContainer::IsValid() was returning true for canceled containers that no longer had a root asset.  Now it returns false, to help ensure the container doesn't try to get reused.
* AssetContainer would add entries to the preloadList even if any potential preloads were filtered out from the load.  They are no longer added, since they shouldn't be waiting for any dependent assets to load.  (This could cause incorrect warnings to print in some situations)
* AssetContainer was erroneously warning about removing assets from a missing waiting list.  The warning was removed, as the condition could occur when the same asset was being loading by two different containers - once with dependencies and once without.
* AssetDataStream::RequestCancel has been added, as it was missing, but nothing currently needs to use it.
* AssetManager::GetAssetContainer() now verifies that the container is valid before attempting to reuse it.  This prevents asset containers that are in the middle of cancellation from getting reused.
2021-04-22 12:01:19 -05:00
Benjamin Jillich ba324b8806 [LYN-3013] Github TQO Animation: MorphTarget has data integrity issue (#237)
* Added error reporting for data integrity issues for non-uniform motion data.
* The actual issue was a mismatch between the end times of the morph and the skeletal animations. They need to match in EMotionFX.
* The morph target animation exported a keyframe too much.
2021-04-22 18:53:27 +02:00
hultonha cc4d69f279 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 2021-04-22 17:51:28 +01:00
daimini cf4bbe569b Remove Prefab cache undo node generation for container entities - will move that work to a separate PR. 2021-04-22 09:47:18 -07:00
AMZN-AlexOteiza dbcb2f9916 Added sys_assert level 3 which will make asserts to crash the application(#208)
Co-authored-by: aljanru <aljanru@amazon.com>
2021-04-22 17:46:37 +01:00
phistere 93ba2ea251 LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace. 2021-04-22 11:42:58 -05:00
phistere ace7a64b24 Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 2021-04-22 10:06:40 -05:00