35406e27e1
Merge branch 'development' into math_string_converters
2022-02-14 10:42:48 -08:00
31fb5322ed
Refactor the Outliner drag&drop and selection to fix UX and technical issues. ( #7559 )
...
* Prototype - refactor the selection system for the Outliner (WIP)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* WIP - unify custom drag, still trying to find a way to make it so that the selection isn't affected by drag/drop of unselected entity
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Wrap up changes
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor refactor - move from enum to bool
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Prevent clicks on the spacing column from selecting the entity; better refresh the hover state.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix weird flicker introduced by latest commit
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Change color for the drag select rectangle.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Add more thorough comments, and also make some helper variables const.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fixed incorrect variable types (Qt uses ints for on-screen dimensions)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-02-14 10:32:22 -08:00
1b366fbad8
Merge pull request #7612 from aws-lumberyard-dev/Atom/guthadam/removing_thumbnail_context_from_thumbnail_system
...
Removing thumbnail context from thumbnail system
2022-02-14 10:26:28 -06:00
deeb59cb83
Allow SurfaceManipulator to self-intersect when holding Ctrl ( #6453 )
...
* beginning updates to surface manipulator intersect
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* initial changes to support surface manipulator being able to ignore custom entity ids
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates to use type aliases
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add test for self-intersection test for SurfaceManipulator when holding Ctrl
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2022-02-14 10:19:14 +00:00
645dde9da0
Merge pull request #7463 from aws-lumberyard-dev/box-manipulators-nus
...
Fixing various bugs with collider and box shape manipulators with non-uniform scale
2022-02-14 09:54:16 +00:00
7996591182
Removing thumbnail context from thumbnail system
...
This work has been on hold for a while. Revisiting removal of thumbnail contexts now while debugging related lockups exiting tools from script. Thumbnail contexts are an unused layer of indirection that makes debugging the system more difficult. All systems were only referencing the default context.
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2022-02-11 21:06:38 -06:00
4e6bd3d25c
Consolidate various to_string implementations for math classes
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2022-02-11 17:58:28 -08:00
c0d338a094
Fixed a typo in a comment
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2022-02-11 14:22:08 -06:00
9cd84b6b2d
Only allow streaming image assets with supported pixel formats to be selected for an image gradient
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2022-02-11 13:28:21 -06:00
d39681a767
add deprecation notice to functions in BoxManipulatorRequests
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-11 12:29:00 +00:00
f2233f90cd
update bus usage to new preferred convention
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-11 12:20:31 +00:00
7a63d33f92
extract reused manipulator scaling logic
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-11 12:01:22 +00:00
2ad3cb770b
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-10 17:23:25 +00:00
36285aa834
apply minor feedback from PR
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-10 17:22:41 +00:00
a715897699
Merge pull request #7439 from aws-lumberyard-dev/TerrainMaterialsFix
...
LYN-8403 Prevent the same Surface Tag from getting reused
2022-02-10 15:59:24 +00:00
dac3bc4ba6
Added option to disable edit button in asset widgets when there are no asset selected. ( #7521 )
...
Added new attribute "DisableEditButtonWheNoAssetSelected" to PropertyAssetCtrl. By default it's false, keeping the original behavior of leaving the edit button enabled and if it's clicked while there is no asset assigned it'll try to create a new one.
PhysX mesh asset property uses now this new feature.
Signed-off-by: moraaar moraaar@amazon.com
2022-02-10 12:23:38 +00:00
469fcc4fb2
Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix
2022-02-10 10:40:38 +00:00
1c3a61983a
Refactor EditorEntityUiHandlerBaseto be explicitly Outliner-focused. This lays the groundwork for multiple widget-based handlers in the future. ( #7443 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-02-09 20:50:32 -08:00
220eeef386
Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/boxSelectAndManipulatorsHidingTests
2022-02-08 18:39:33 -08:00
8c54513867
Add box selection tests for Editor Focus Mode
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-02-08 16:59:25 -08:00
90503f2bef
Remove error message from InMemorySpawnableAssetContainer ( #7499 )
...
* Remove error message from InMemorySpawnableAssetContainer
Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com >
* Fix nits
Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com >
2022-02-08 15:25:35 -08:00
48313cd6de
Remove const reference to prevent issues in nightly builds. ( #7491 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-02-08 12:40:10 -08:00
231c25df89
Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix
2022-02-08 12:49:12 +00:00
1db12ca463
Always store LinkIds during prefab instance serialization except when saving to disk ( #7444 )
...
* Always store prefab instance linkIds to DOM except for saving to disk
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Added more checks to remove linkIds from templates
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
* Remove additional check to remove LinkId during template update
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
2022-02-07 17:59:13 -08:00
e7857120b0
Fix issue with clearing the parent entityId in the transform would result in prefab reparenting. ( #7464 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-02-07 13:35:48 -08:00
ffdd3e85ac
merge from development
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-07 18:48:03 +00:00
d37315c2af
tidy up bus usage
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-05 10:39:13 +00:00
08eb115e26
fix various issues with collider manipulators and non-uniform scale
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-02-05 10:39:11 +00:00
dc6d8ab2ba
Fix conversion issues blocking nightly builds.
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-02-04 17:21:48 -08:00
13268dea98
Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix
2022-02-04 20:23:36 +00:00
9aece3e84b
LYN-8403 Prevent the same Surface Tag from getting reused
...
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com >
2022-02-04 19:57:29 +00:00
76b2932cae
{lyn7307} disable saving procedural prefabs in the Editor ( #4877 )
...
disable saving procedural prefabs in the Editor since the templates are backed by asset files that will change outside the Editor
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com >
2022-02-04 08:50:14 -06:00
69c8ebd7fb
Prefabs UI | Finalize RootAliasPath as a standardized instance handle system, and refactor PrefabFocusHandler to take advantage of it. ( #7365 )
...
* Move the RootAliasPath class definition to the Prefab EOS. Introduce utility functions to enable using the path as an instance handler in UI.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Refactor the PrefabFocusHandler to use the utility functions that were introduced to the Prefab EOS. Remove the m_instanceFocusHierarchy from the Focus Handler, and simplify calls for performance.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor adjustments after PR discussion
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Silly mistake in function simplification. Turns out == and != are different.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fixed doxygen comments
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Add numeric cast when storing result of AZStd::distance to int.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Restore additional checks in FocusOnparentOfFocusedPrefab that got removed during merge.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-02-03 11:13:19 -08:00
50128e7a7c
Fix for Lua properties not loading properly in play-in-editor. ( #7369 )
...
* debug information for lua script error
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
* actual fix for script properties not being loaded in play-in-editor unless modified or editor restarted
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
* remove debugging artifacts
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2022-02-03 10:31:45 -08:00
65e651388c
Add tests for FocusOnParentOfFocusedPrefab. Refactor tests to match, and re-enable disabled tests as the fixture now correctly supports the Prefab EOS. ( #7372 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-02-03 08:01:30 -08:00
daeab4bbb1
Focus Mode | Switch instance referencing in Prefab Focus Handler to use more reliable Instance handles ( #7304 )
...
* Add function to Prefab Instances allowing to get a reference to a nested instance by alias.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Refactor the Prefab Focus Handler to use RootAliasPaths to store the reference to the currently focused prefab instance instead of the previous method (entityId of the prefab container).
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Use existing FindNestedInstance method instead of adding new one.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor fixes to style and comments
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Removing indexing in GetInstanceReferenceFromRootAliasPath, turn variables into constants where possible.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Modified the Prefab Focus test fixture to ensure the entity hierarchy is generated under the Prefab EOS, allowing tests to work with the new implementation of the focus mode handler.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Ensure RootAliasPath is iterated by reference in GetInstanceReferenceFromRootAliasPath
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-02-02 09:17:59 -08:00
c1b53f1284
[LYN-4034] Asset Processor: Sqlite inclusivity fix ( #7291 )
...
* Update sqlite package for windows
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Add assert to make sure sqlite header and lib version match
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Update linux
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Update Builting Package / Mac for Sqlite 3.37.2-rev1
Signed-off-by: spham <82231385+spham-amzn@users.noreply.github.com >
* Re-add newline at end of file
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Inclusivity: change sqlite_master to sqlite_schema alias
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
Co-authored-by: spham <82231385+spham-amzn@users.noreply.github.com >
2022-02-02 09:04:27 -08:00
fd20b028a6
Deprecate IsPrefabSystemForLevelsEnabled and use IsPrefabSystemEnabled everywhere ( #7327 )
...
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com >
2022-02-01 13:37:47 -08:00
dd0f21b460
Fix incorrect icon rendering ( #6454 )
...
* fix incorrect icon rendering
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add redundant parens
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add tests for icon display fixes
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update references to EditorVisibleEntityDataCache to EditorVisibleEntityDataCacheInterface
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates following review feedback and remaining updates for EditorVisibleEntityDataCacheInterface
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2022-02-01 09:36:42 +00:00
e1c7dce7a7
Fixes issue with painters being saved and not restored in some cases, which would print numerous warnings in the VS console. ( #7296 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-01-31 15:45:34 -08:00
d7b3d33711
chore: simplify logic for handling expanding entries in Outliner ( #5219 ) ( #5394 )
...
* chore: simplify logic for handling expanding entries in Outliner
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* bugfix: fix bottom border for collapsed prefabs.
issue: https://github.com/o3de/o3de/issues/5219
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: revert changes for expanding entities
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2022-01-31 09:57:34 +00:00
3a08a3b325
Removed some unused local variables.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2022-01-27 12:38:57 -08:00
4471b7008d
Merge branch 'development' into Prefabs/PlayInEditorMissingAssets
2022-01-27 09:51:06 -08:00
94919fe270
Moved Serialize Context retrieval out of a loop and expanded an error message in InMemorySpawnableAssetContainer::LoadReferencedAssets.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2022-01-27 09:47:12 -08:00
61b494a3c7
fix for changes in non-uniform scale component mode not persisting
...
Signed-off-by: greerdv <greerdv@amazon.com >
2022-01-27 13:56:24 +00:00
498e5b738f
Removed SetAutoLoadBehavior from InMemorySpawnableAssetContainer.
...
These calls didn't have any practical effect and created confusion, so they were removed.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2022-01-26 16:40:53 -08:00
d605b5636d
Merge pull request #5532 from aws-lumberyard-dev/optimization/unused_files
...
Optimization: remove unused files
2022-01-26 08:19:08 -08:00
1a7a350880
Introduce a new Focus Mode API function to retrieve full list of EntityIds that are in focus. ( #7159 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2022-01-26 08:12:34 -08:00
27a75fa6a1
Addressing feedback for the Play In Editor missing asset fixes.
...
- Deduplicated code for StoreInstanceInPrefabDom.
- Used QueueLoad to load an asset instead of starting a load by getting a new asset instance.
- Extended the error information when failing to load an asset.
- RefreshPrefabDom no longer returns a boolean as it wasn't used.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2022-01-25 18:15:09 -08:00
6fad254b59
Merge branch 'development' into optimization/unused_files
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/IEditorImpl.cpp
# Code/Editor/IEditorImpl.h
# Gems/LmbrCentral/Code/Tests/lmbrcentral_editor_tests_files.cmake
2022-01-25 15:40:30 -08:00
puvvadar
Danilo Aimini
Guthrie Adams
Tom Hulton-Harrop
greerdv
Guthrie Adams
Chris Galvan
greerdv
SergeyAMZN
moraaar
Sergey Pereslavtsev
chiyenteng
srikappa-amzn
Allen Jackson
carlitosan
amzn-mike
Michael Pollind
AMZN-koppersr
Esteban Papp