Commit Graph

452 Commits (72e5ab44373482d35bfee7b3ba2fcc4c8bf6830f)

Author SHA1 Message Date
Hasareej 4ad97342c2
Hasareej fix whitebox and physx cluster icons (#1398)
Fixing the issue with the icons not appearing & deleting duplicate icons.
5 years ago
Hasareej 75e640b908
Hasareej lyn 4389 fix cluster overlap with ImGui (#1329)
Fixing the cluster overlap with ImGui & a ViewportDisplayLayout alignment issue.
5 years ago
Tom Hulton-Harrop 8ffd16b0be
Ensure SnapToGrid only appears when GridSnapping is enabled LYN-2302 (#1362)
* updates to better support showing/hiding viewport ui when grid snapping is enabled/disabled

* connect up editor settings callbacks

* minor polish changes

* api rename

* updates following review feedback
5 years ago
IgnacioMartinezGarrido d86e8b63c1
Merge pull request #781 from aws-lumberyard-dev/LYN-1767-AB
LYN-1767 : Asset Browser Search View
5 years ago
Tom Hulton-Harrop d9b1ccd323
Add align grid button to Viewport UI (#1311)
* first pass of adding grid snapping button

* update to request current grid size

* show/hide snapping option based on selection

* small tidy-up changes

* small updates following review feedback

* added some unit tests for snapping functionality and some small tidy-up/refactoring

* small refactor to ensure snap to grid ui only appears with snapping enabled

* add missing include to resolve build error

* fixes for build

* add & to make compiler happy
5 years ago
igarri 3ed6b318ab Merge branch 'develop' into LYN-1767-AB 5 years ago
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
5 years ago
sconel bd2a2ebcf5
Merge pull request #1293 from aws-lumberyard-dev/Prefabs/RemoveEditorInfoFromNestedContainerEntities
Fix nested container entities not getting editor info removed during prefab processing
5 years ago
Hasareej aee7fc72cc
Hiding the 2 Clusters during Gameplay mode (#1211)
Hiding the 2 Clusters during Gameplay mode.
5 years ago
sconel e4921c8d0a Fix nested container entities not getting editor info removed during prefab processing 5 years ago
Danilo Aimini f32590d241
LYN-4042 | No UI Indication that Level is Modified (#1277)
* Restore the code that display the dirty marker on the Level container. Ensure the dirty marker is cleared on level save.

* Moving call one level up to allow usage of the SaveTemplateToString function without clearing the dirty flag.
5 years ago
Chris Burel d7ec767ebc
Enable `-Wnon-pod-varargs` (#1278) 5 years ago
Chris Galvan 015f85db20 [LYN-4160] Fixed intermittent crash by changing instantiate prefab dialog to use the AzToolsFramework::GetActiveWindow() helper which always gives a valid active window. 5 years ago
Tom Hulton-Harrop 1435982330
Merge pull request #1265 from aws-lumberyard-dev/tomhh_stabilization-to-development
Stabilization/2106 to Development (for 2021/06/11)
5 years ago
Hasareej 0cee5150c7
Hasareej cluster tooltips (#1181)
EditorTransformComponent Cluster Tooltips
5 years ago
sconel 38b1a89631
Merge pull request #1233 from aws-lumberyard-dev/Prefabs/NestedContainerExport
Fix issue involving missing parent container entities in spawnables
5 years ago
Mike Balfour ffe913a2d6
Added ability to convert multiply-nested slices (#1239) (#1245)
* Addressed feedback from previous PR
* Change missing entity aliases to be deterministic.
When converting slices, this helps produce the same results on multiple reconversions of the same data.
* Exposed the asset filter callback.
This allows the slice converter to specifically load nested slices as opposed to not loading *any* referenced assets.
* Added support for multiply-nested slice instance conversion.

(cherry picked from commit 86136ddfa6)
5 years ago
sconel 40fa0a3a46 Remove optimization pragma 5 years ago
sconel 9efcc3a6b5 Fix compilation error and failing unit test 5 years ago
Danilo Aimini d3be5600c3
Increase rotation step for Transform (#1244)
Using the spinbox on the Transform Component is made very cumbersome by the low rotation step. Increased it to make it more usable.
5 years ago
sconel 856daf1485 Addressed PR feedback 5 years ago
Mike Balfour 86136ddfa6
Added ability to convert multiply-nested slices (#1239)
* Addressed feedback from previous PR
* Change missing entity aliases to be deterministic.
When converting slices, this helps produce the same results on multiple reconversions of the same data.
* Exposed the asset filter callback.
This allows the slice converter to specifically load nested slices as opposed to not loading *any* referenced assets.
* Added support for multiply-nested slice instance conversion.
5 years ago
Terry Michaels 91fb8be535
Added toolbar icons, updated viewport header UX (#1240) 5 years ago
Aaron Ruiz Mora 7a053d82e1
UX Workflow improvements for Physics Materials (#1237)
- Added button to PhysX Collider Component in PhysX Mesh's field to open FBX Settings.
- Added button Material Selection to open the physics material library in Asset Editor.
- Default Material in PhysX configuration is read only and consistent with the text in combo boxes.
- Material configuration field "Surface Type" renamed to "Name"
- Fixed bug in EditorColliderComponent where the material selection was not updated when changing the library.
- Fixed bug where the materials selection was not set to default when a physics material from the asset was not found in the library.
- Added attributes 'BrowseButtonEnabled' and 'BrowseButtonVisible' to PropertyAssetCtrl.
- Updated physx configuration setreg files of AutomatedTesting project.
5 years ago
igarri 5a53c074c2 Fixing Header Data in AssetBrowserTableModel 5 years ago
Terry Michaels adf6d93a06
Moved toggle pivot to lower in the context menu, converted all context menu additions to use a singular mechanism (#1209) 5 years ago
sconel 2dee4d3ac9 Add support to export nested container entities. Resolves missing parents in spawnables 5 years ago
Terry Michaels aa7bab1027
Make SimpleAssetPropertyHandler handle showing the edit button on component cards (#1221) 5 years ago
srikappa-amzn 20dc47e6d0
Merge pull request #1198 from aws-lumberyard-dev/Prefab/RemoveFileSizeLimits
Remove file size limits when loading prefabs and prefab-based-levels
5 years ago
rhongAMZ 3fd2f1305f
Selecting and deleting the level prefab root entity crashes editor (#1179)
Early remove the level instance from the entity id list in the delete function and duplicate function.
5 years ago
igarri be21e585a0 Merge branch 'develop' into LYN-1767-AB 5 years ago
igarri 66bbcb08e5 Fixing Thumbnails preview from TableView 5 years ago
srikappa b23c95cab3 Removed the new added flavor of ReadFile and reused existing one 5 years ago
srikappa 9dec723e33 Remove file size limits when loading prefabs and prefab-based-levels 5 years ago
Danilo Aimini 80f62d0523
LYN-3708 | Optimize Prefab instance propagation to stabilize UX (#700)
* Add instanceToIgnore to calls leading to instances being added to the queue for propagation.

* Change PrefabUndoEntityUpdate to make it so that the instance triggering the prefab template change is not reloaded on propagation, since it will already be up to date due to the way we generated the patch to begin with.

* Add FindPrefabDomValue utility function for paths

* Expose the level root prefab template id in the Prefab EOS Interface

* Fix Instance Alias Path generation to work with the new FindValueInPrefabDom function

* Stop reloading ancestors on propagation, and fix instance reloading so that the level dom is used (and overrides are preserved)

* Remove commented out code, refactor FindPrefabDomValue for paths (was handling an edge case incorrectly, and it's not even triggered)

* Fix issue with PathView reference - with PathView already being a reference, this resulted in a copy and triggered a warning during automated review builds.

* Additional fix to the build warning, remove redundant error message

* Revert changes to Instance::GetAbsoluteInstanceAliasPath(), as they were impacting serialization.

* Remove the dependency to the level root prefab template in the propagation code, climb up the hierarchy instead. This allows tests to work despite not using the EOS properly.
Also use PrefabDomPaths to retrieve the instance dom from the root dom instead of iterating.

* Remove now unused PrefabDomUtils function, extend optimization to link updates.

* Trigger a full instance propagation to correctly refresh alias references.
This is an issue in the test because some operations are called from the backend API and will not trigger propagation properly. Tests will soon be rewritten to more properly represent frontend workflows.

* Fixes lingering issues with propagation:
- Restores code that fixes the selection if entityIds have changed;
- Fixes Do() function on link update. Prefab containers will propagate correctly while still being stable during editing.

* Remove GetRootPrefabInstanceTemplateId (no longer necessary after the code has been rewritten)

* Fix optimization code to account for instances being removed and propagation being run out of order in Create Prefab undo.

* Renamed variable, added comments for clarity.

* Restore asserts on instance not being found; Rename Do to Redo for clarity; Add comments.

* Fixed incomplete comment.
5 years ago
Danilo Aimini 2d1e47793d
Move Duplicate menu items and shortcuts out of the Prefab Wip flag
Make duplicate prefab workflows available by default in Prefab mode.
5 years ago
Terry Michaels 0fcd6e84ec
Added mechanism for viewpanes to request buttons on the main toolbar (#1189) 5 years ago
Esteban Papp 36cb0f6d40
SPEC-7178 Removal of precompiled cpp files (#1171)
* SPEC-7178  Removal of precompiled cpp files

* Missing files...
5 years ago
Nicholas Van Sickle 9e3d472700
Switch EditorContextMenu back to using popup instead of exec (#1158)
Switch EditorContextMenu back to using popup instead of exec

The switch to exec was a deliberate change, but upon further testing with the latest version of our camera input controllers (both the Legacy and Modern variants) it is no longer necessary to call exec, and doing so can cause a bug in which the cursor is still hidden when the context menu appears.
5 years ago
igarri 4f2acd1340 Merge branch 'main' into LYN-1767-AB 5 years ago
Tom Hulton-Harrop cf8a6761bf
Formatting-only change - Update Manipulator and Viewport AzToolsFramework files (#1143)
* formatting changes to AzToolsFramework viewport related types + API comment style updates

* minor format change - include ordering

* improve formatting by moving comment

* fix compile error and switch to use AZ_Printf

* small polish changes after review feedback
5 years ago
Hasareej 5b940e8ed6
Viewport Ui Cluster Locked State Overlay (#1139)
* Viewport Ui Cluster Locked State Overlay

* PR feedback changes.
5 years ago
rgba16f 74f474aae2
Add unit tests for the ViewportScreen ndc <-> worldspace utility functions (#1149)
Add ScreenNdcToWorld function to enable round trip testing.
5 years ago
Tom Hulton-Harrop 05e20803a8
First pass for getting things ready for grid snap button (#1118)
* first pass of change to simplify snapping for snap-to-grid button and fix snapping bug caused by non-uniform scale
5 years ago
igarri 3d1abdc4e3 Pull request corrections, namespaces, style, etc 5 years ago
cgalvan deb3c5e74a
[LYN-2446] Implemented support for duplicating instances. (#1097)
* [LYN-2446] Implemented support for duplicating instances.

* [LYN-2446] Addressed PR feedback.

* [LYN-2446] Addressed additional PR feedback.
5 years ago
Danilo Aimini fda28bb7b2
LYN-1818 | [USE CASE] Reparenting between different prefab instances by drag/drop in the Outliner (#1088)
* Add the last known parent to the prefab undo cache to detect changes in the owning instance.
Still WIP.

* Progress in handling reparenting. Still WIP, need a change in CreateLink that will be addressed in a separate branch and then merged back.

* A few fixes, reparenting now works with entities. Still working on instances.

* Fix assert crashing the Editor because of the arguments being in the wrong order.

* Handle moving the patches when removing and recreating links when reparenting nested instances.

* Rearrange some code to prevent including instance removal in instance update undo node, as it would be redundant and cause errors in some edge cases.

* Reorder instance reparenting to account for correct order of operation during undo/redo

* Fix order of operations to support multiple operations in one edit (reparenting to non-container entities while changing instance)

* Add function to refresh patches on links to allow aliases to be restored correctly on reparenting.

* Removed RefreshEntityPatchOnLink function. Introduced a simpler way of handling porting patches.

* Removing unnecessary code that was left after testing.

* Minor fixes to naming and comments.

* Restore previous error, no longer printing the failed patch.

* Remove unused includes.

* Restore include removed by mistake.

* Simplified patches retrieval by using internal function. Renamed some internal functions and variables to be more accurate.
5 years ago
Mike Balfour d90a3d46a7
Support for nested slice conversions (#1121)
This set of changes enables conversions for singly-nested slices. Multiple nesting hierarchies are only partially supported at this point. Conversion is also significantly more deterministic, which makes it easier to convert single slices without needing to reconvert every slice or level that relies on it as well.
Changes:

- Added version of Instance::AddInstance() that takes in an alias to allow for deterministic aliases
- Added a "SliceConverterEditorEntityContextComponent" that's used to specifically disable entity activation on creation. The disabling is done this way vs adding a new public API, because the disable shouldn't be required in any normal case outside of this tool.
- Disabled more AWS gems for the SliceConverter, as they're unneeded and cause issues if they're around in the tool.
- Added a small null check to the Camera Controller.
- Added the actual support for slice instance conversion. This instantiates the entities, applies the data patches, turns them into a prefab instance, and generates a JSON patch out of the changes.
5 years ago
rgba16f 54fdca353b
Fix editor axis gizmo text rendering above gizmo
Add AzToolsFramework utility function to query the display scale for a viewport.
Use new function to fix the text location on the axis gizmo.
5 years ago
igarri eb67b6b452 Adding namespace aliases and API comments 5 years ago