* Move "Open pinned Inspector" to separate handler to move it after the Prefab menu items.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Rearrange context menu items, add shortcuts
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix pragma once in header
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Revert casing changes that would cause issues in automated testing.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Updated Launching of Lua Editor to supply the project-path
The Lua Launch logic also uses the AzFramework ProcessLauncher instead
of Qt. This has the benefit of being able to pass arguments as an array
instead of in a single string. Therefore paths with spaces in them also
work.
Tweak the Settings Registry logic to locate the
project-path/engine-path by scanning upwards for a
project.json/engine.json respectively to inject the found paths to the
front of the command line parameters instead of the back.
This has the effect of making sure that command line parameters for the
project-path/engine-path always takes precedence over scanning upwards
for a project.json/engine.json.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Removed prepend of EngineRoot in CheckProjectPathProvided
The Editor would attempt to validate that the project path supplied via
the command line contained a valid project.json file before contining
the Editor startup flow.
This was taking the engine root path and appending the project path to
it, which works when the project path is absolute
But when the project path is relative it is treated as relative to the
current working directory by the SettingsRegistry, but the logic in the
CheckProjectPathProvided was treating it has relative to the engine
root. Therefore supplying a relative path as part of the Editor.exe
launch command would fail.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Fixed resolving of relative paths to absolute paths in the Editor
The Editor was changing the current working directory to the nearest
ancestor directory containing an `engine.json` file.
This resulted in the ConvertToAbsolutePath function resolving relative
paths to that directory instead of the launch directory of the Editor.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
* Change the Ctrl+S flow to save the currently focused prefab instead of the root.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Ensure the Outliner is refreshed on save
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Rename ExecuteClosePrefabDialog to be more accurate (the function also does the saving, it's not just creating the dialog).
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Minor changes to labeling.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Adjust labeling to reflect changes in behavior.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Revert labeling changes
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Additional checks to guarantee the system works in test mode
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Additional check to prevent crashes when the editor somehow triggers save during automated tests.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Simplify checks
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Update preferences and dialog labels to reflect new behavior.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Ensure that the system works at startup and after Clear. Ensure the invalid entityId is not added to the list.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Return a const reference to the list of entities in FocusModeInterface
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix SetFocusRoot to trigger notifications appropriately
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Optimize the entity removal via swap and pop, since we don't care about the order.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Introduce additional check to prevent possibly adding the same entity to the list twice.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix mock after API changes
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Typo.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fixed logic that needed to be updated when the code was moved.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Cleaned up issues with multiple components ? button
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
* Commit for merge
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
* Commit before merge
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
* WIP
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
* Before merge from development
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
* Updated all HelpURL
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
* Changes from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
* Changes from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
* Split up the save/load handling functions from PrefabIntegrationManager to improve maintainability.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Turn WarnUserOfError into a widely available utility function.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Consolidate the definitions for AzToolsFramework Entity classes (List, IdList, IdSet) to avoid multiple redefinitions across the module.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix usage of EntityIdList I missed in the tests.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* Fix EntityList def in SliceConverter
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
* 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>
* 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>
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>
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
* 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>
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>
* 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>
* 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>
* 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>
* 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>