f7e2d07a4b
LYN-7333 | Fix multiple selection by dragging to take focus mode and containers into account. ( #4620 )
...
* Change FocusModeNotificationBus's OnEditorFocusChanged arguments to also pass the previous focus root entity id.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Add focus mode and container entity states to the visibility cache for the viewport. Use that data to correctly select entities when a rect is dragged on the viewport.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor code adjustments
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor fixes and optimizations
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
3c3cde99be
LYN-7189 | Outliner - Disable context menu if right clicking on disabled entity ( #4651 )
...
* Don't allow right clicking on a non selectable entity in the Outliner
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Also check that the index is valid to still allow the right click context menu to appear on empty areas of the widget.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Change if check to a more readable bool.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
da3a39a6a0
LYN-7121 | Focus Mode - Make editing a prefab an undoable operation ( #4582 )
...
* Refactor the PrefabFocusInterface to differentiate between Public and Internal functions. Introduce PrefabFocusUndo nodes to allow undoing Prefab Edit operations.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix selection code to avoid warning message
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Removed changed property from PrefabFocusUndo node
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Switch from size == 0 to empty in EntityOutlinerWidget::OnSelectionChanged
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* condense if check on Prefab Edit context menu item setup
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Correct interface usage in PrefabIntegrationManager (interface was renamed to public)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Remove rej file that was included by mistake
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix missing interface initialization in PrefabFocusTests
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
48a74ca93d
Remove clearFocus from EditorTransformComponentSelection duplicate Entity ( #4571 )
...
* remove clearFocus from EditorTransformComponentSelection duplicate entity
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* remove extra unneeded calls to RequestWrite
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* update PrefabPublicHandler to use SetSelectedEntities
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
ccd60513f1
Fix prefab close dialog Editor crash on Linux ( #4623 )
...
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
1cb26a31f8
LYN-7195 + LYN-7185 + LYN-5301 | Hide viewport helpers for entities out of focus + selection shortcut adjustments ( #4615 )
...
* Light refactoring of selection logic. Only draw helpers for selectable entities according to Editor Focus Mode and Container Entity systems.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* When Escape is pressed, clear the Prefab Focus.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Alter Ctrl+A and Ctrl+Shift+I to take editor focus mode and container entity behaviors into account.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Remove redundant comments and reduce footprint of tests.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Introduce loop protection, as GetParentId is known to loop in some situations possibly causing timeouts.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
2b72f7b100
Merge pull request #4642 from aws-lumberyard-dev/Atom/guthadam/overriding_property_asset_ctrl_thumbnails
...
PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail image
4 years ago
f34811c373
Merge pull request #4639 from aws-lumberyard-dev/Atom/guthadam/thumbnail_bus_passes_const_qpixmap
...
Updated thumbnail notification bus to use const QPixmap&
4 years ago
4f539b0eb7
fixed comments
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
f7e08d1c4b
PropertyAssetCtrl and ThumbnailPropertyCtrl support custom thumbnail images
...
• PropertyAssetCtrl was previously extended with ThumbnailPropertyCtrl to optionally display a thumbnail and floating zoomed in preview of the selected asset.
• This change allows overriding the image that comes from the thumbnail system with a custom image provided as an attribute. The custom image can be specified as either a file path or a buffer containing a serialized QPixmap.
• This will be used by the material system in the editor to provide a dynamically rendered image of the material with property overrides applied so that the image will update as the user customizes their material.
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
6318247b3d
LYN-7279 + LYN-7192 | Focus Mode - Container unit tests + Clear container entity open state on new level load ( #4558 )
...
* Change SetContainerOpenState to SetContainerOpen.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Introduce Clear function to avoid retaining all lingering open states when switching contexts/loading a new level.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor FocusMode fixture refactors to support ContainerEntity tests
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Introduce tests for the ContainerEntity API
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Add include to fix issue with EntityContextId not being defined.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor comment fixes. Moved environment clear functions to TearDown function of test fixture.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Use default editor context id in ContainerEntitySystemComponent
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Revert previous change as the EditorEntityContextId would not be initialized correctly on ContainerEntitySystemComponent Activate.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
8487373b0c
Updated thumbnail notification bus to use const QPixmap&
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
7ca85460f7
Bug Fix: Improve display of Viewport UI ( #4596 )
...
- always show controls on top of main ui
- Tool window does not show visually in toolbar
issue: https://github.com/o3de/o3de/issues/4380
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
5c859cb134
Fix camera drift issues ( #4576 )
...
* remove some unused code in RenderViewportWidget and make viewing devicePixelRatioF easier
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* updates to how cursor positions are calculate to handle the viewport widget moving
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* remove optional for previous position
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* add test to capture error with moving the widget
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* minor comment updates before publishing PR
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
1cdb34326b
Merge branch 'development' into LYN-5265_state_tracker_impl
4 years ago
73f8537030
Fix Issue saving new assets in Asset Editor on Linux ( #4537 )
...
* Add helper function to apply a selected file filter from a file dialog to the result filename if needed
* Add platform traits to restrict the use of the helper function on platforms that need to apply it
* Fix building of file filters of multiple extensions for a file type
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
00b938b6a7
Merge pull request #4212 from ppinfel/component-doc-links
...
Fixes various component's help URL links to correct o3de.org page
4 years ago
dcadfe6e1f
Feature json assetloading assethints ( #4554 )
...
* capture assets using SerializedAssetTracker in LoadInstanceFromPrefabDom()
assign assets using asset hints where the asset ID is not valid
switch up SerializedAssetTracker to store pointers instead of copies of Asset<>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* PoC for the AssetFixUp strategy
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* clean up of PoC
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
e64b9d3536
ATOM-16320 Remove PVRTC and ETC compressor ( #4557 )
...
Signed-off-by: Qing Tao <qingtao@amazon.com>
4 years ago
863a7c8382
Address PR comments.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
3f2881ea46
Simplify viewport interaction model reset functionality ( #4524 )
...
* simplify entity reset functionality
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* remove reference to removed shortcuts
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
5cee9b43b7
Squashed commit of Procedural Prefab work ( #4481 )
...
* Squashed commit of the following:
commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585bhttps://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs
commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 18:03:38 2021 -0500
fixing non-unity build
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 15:43:50 2021 -0500
adding header for validation
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf#244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates
{lyn5880} adding Instantiate Procedural Prefab to the Editor
commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 14:21:09 2021 -0500
updated based on feeback
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 11:35:30 2021 -0500
small include tweak
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 10:08:53 2021 -0500
moved the seg reg key to the CPP file
removed the Queue Load
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 08:24:57 2021 -0500
Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample
Add example prefab script and FBX with 2 meshes to test it
commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 16:07:47 2021 -0500
make sure the AZ::IO::SystemFile::Exists() before returning fullPath
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 28 14:03:11 2021 -0500
Move sceneJobHandler reset out of exception block. Add more info to error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 13:04:37 2021 -0500
{lyn5880} adding Instantiate Procedural Prefab to the Editor
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 09:23:54 2021 -0500
Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{ly5395} adding asset loading logic for procedural prefabs
commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Mon Sep 27 13:52:21 2021 -0500
added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
optimized headers
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:12:40 2021 -0500
Remove some whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:04:58 2021 -0500
Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript
Fixes to support writing a python script to generate a prefab
commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:51:17 2021 -0500
Use raise_error instead of print
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:47:20 2021 -0500
Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:47 2021 -0500
Test entity cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:28 2021 -0500
Make CastWithTypeName only return true if the object can be successfully cast
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:49:28 2021 -0500
Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 13:19:51 2021 -0500
Store watch folder in scene so source relative path can be calculated
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 23 14:10:31 2021 -0500
Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule
{ly5384} script processing rule behavior more stateless
commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 22 15:19:30 2021 -0500
{ly5384} script processing rule beahvior more stateless
Made the script processing rule beahvior more stateless so that the
script name needs to be discovered each time.
Disconnet from the bus after each scene script builder usage.
Before it would be possible that the same script can be run more than
once for each asset.
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:27:12 2021 -0500
Update scene_data.py to latest PrefabGroup format
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:26:27 2021 -0500
Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:48:15 2021 -0500
AZ::JsonSerializationUtils update
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:21:52 2021 -0500
revert odd README.md merge issue
added alias for PrefabBuilder.Tools
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:52:58 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
# Conflicts:
# Gems/Prefab/PrefabBuilder/CMakeLists.txt
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:43:19 2021 -0500
added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:59 2021 -0500
Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile
{ly5384} Fixing Linux build issues.
commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:48 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile
commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:52:07 2021 -0500
Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix
fixing an API merge compile error
commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:50:58 2021 -0500
fixing an API merge compile error
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:10:46 2021 -0500
Make sure EntityUtilityComponent is loaded in AssetBuilderApplication
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:09:03 2021 -0500
Clean up entities and templates after python script is done
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 20 14:05:12 2021 -0500
ScriptProcessorRuleBehavior resets entity context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:40:37 2021 -0500
Add add_prefab_group
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 11:53:25 2021 -0500
Fix merge compile issue
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 11:18:44 2021 -0500
{ly5395} adding asset loading logic for procedural prefabs
* enabling the Prefab gem for tool work
* enabling prefab gem for AutomatedTesting
* AssetTypeInfoHandler for procedural prefab
* EnableCatalogForAsset for procedural prefab
* RegisterHandler for AssetManager
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:32:37 2021 -0500
Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671fc8697edd5#229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework
commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 10:04:06 2021 -0500
{ly5384} Fixing Linux build issues.
* symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
* wrapped the AZ::ComponentId return for both cases
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 09:44:30 2021 -0500
Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc
Reflect Prefab/Entity constants and add failure unit tests
commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:37:29 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:27:57 2021 -0500
Updated PrefabBuilder to point to new asset type for the procedural prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:56:13 2021 -0500
{lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:53:22 2021 -0500
Add failure tests and some test cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:34:03 2021 -0500
Reflect InvalidTemplateId, fix reflection for InvalidComponentId
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:55:16 2021 -0500
Fix merge issues
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:28:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:24:44 2021 -0500
Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab
API Update: Wrap PrefabSystemComponentInterface behavior
commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:33 2021 -0500
Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
API Update: AzToolsFramework::Prefab::PrefabLoaderInterface
commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:06 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
# Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp
commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:36 2021 -0500
Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement
API Update: Editor Entity Component Functions
commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:09 2021 -0500
Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore
API Update: Editor Component JSON Helper Functions
commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:48:41 2021 -0500
m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
adding error messages for the prefab processing
fixed typo
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:32:42 2021 -0500
reduced the JSON for the testing framework to tree types only
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:25:00 2021 -0500
enable ProceduralPrefabAsset JsonRegistrationContext
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:31:59 2021 -0500
Remove unneeded include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:20:04 2021 -0500
Cleanup whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 13:49:20 2021 -0500
FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)
Fixed a memory leak
Moved const to header
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 10:49:32 2021 -0500
updated the DOM logic for the asset loading sake
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 13:23:13 2021 -0500
Update CreateStringPermissive to stop when enough data has been collected.
Update unit tests.
Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
Updated AssetTreeFilterModel to cap the string length
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:55:38 2021 -0500
Rename GetComponentJson to GetComponentDefaultJson.
Clean up GetComponentTypeIdFromName
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:29:04 2021 -0500
Move scripting ebus and handler into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 20:27:41 2021 -0400
Renamed SearchComponents to FindMatchingComponents
Added missing printf formatting
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:31:08 2021 -0400
Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
API Update: Editor Entity Management - Add some comments and error handling
commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:13:43 2021 -0400
Move bus and handler code into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:25:35 2021 -0400
Add comments
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:16:33 2021 -0400
Add error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 16:54:20 2021 -0400
Cleanup code
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 10:48:40 2021 -0500
Add and update unit tests
Reflect APIs to behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 2 13:00:02 2021 -0500
Add Search and Component json output APIs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 13:37:44 2021 -0400
Make bus handler private
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 12:30:13 2021 -0400
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 10:12:49 2021 -0500
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 16:06:10 2021 -0500
Update unit test to verify components on saved prefab
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 12:52:46 2021 -0500
Expand test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 17:32:14 2021 -0500
Add error handling
Add component creation
Add error testing
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:31:28 2021 -0500
enabling ProductDependencies test again
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:23:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:14:07 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:09:10 2021 -0500
Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group
{lyn5392} Adding PrefabGroup scene manifest rule
commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:33:24 2021 -0500
removing unneeded AZStd::move() calls
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:17:52 2021 -0500
cleaned up the code
finalized the unit tests
fixed the code based on the tests... FTW!
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 13:06:20 2021 -0500
Add FindComponentByTypeName and UpdateComponentForEntity APIs
Add unit tests
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 14:02:17 2021 -0500
Fix bus connect that should have been a bus disconnect
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 12:57:04 2021 -0500
Fix up includes
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 08:43:23 2021 -0500
WIP
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:44:37 2021 -0500
Rename files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:14:34 2021 -0500
Remove 'editor' from bus/component name
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Aug 31 09:18:37 2021 -0500
{lyn5392} Adding PrefabGroup scene manifest rule
* Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
* has reflections for serialization & behavior
* testing the behavior using Lua
* testing the serialization using JSON
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 17:52:18 2021 -0500
Reflect SaveTemplateToString
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 12:46:17 2021 -0500
Add warning/error messages, update module
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 11:17:25 2021 -0500
Add some comments and error handling
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 17:16:45 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:28:00 2021 -0500
Add CreatePrefabTemplate
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac#199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
Add editor entity creation and unit test
commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 16:44:57 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:03:35 2021 -0500
Setup CreateEditorReadyEntity to use a custom entity context
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 09:29:20 2021 -0500
Add EditorEntityUtilityComponent for managing entities from the behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f8d39e267143603cad5e575faa4443#3049 from aws-lumberyard-dev/cgalvan/gitflow_210811
Merged stabilization/2106 to main
commit 575faa444343603cad5e4b817a648343603cad5ed9cce28a53bb52475ce8#2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate
Updating CONTRIBUTING.md
commit bb52475ce8697dfad486650e1ab44dd9cce28a53e7f787572e486ba58628#2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main
Merged stabilization/2106 to main
commit 486ba58628e7f787572e7cfde884d9e7f787572e#1685 )
Not to be committed before 7/6/2021
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
commit 837e1c7370d30de01752efcbe2c4a1#1764 from aws-lumberyard-dev/cgalvan/gitflow_210702
Merged stabilization/2106 to main
commit efcbe2c4a1d30de017520c43493e29d30de01752#1624 )
Signed-off-by: AMZN-alexpete
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* Material Editor: Added alternate skybox toggle to the toolbar
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* Squashed commit of the following:
commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585bhttps://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs
commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 18:03:38 2021 -0500
fixing non-unity build
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 30 15:43:50 2021 -0500
adding header for validation
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf#244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates
{lyn5880} adding Instantiate Procedural Prefab to the Editor
commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 14:21:09 2021 -0500
updated based on feeback
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 11:35:30 2021 -0500
small include tweak
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 29 10:08:53 2021 -0500
moved the seg reg key to the CPP file
removed the Queue Load
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 08:24:57 2021 -0500
Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample
Add example prefab script and FBX with 2 meshes to test it
commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 16:07:47 2021 -0500
make sure the AZ::IO::SystemFile::Exists() before returning fullPath
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 28 14:03:11 2021 -0500
Move sceneJobHandler reset out of exception block. Add more info to error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 13:04:37 2021 -0500
{lyn5880} adding Instantiate Procedural Prefab to the Editor
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 28 09:23:54 2021 -0500
Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{ly5395} adding asset loading logic for procedural prefabs
commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Mon Sep 27 13:52:21 2021 -0500
added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
optimized headers
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:12:40 2021 -0500
Remove some whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 27 09:04:58 2021 -0500
Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript
Fixes to support writing a python script to generate a prefab
commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:51:17 2021 -0500
Use raise_error instead of print
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 17:47:20 2021 -0500
Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:47 2021 -0500
Test entity cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:50:28 2021 -0500
Make CastWithTypeName only return true if the object can be successfully cast
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 14:49:28 2021 -0500
Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 24 13:19:51 2021 -0500
Store watch folder in scene so source relative path can be calculated
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 23 14:10:31 2021 -0500
Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule
{ly5384} script processing rule behavior more stateless
commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 22 15:19:30 2021 -0500
{ly5384} script processing rule beahvior more stateless
Made the script processing rule beahvior more stateless so that the
script name needs to be discovered each time.
Disconnet from the bus after each scene script builder usage.
Before it would be possible that the same script can be run more than
once for each asset.
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:27:12 2021 -0500
Update scene_data.py to latest PrefabGroup format
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 22 13:26:27 2021 -0500
Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:48:15 2021 -0500
AZ::JsonSerializationUtils update
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 17:21:52 2021 -0500
revert odd README.md merge issue
added alias for PrefabBuilder.Tools
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:52:58 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
# Conflicts:
# Gems/Prefab/PrefabBuilder/CMakeLists.txt
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:43:19 2021 -0500
added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:59 2021 -0500
Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile
{ly5384} Fixing Linux build issues.
commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 16:28:48 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile
commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:52:07 2021 -0500
Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix
fixing an API merge compile error
commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 15:50:58 2021 -0500
fixing an API merge compile error
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:10:46 2021 -0500
Make sure EntityUtilityComponent is loaded in AssetBuilderApplication
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:09:03 2021 -0500
Clean up entities and templates after python script is done
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Sep 20 14:05:12 2021 -0500
ScriptProcessorRuleBehavior resets entity context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:40:37 2021 -0500
Add add_prefab_group
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 11:53:25 2021 -0500
Fix merge compile issue
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 11:18:44 2021 -0500
{ly5395} adding asset loading logic for procedural prefabs
* enabling the Prefab gem for tool work
* enabling prefab gem for AutomatedTesting
* AssetTypeInfoHandler for procedural prefab
* EnableCatalogForAsset for procedural prefab
* RegisterHandler for AssetManager
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 10:32:37 2021 -0500
Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671fc8697edd5#229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset
{lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework
commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Sep 21 10:04:06 2021 -0500
{ly5384} Fixing Linux build issues.
* symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
* wrapped the AZ::ComponentId return for both cases
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 21 09:44:30 2021 -0500
Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc
Reflect Prefab/Entity constants and add failure unit tests
commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:37:29 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset
commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 17:27:57 2021 -0500
Updated PrefabBuilder to point to new asset type for the procedural prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:56:13 2021 -0500
{lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Thu Sep 16 16:45:03 2021 -0500
Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior
{LYN5393} Adding Prefab Group Behavior to output Procedural Prefab
commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:53:22 2021 -0500
Add failure tests and some test cleanup
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 13:34:03 2021 -0500
Reflect InvalidTemplateId, fix reflection for InvalidComponentId
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:55:16 2021 -0500
Fix merge issues
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:28:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:24:44 2021 -0500
Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab
API Update: Wrap PrefabSystemComponentInterface behavior
commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:33 2021 -0500
Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
API Update: AzToolsFramework::Prefab::PrefabLoaderInterface
commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 10:07:06 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
# Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp
commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:36 2021 -0500
Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement
API Update: Editor Entity Component Functions
commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 16 09:58:09 2021 -0500
Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore
API Update: Editor Component JSON Helper Functions
commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:48:41 2021 -0500
m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
adding error messages for the prefab processing
fixed typo
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:32:42 2021 -0500
reduced the JSON for the testing framework to tree types only
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 16:25:00 2021 -0500
enable ProceduralPrefabAsset JsonRegistrationContext
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:31:59 2021 -0500
Remove unneeded include
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 14:20:04 2021 -0500
Cleanup whitespace
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 15 13:49:20 2021 -0500
FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)
Fixed a memory leak
Moved const to header
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 15 10:49:32 2021 -0500
updated the DOM logic for the asset loading sake
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 13:23:13 2021 -0500
Update CreateStringPermissive to stop when enough data has been collected.
Update unit tests.
Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
Updated AssetTreeFilterModel to cap the string length
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:55:38 2021 -0500
Rename GetComponentJson to GetComponentDefaultJson.
Clean up GetComponentTypeIdFromName
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Sep 14 10:29:04 2021 -0500
Move scripting ebus and handler into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 20:27:41 2021 -0400
Renamed SearchComponents to FindMatchingComponents
Added missing printf formatting
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:31:08 2021 -0400
Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
API Update: Editor Entity Management - Add some comments and error handling
commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 10 09:13:43 2021 -0400
Move bus and handler code into separate files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:25:35 2021 -0400
Add comments
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 17:16:33 2021 -0400
Add error messages
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 16:54:20 2021 -0400
Cleanup code
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 10:48:40 2021 -0500
Add and update unit tests
Reflect APIs to behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 2 13:00:02 2021 -0500
Add Search and Component json output APIs
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 13:37:44 2021 -0400
Make bus handler private
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 12:30:13 2021 -0400
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 9 10:12:49 2021 -0500
Address feedback
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 16:06:10 2021 -0500
Update unit test to verify components on saved prefab
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Sep 3 12:52:46 2021 -0500
Expand test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 17:32:14 2021 -0500
Add error handling
Add component creation
Add error testing
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:31:28 2021 -0500
enabling ProductDependencies test again
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:23:26 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:14:07 2021 -0500
Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior
# Conflicts:
# Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
# Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
# Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 17:09:10 2021 -0500
Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group
{lyn5392} Adding PrefabGroup scene manifest rule
commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:33:24 2021 -0500
removing unneeded AZStd::move() calls
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 16:17:52 2021 -0500
cleaned up the code
finalized the unit tests
fixed the code based on the tests... FTW!
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 13:06:20 2021 -0500
Add FindComponentByTypeName and UpdateComponentForEntity APIs
Add unit tests
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 14:02:17 2021 -0500
Fix bus connect that should have been a bus disconnect
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 1 12:57:04 2021 -0500
Fix up includes
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Wed Sep 1 08:43:23 2021 -0500
WIP
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:44:37 2021 -0500
Rename files
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Tue Aug 31 14:14:34 2021 -0500
Remove 'editor' from bus/component name
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date: Tue Aug 31 09:18:37 2021 -0500
{lyn5392} Adding PrefabGroup scene manifest rule
* Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
* has reflections for serialization & behavior
* testing the behavior using Lua
* testing the serialization using JSON
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 17:52:18 2021 -0500
Reflect SaveTemplateToString
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 12:46:17 2021 -0500
Add warning/error messages, update module
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Aug 30 11:17:25 2021 -0500
Add some comments and error handling
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 17:16:45 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:28:00 2021 -0500
Add CreatePrefabTemplate
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac#199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement
Add editor entity creation and unit test
commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 16:44:57 2021 -0500
Fix line endings
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 15:03:35 2021 -0500
Setup CreateEditorReadyEntity to use a custom entity context
Add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Aug 27 09:29:20 2021 -0500
Add EditorEntityUtilityComponent for managing entities from the behavior context
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit f8d39e267143603cad5e575faa4443#3049 from aws-lumberyard-dev/cgalvan/gitflow_210811
Merged stabilization/2106 to main
commit 575faa444343603cad5e4b817a648343603cad5ed9cce28a53bb52475ce8#2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate
Updating CONTRIBUTING.md
commit bb52475ce8697dfad486650e1ab44dd9cce28a53e7f787572e486ba58628#2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main
Merged stabilization/2106 to main
commit 486ba58628e7f787572e7cfde884d9e7f787572e#1685 )
Not to be committed before 7/6/2021
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
commit 837e1c7370d30de01752efcbe2c4a1#1764 from aws-lumberyard-dev/cgalvan/gitflow_210702
Merged stabilization/2106 to main
commit efcbe2c4a1d30de017520c43493e29d30de01752#1624 )
Signed-off-by: AMZN-alexpete
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
* Squashed commit of the following:
commit dbd3526517bcb6553402cbc0af1f02e1f68e0707
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Mon Oct 4 14:30:56 2021 -0500
Increased scene manifest max size to size_t::max to match default json size limit
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit ea4a9ffd23feb3beeadc9bf6ca765c96980e9e6d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Oct 1 19:15:25 2021 -0500
Switch to querying cache location from Settings Registry
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 1c197996132625b8e26856fc92a30f9862d9dfdb
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Fri Oct 1 14:42:32 2021 -0500
Update to look in cache for generated manifest instead of source folder
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit cf3c32791fd71dc48066f9783c8859d386370b95
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Thu Sep 30 11:09:40 2021 -0500
Added generated manifest to dependency tracking. Updated unit tests
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 56cb0d27982e61c2cf123b765def8b5c9e21b021
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 15:51:52 2021 -0500
Moved manifest size const to header and used that in scene builder
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 7c8016a0ba6000090b29371f253b7906c9f3d141
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 15:21:06 2021 -0500
Add doc comment
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit 45fd5473f5ed6fe4fe93f8d629857852bcbe5e03
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 15:11:36 2021 -0500
Clean up code and add unit test
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
commit d0e610cad380e2278bc18552a4d1c71c64a5d339
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date: Wed Sep 29 13:21:58 2021 -0500
Source dependency reporting WIP
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
# Conflicts:
# Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp
(cherry picked from commit d6464dcee20ea4e6f2d40f0d3301f24be5f4dee6)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Add comment on unit test globals, fix indentation
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* Cleaned up scene_mesh_to_prefab.py
Added comments
Removed raise_error function
Made mesh_group_name cleanup more comprehensive
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
* fix for "warning C4100: 'message': unreferenced formal"
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Co-authored-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
317d624f6c
Minor formatting.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
66f419e8e5
Merge branch 'development' into LYN-5265_state_tracker_impl
4 years ago
5308a0fbbb
Remove redundant editor mode notifications.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
f648cb1fd8
Update the FileIO Aliases ( #4186 )
...
* Update the FileIOAlias naming to make the cache, project root and engine
root paths more clear
The alias of `@root@`, `@assets@`, and `@projectplatformcache@` has been
collapsed to `@projectproductassets@`
The alias of `@devroot@` and `@engroot@` has been collapsed to
`@engroot@`
The alias of `@devassets@` and `@projectroot@` has been collapsed to
`@projectroot@`
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated use of devassets and devroot properties in python
Those properties now use projectroot and engroot
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updating the alias @engroot@ alias path comment in each platform specific LocalFileIO_*.cpp file
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Removed hardcoded size of 9 for the product asset alias.
The ResolvePath function now just appends the @projectproductassets@
alias with the input path
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Remove duplicate @projectproductassets@ check in ProcessFileTreeRequest
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fix for typos in Hydra python test
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated LocalFileIO::Copy call on Windows to use the Unicode aware CopyFileW API
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated the AWSMetreicsGemAllocatorFixture to properly suppress asset
cache write errors for Test file creation.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Removed unneeded call to set the @projectproductasstes@ alias at the bottom of the AssetSeedManagerTest SetUp
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Added a deprecated alias map to the FileIO System
When a deprecated alias is accessed, the FileIO System logs an AZ_Error and indicates the alias that should be used
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated python test scripts to use the projectroot binding
Retrieving the AutomatedTesting project path based on "<devroot>/AutomatedTesting" has been removed.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated references to devroot and devgame within the codebase
The GetAbsoluteDevGameFolderPath functions has been replaced with direct call to AZ::Utils::GetProjectPath
The GetAbsoluteDevRootFolderPath functions has been replaced with direct calls to AZ::Utils::GetEnginePath
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated <engroot>/AutomatedTesting references to projectroot
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Replaced references that assumes the project path is <engroot>/AutomatedTesting with <projectroot> in the AutomatedTesting python test
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Correct casing in emfxworkspace file
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Removed newly added AppendPathParts function
Removed the Path constructors which accepts a PathIterable instance
The PathIterable isn't safe to return to a user of the Path class as it might be referencing temporary paths supplied via PathView arguments
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fixed unused parameter warning
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Undid change to the LexicallyProximate function to set the path result to the base path.
It needs to return the *this path if the pathResult is empty
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Moved the LocalFileIO ConvertToAbsolutePath implementations to AZ::Utils
Fixed the ConvertToAbsolutePath implementation for Unix platforms to use a buffer that is size PATH_MAX(4096 on all our supported Unix platforms).
Because the buffer before was AZ::IO::MaxPathLength which as a size of 1024, this was resulting in the Unix `realpath` function smashing the stack when it converts a path to an absolute path that is longer than 1024 characters
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated the EditorCore.Tests to attach the AZ Environment to the EditorCore shared library that is statically loaded on launch.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fixed for DeprecatedAlaisesKeyVisitor Visit function causing the non string_view overloads being hidden causing a hidden base class function warning
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Changed the AWSMetricsGemMock to use a temporary for writing test assets
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated the LocalFileIO::ResolvePath function to use HasRootPath to determine if a path starts with a root path such as "D:", "D:/" or "/"
IsAbsolute was not the corect check as the path of "D:" is a relative
path.
To be absolute according to the Windows the path must have a root
directory. i.e "D:/" or "D:\"
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Removed absolute path comment from LocalFile_UnixLike.cpp and LocalFile_Android.cpp FindFiles implementations
Updated the ConvertToAlias to supply an AZ::IO::FixedMaxPath
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Replaced usage of the @projectproductassets@ alias with @engroot@ when referring to the LmbrCentral source folder in the CopyDependencyBuilderTest and the SeedBuilderTests
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated the ScriptCanvas Upgrade Tool to output backed up files to the
Project User Path instead of the engine root
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fixed whitespacing issues in Application.cpp
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Remove unnecessary creation of a FixedMaxPath in the UpgradeTool.cpp
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Modified testSeedFolder variable in the SeedBuilderTests to use the
@engroot@ alias instead of @projectproductassets@/.. alias when
referring to the LmbrCentral Gem source path
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Updated references to the Project Asset Cache in the PythonTests.
Those tests no longer use the logic `azlmbr.paths.projectroot / "Cache" / "pc"` to retrieve a path to the cache root but instead the `azlmbr.paths.projectproductassets` constant
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fixed the FileIO Deprecated Alias test on Windows
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Removing @projectsourceassets@ alias, as it is only used once.
Updated the PhysX EditorSystemComponent.cpp to query the ProjectPath
form the SettingsRegistry.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Replaced @projectproductassets@ alias with @products@
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Rollback changes to the PhysX EditorSystemComponent.cpp
The changes to use the ProjectPath from the SettingsRegistry has been implemented in PR #4497
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
bb8971a3ad
LYN-5288 | Clicking on a Prefab in the viewport should select the entire Prefab and not an individual Entity ( #4462 )
...
* Setup work for the ContainerEntity SystemComponent and Interface.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Introduce Container Entity Notification Bus
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Introduce a proxy model to control open/closed state of entity containers. Register prefab containers as entity containers. Profit.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Add open state to OnContainerEntityStatusChanged notification + improvements to comments.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix to notification trigger to include new arguments.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix issue where the Level container would not be expanded correctly. The Level container is now no longer a container entity (since we don't need to be able to close it).
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Revert the addition of an extra proxy layer (which was causing issues) and just move the container logic to the existing filter.
Fix bug in the dataChanged signal.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix column count in dataChanged signal to correctly update all column and fix visual glitches.
Limit container registration to the prefab WIP flag so that the changes can be submitted with an opt-in mechanism.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Add doubleclick behavior on Outliner items - enters focus mode when double clicking on prefab containers.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* override sourceModel() to store pointer to avoid dynamic casting at every filterAcceptsRow call.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor comment fixes and nits
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Move container selection logic to a helper function in the ContainerEntityInterface to simplify reusing it in the near future.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Support lazy initialization for tests (since we do not load a level, the lazy initialization in OnEntityStreamLoadSuccess does not trigger)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
ca26599f93
Remove legacy sandbox picking - no longer used ( #4472 )
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
6dcdb5787a
Fix release build errors on Linux/Mac ( #4474 )
...
* - Fix unused release warnings
- Fixed compile errors from missing includes
- Commented out missing AZ_ATOM_PROFILE_FUNCTION macro
Signed-off-by: Steve Pham <spham@amazon.com>
* Deleted AZ_ATOM_PROFILE_FUNCTION
Signed-off-by: Steve Pham <spham@amazon.com>
* Adding more unused errors from windows release build, and updates based on PR suggestions
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
d03273089e
Merge pull request #4433 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
...
Change editor viewport mode tracker id from viewport to entity context.
4 years ago
d5dcd3c74a
Add explanatory comment to broadcast fixture.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
8c55107e07
ViewportEditorModeInfo to ViewportEditorModeTrackerInfo.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
050de68f7d
Merge branch 'development' into Atom/guthadam/material_editor_replace_modified_color_with_indicator
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
# Conflicts:
# Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
# Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
# Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
# Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
4 years ago
f3e6adce7f
LYN-6882 release builds are executing code in asserts ( #4305 )
...
* adding Windows/release to PR-validation builds
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* changing trace back to expand to nothing for release
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* typo
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* fixing some more unused variable cases
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* renaming file in ScriptCanvas that causes a msbuild warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
* reverting a previous change
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
7018f16088
Fixing undo/redo not updating transform pivot point ( #4375 )
...
* Fixing undo/redo not updating transform pivot point
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
* PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
* PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
* fixing non-redo operations to still use batching (fixes some tests)
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
23322edde7
Fix Entity id consistency issue & refactor prefab workflows/tests ( #4373 )
...
* Fix Entity id consistency issue & refactor prefab workflows/test framework
Signed-off-by: chiyteng <chiyteng@amazon.com>
* Update comments
Signed-off-by: chiyteng <chiyteng@amazon.com>
* Modify CreatePrefab and remove extra spaces
Signed-off-by: chiyteng <chiyteng@amazon.com>
* Address comments
Signed-off-by: chiyteng <chiyteng@amazon.com>
* Refactor prefab instance constructors
Signed-off-by: chiyteng <chiyteng@amazon.com>
* Remove commented out code
Signed-off-by: chiyteng <chiyteng@amazon.com>
4 years ago
fec77632ef
Archive Component - Rewrite and additional work on Archive and Asset Bundler ( #4332 )
...
* Fix issues with seedlist for AutomatedTesting
Fixes error reporting so it will show the file hint in the tool.
Removes any missing assets from the .seed file.
Remove an unnecessary dependency from AutomatedTesting dependencies
file.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Make ArchiveComponent use AZ::IO::IArchive
Initial changes that will get the sychronous calls in ArchiveComponent
to use IArchive interface rather than external zip/7z tools.
Some of the asynchronous api are still in place, anything that wasn't
being used has been removed for now. This may change later if we move
towards all the api being asynchronous. Until then, we can't remove the
reliance upon the external archive tools completely.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Updates AZStd::thread constructors
Adds a variadic constructor which forwards args to the functor.
Because of our thread_desc extension, there was confusion on the
arugments, so the args were reordered to take the thread_desc first,
before the functor and args.
Also the thread_desc is taken as reference rather than by pointer.
Update callsites to account for this change.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Async operation of ArchiveComponent api
This sets up the ArchiveComponent to operate asynchronously. It uses
promise/future to transfer results to caller.
This is still broken, there's a few things that need to get fixed up,
but this is a good checkpoint for the work as it solidifies the api,
cleans up a bunch of unused code, and compiles.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Removes the platform-specific ArchiveComponen
These are no longer needed, as they control the direct interaction with
host OS tools like 7za.exe or /bin/zip.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Removes the platform-specific files from cmake
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Removes the 7za.exe (and legal notice)
This tool is no longer needed in the repo.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Fixes usage of IArchive::GetFullPath()
This changed to return a PathView, updated to reflect that.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Fix promises and threads
Make sure promises are only set exactly once. This meant reworking some
of the initial error checking.
Detach threads when created. Adds [[nodiscard]] to the functions that
return a future. Since threads are detached, the future is the main way
to get communication from the thread.
Clean up interface, add comments.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* More edits to thread creation
Changes to thread construction to account for parameter change.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Fix some remaining issues with ArchiveComponent
Put created threads inside a container, then join them at Deactivate.
Fix asset bundler case when injecting a file with no working directory.
Fix thread constructor that applies args to a function.
Fix lambdas to take string args by value rather than reference.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Fixes some remaining bugs in ArchiveComponent
Open archive as read-only during extract & list operations.
Fixes paths issues.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Fix initialize of opaque thread handle in thread_UnixLike.h
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Removed unused variable in AssetBundleComponent.cpp to fix compiler warning
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fix some issues with archives
File paths in the CDR and the local headers need to match, but there
were issues with path separators and case that made it possible to get
invalid headers errors in some archives.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Adds some new ArchiveComponent unit tests
Adds new tests for extraction of archive and adding files from a file
list to an archive.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Fix file data offset issues when opening archives
When opening an INestedArchive it would run through the CDR headers to
create file entries in the zip cache. The offsets to the compressed
data were being calculated incorrectly because they were using the CDR
headers rather than jumping to the local file headers and getting
offsets from those sizes.
Removed and refactored some archive validation flow and zip cache
factory init methods to either init default or init w/ additional
validation checks.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Addresses PR feedback
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Address more points of feedback in PR
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Address additional PR feedback
Fixes up some error checks and uses of strings vs paths.
Enable archive component tests on Linux so we can see if they will
pass.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Address PR feedback
Change the INestedArchive interface to list files as AZ::IO::Path.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Disabling the ArchiveComponent tests on Linux
They failed so we will revisit them to attempt a fix.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Rename a member variable to be more accurate
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Address feedback on PR
Bump version of Archive Components for serialize context.
Improve error messages during archive open and validation.
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
* Revert recent changes
Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
10c7ef7147
Change editor viewport mdoe tracker id from viewport to entity context.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
b1fd428a99
Merge pull request #4413 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
...
Add call sites for activating/deactivating ViewportEditorMode::Focus
4 years ago
8a1af282c4
Merge pull request #4419 from aws-lumberyard-dev/carlitosan/bugfix
...
Fix unused variables in property list, and set ed_useNewAssetBrowserTableView to false by default
4 years ago
5fe4d8043d
set ed_useNewAssetBrowserTableView to false by default
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
225d9d3b3c
Fixes to unit tests after merge
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
d3bc7d8f12
Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeTests.cpp
# Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
4 years ago
8d67f184c8
LYN-7008 | Focus Mode - Selection unit tests ( #4357 )
...
* Refactor existing tests and fixtures, split them up in more granular tests, and add more comments.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Refactor test fixture for FocusMode to make it more reusable
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fixture rename, draft of selection test
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Split SetFocus and ClearFocus tests for Editor Focus Mode
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Move BoundsTestComponent to its own file so that it can be reused in Focus Mode Selection tests
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Making progress on selection test. Test compiles now, but selection doesn't seem to be working.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Removed commented out code from previous iteration.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Move BoundsTestComponent under the UnitTest namespace
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Viewport selection tests + minor fixes.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor fixes
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
cfbe76fdf6
Add call site for activating/deactivating Focus.
...
Signed-off-by: John <jonawals@amazon.com>
4 years ago
ffbc3f1c80
Fix a bug in recursion of prefab links when checking for dirty prefabs ( #4392 )
...
* Fix a bug in recursion of prefab links when checking for dirty prefabs
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
* Added a missing EntityId header
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
7b1d98535d
Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs
4 years ago
fa47b35580
Call sites for activating/deactivating viewport editor modes. ( #4265 )
...
* Provisional impl and testing of central state tracker.
Signed-off-by: John <jonawals@amazon.com>
* Add missing namespace comment.
Signed-off-by: John <jonawals@amazon.com>
* ViewportEditorModeState -> ViewportEditorModes
Signed-off-by: John <jonawals@amazon.com>
* ViewportEditorModesTracker -> ViewportEditorModeTracker
Signed-off-by: John <jonawals@amazon.com>
* GetEditorModeState ->GetViewportEditorModes
Signed-off-by: John <jonawals@amazon.com>
* GetNumTrackedViewports -> GetTrackedViewportCount
Signed-off-by: John <jonawals@amazon.com>
* IsViewportStateBeingTracked -> IsViewportModeTracked
Signed-off-by: John <jonawals@amazon.com>
* Fix API comments.
Signed-off-by: John <jonawals@amazon.com>
* Delete hangover file.
Signed-off-by: John <jonawals@amazon.com>
* Delete more hangover files.
Signed-off-by: John <jonawals@amazon.com>
* Minor member name refactor.
Signed-off-by: John <jonawals@amazon.com>
* Refactor nonclemanture.
Signed-off-by: John <jonawals@amazon.com>
* Rename Enter/ExitMode to Register/UnregisterMode.
Signed-off-by: John <jonawals@amazon.com>
* Error and warning msgs now return AZ::Outcomes.
Signed-off-by: John <jonawals@amazon.com>
* Change all nomenclature to Activate/Deactivate for consistency.
Signed-off-by: John <jonawals@amazon.com>
* Change tense of notification bus methods.
Signed-off-by: John <jonawals@amazon.com>
* Fix malformed string format.
Signed-off-by: John <jonawals@amazon.com>
* Fix malformed string format (again).
Signed-off-by: John <jonawals@amazon.com>
* Fix Linux warning.
Signed-off-by: John <jonawals@amazon.com>
* Call sites for editor mode activate/deactivate.
Signed-off-by: John <jonawals@amazon.com>
* Move Component editor mode logic to ComponentModeCollection.
Signed-off-by: John <jonawals@amazon.com>
* Delete non-source data.
Signed-off-by: John <jonawals@amazon.com>
* Remove line breaks and forward declare class.
Signed-off-by: John <jonawals@amazon.com>
* Remove constructors without ViewportEditorModeTrackerInterface ptr.
Signed-off-by: John <jonawals@amazon.com>
* Add integration tests for viewport editor modes.
Signed-off-by: John <jonawals@amazon.com>
* Address PR comments.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
43748c37fd
update joints to use cluster viewport ui. ( #4352 )
...
also some joints Component mode cleanup.
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
9eb9a13d99
Flipped CVar to activate the AssetBrowser Search View ( #4370 )
...
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
Danilo Aimini
hultonha
Steve Pham
Guthrie Adams
Guthrie Adams
Michael Pollind
John
Terry Michaels
Allen Jackson
Qing Tao
amzn-mike
lumberyard-employee-dm
Esteban Papp
Mikhail Naumov
chiyenteng
amzn-phist
SergeyAMZN
carlitosan
srikappa-amzn
amzn-sean
AMZN-Igarri