Commit Graph

660 Commits (33cbc2db219cb77d088cb15c1774c86d9b1be9aa)

Author SHA1 Message Date
Chris Galvan 8d8504aec3 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
Chris Galvan 2d89c60175 [LYN-2255] Updated Prefab Duplicate to select the newly duplicated entities. Also addressed some other PR feedback. 5 years ago
Tom Hulton-Harrop eb31d90ad9
Updates to fix BoxSelect when using Orbit with the new Camera (#825)
* update camera controller to block box select during orbit

* simplify update for modern viewport camera controller

* wip working lmb box select with orbit

* add test for changes to click detector

* add unit test for camera system to validate events

* remove debugging code, tidy-up changes for PR

* small updates before posting PR

* fix for linux build failure
5 years ago
daimini 2112d67b6b Rename variable to make it clearer it's a map 5 years ago
daimini e638c6b0d5 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix 5 years ago
sphrose 815e750439
Merge pull request #94 from aws-lumberyard-dev/LY-113714
Ly 113714 QT Widget component card updates - Array: Bold title and add separator bar.
5 years ago
greerdv 7def4741cd merge from main 5 years ago
igarri 0b50b6cc63 Fixed code Style and minor issues from feedback 5 years ago
daimini 977030a27a On prefab creation, inherit the patches when moving the nested prefab instances and then update the link with the new parent if necessary. 5 years ago
AMZN-puvvadar 29b4ab6ff3
Merge pull request #522 from aws-lumberyard-dev/mp_editor_pipeline
Integrating network prefab processing with Multiplayer.Editor to enable server launch on Ctrl+G via an Editor specific network connection
5 years ago
daimini a4953a5204 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
5 years ago
daimini bb458254a2 Polish pass - rename arguments to be more generic, add comments, restore patches to links during instantiation that were mistakenly removed in previous changes. 5 years ago
Chris Galvan 0959756f73 [LYN-2255] Implemented duplication of entities with prefabs. 5 years ago
igarri ec784b005f More Corrections 5 years ago
igarri f49e4b3333 modified code from feedback 5 years ago
igarri 1c2b8f9111 Adding AZ_CVAR for the new feature 5 years ago
srikappa 761a77a436 Avoid creating a new list for non-container top level entities 5 years ago
srikappa eb873f246a Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 45074c651a Fix bugs with creating prefabs with nested entities 5 years ago
daimini bcaf4209d5 Move some logic to a helper function. Revert order of link creation operations as they are not necessary to fix the bug, so it is preferred to leave them untouched. 5 years ago
puvvadar 6f3f5268d8 Fix build error on unity builds 5 years ago
daimini d0b6ae47ed Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
5 years ago
Mike Balfour d084027b6e
Bugfixes to enable slice-to-prefab conversion to run with less warnings/errors/crashes (#768)
While trying to process all slices and levels in Automated Testing, a few bugs came up that needed to be addressed:
- [LYN-3832] TransformComponent had a field removed without updating the version number and converter, which caused a lot of excessive warnings
- SliceComponent would crash in debug builds on instantiation failures due to a null dereference that was guarded against in most but not all places
- SliceConverter now detects when nested slices exist and gracefully warns about it.
- InstanceUpdateExecutor / TemplateInstanceMapper will now immediately remove instances that are unregistered, so that any in the queue don't get processed on a subsequent tick.  This was causing crashes when the instance was destroyed before the processing occurred.  It also has a side benefit of preventing the same instance from executing multiple times.
- Minor logic bugfix to the pack close warning, the boolean check was flipped.

Also added an early-out on SetTemplateId, since this was causing some unnecessary instance queue entries.
5 years ago
Tom Hulton-Harrop f4106fe73f
Add 'Goto entity' support for the new Editor camera (#743)
* add find entity in viewport functionality to new camera

* fix AZ_CVAR usage

* updates following review feedback

- updated comment styles from /// to //!
- retrieve fov of camera (add test for fov access)

* update namespace naming, fix AZ_CVAR usage

* update missed namespace and use AZ::Transform::CreateLookAt

* add missing include

* move EditorViewportSettings to EditorLib

* update DLL import/export API and rename namespace usage
5 years ago
igarri 61ac423ebd Deleted unused files 5 years ago
igarri b9c9811d35 Fixing qobject_cast to the StringFilter 5 years ago
greerdv 18a6134e2d Merge branch 'main' into non-uniform-scale-manipulators 5 years ago
greerdv 7edef63884 address PR feedback 5 years ago
puvvadar fb51829360 Resolve MP Gem Ctrl+G changes with main 5 years ago
puvvadar 1915b97c16 Cleanup server launch, misc. MP consts, and register Editor Spawnable assets server side 5 years ago
daimini 12760ef6a3 Remove unused container entity retrieval 5 years ago
srikappa-amzn 0cfc7f10a9
Merge pull request #728 from aws-lumberyard-dev/Prefab/CyclicalDependencyCheck
Detect cyclical dependencies in the nested prefabs of the prefab being instantiated
5 years ago
daimini 70c968f829 Fixes issue with relative positioning of children on Prefab creation. Makes CreateLink more generic to facilitate reuse. 5 years ago
greerdv d878932966 merge from main 5 years ago
srikappa 1a456cc9b9 Marked an our parameter correctly and changed a ref to const ref 5 years ago
greerdv f2d415ecb8 add functionality for central scale manipulator 5 years ago
nvsickle cc986f563a Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 5 years ago
srikappa-amzn f6767cec2f
Merge pull request #751 from aws-lumberyard-dev/Prefab/DeletePrefab
Fixed bug with delete prefab where the prefabs were not being deleted from the correct instances
5 years ago
greerdv c8568a7cf2 add feedback from PR 5 years ago
greerdv 068deea918 remove unnecessary overrides 5 years ago
greerdv e9386bcb9b remove unecessary overrides 5 years ago
igarri d5591e52ff Merge branch 'main' into LYN-1767-AB 5 years ago
igarri cff9fea535 Switching views with filters 5 years ago
greerdv 737178b928 Merge branch 'main' into non-uniform-scale-manipulators 5 years ago
greerdv 5508bf7e1d remove unnecessary non-uniform scale manipulator bus 5 years ago
greerdv d365d00abd hook up non-uniform scale manipulator callbacks 5 years ago
srikappa b72836fa8f Fixed a typo 5 years ago
srikappa d8865a8f0d Remove links when deleting prefabs 5 years ago
srikappa 16b2dabde2 Removed additional spacing 5 years ago
srikappa 9328c944b2 Remove an unnecessary check in the if statement 5 years ago
srikappa 7d8180a3bb Fixed a typo 5 years ago
srikappa b92a68f5a4 Improved a comment 5 years ago
srikappa cd4be3a708 Found a better way to find common owning instance 5 years ago
srikappa 76e8a0ef47 Fixed bug with delete prefab where the prefabs were not being deleted from the correct instances 5 years ago
greerdv 41ea7a1b81 add stubs for non-uniform scale component mode 5 years ago
Tom Hulton-Harrop 795aa114e6
Improve selection in the viewport (#720)
* improve selection in the viewport

* remove debug code

* updates following review feedback

- update API comments from /// to //! from
- add [[nodiscard]] attribute to member function
- move constructor implementations to .cpp files

* use lambda instead of ternary operator

* fix unit test failure caused by typo
5 years ago
igarri 33240c9f90 Selecting assets from tableview 5 years ago
Hasareej a13c9e8d53
Hasareej lyn 2301 cluster space (#717)
ViewportUi widget anchoring & alignment update.
5 years ago
igarri d7ca3f273b croll to top on view when the filter updates 5 years ago
igarri d6868df735 Expanding TableView Columns 5 years ago
sphrose 36a79aca8a Remove redundant function. 5 years ago
greerdv ce3842ac84 Merge branch 'main' into non-uniform-scale-compatibility 5 years ago
srikappa-amzn 1895c2d18d
Merge pull request #675 from aws-lumberyard-dev/Prefab/CreatePrefab
Get instantiation to work after creation of a prefab is undone
5 years ago
srikappa 7bdf44a099 Detect cyclical dependencies in the nested prefabs of the prefab being instantiated 5 years ago
greerdv 059f69e5e6 tidy up NonUniformScaleService compatibility 5 years ago
srikappa 98a579abef Added a comment 5 years ago
nvsickle 559798251d Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 5 years ago
bosnichd 7cec2d8b07
Remove more unused things from CryCommon and CrySystem. (#709)
Lots of unrelated removals, I basically tried to remove everything exposed via gEnv that isn't used anymore, and following the threads found a few other things to remove also.
5 years ago
igarri c1e21185b4 Selecting correct indexes from Asset Browser Model 5 years ago
igarri 80684b383b Code cleanup 5 years ago
igarri 1c990b2ef6 Filter Sorting Working 5 years ago
kberg-amzn deae9db5c2
Merge pull request #704 from aws-lumberyard-dev/MultiplayerComponents
Removing unused GridMate touchpoints from AzFramework, and non-inclusive code removal
5 years ago
sconel 4e54df49db
Merge pull request #438 from aws-lumberyard-dev/Spawnable/ProductDependency
AddProductDependency to handle inter-product dependencies in PrefabProcessors
5 years ago
karlberg 318f97a717 build fix for removed gridmate headers 5 years ago
karlberg 74385a575f Merge remote-tracking branch 'origin' into MultiplayerComponents 5 years ago
srikappa 33af6c1014 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
karlberg 3e13dd52d1 First pass, removing gridmate touchpoints from AzFramework and non inclusive terminology purge 5 years ago
mbalfour 899d4c438d Move ThumbnailerNullComponent into AzToolsFramework so that it can be used by other tools that need it.
SerializeContextTools will soon rely on this.
5 years ago
srikappa b11234097d Fixed a capitalization issue 5 years ago
Mike Balfour 9ccddab552
Merge pull request #694 from aws-lumberyard-dev/mbalfour/slice-prefab-converter
Fix up incorrect autoDelete use and handling.
5 years ago
sconel c2a9ab18e4 Merge branch 'main' into Spawnable/ProductDependency 5 years ago
sconel 2e32b2ee57
Merge pull request #671 from aws-lumberyard-dev/Prefabs/AssetPreload
Asset Preload fix for json serialization and prefab game mode
5 years ago
mbalfour 704443ac89 Fix up incorrect autoDelete use and handling.
Several UI property handlers were incorrectly using the autoDelete feature by calling UnregisterPropertyType and deleting the pointer themselves, which caused double-delete crashes on application shutdown.  PropertyManagerComponent now gracefully handles that condition but also explicitly asserts explaining how the code should be changed, and the "known offenders" have been fixed up to use autoDelete correctly.
5 years ago
Tom Hulton-Harrop b5e5a3bfee
More camera fixes for the new CameraInput system (#667)
* use new ViewportContext interface to set camera transform on load

* WIP fixes for camera viewport handler callbacks

* disable synchonization with old camera when new camera system is enabled

* further updates to camera-input

* ensure event is signalled when camera transform is set

* updates to ModernViewportCameraController

* fix for right click menu appearing with camera

* updates following review feedback

* convert std:: usage to AZStd::
5 years ago
sphrose b08643d9da Use renamed functions in stylesheet. 5 years ago
sphrose 7276253c42 renamed function 5 years ago
sphrose 9bea26511f Merge branch 'main' into LY-113714 5 years ago
Danilo Aimini d61c93a7b6
Merge pull request #431 from aws-lumberyard-dev/Prefab/Create/IgnoreLevel
LYN-3211 | Create Prefab can be triggered on the Level Container, generating an invalid level hierarchy
5 years ago
Terry Michaels 8ddfcabae7
Removed unneeded comments (#673) 5 years ago
sconel 36911723c2 Addressed PR feedback 5 years ago
nvsickle 3c315df36f Fix Camera transform property notifications.
Moves transform notification logic from CComponentEntityObject::InvalidateTM (which will eventually go away) to AzToolsFramework::TransformComponent::OnTransformChanged.
We also specifically make sure PropertyEditorEntityChangeNotifications::OnEntityComponentPropertyChanged fires, which is used by Track View to detect camera position changes.
5 years ago
sconel 93974dd1c5 Seperated queue load and blocking load calls so queue loads aren't interrupted. Added comment about asset dispatch events 5 years ago
sconel f7ea02afdc Fix for NetworkingProcessor using CreateSpawnable without ReferencedAssets arg 5 years ago
sconel 17ccf90480 Updated function header comment 5 years ago
sconel 4c0fdf78bc Added error messaging, cleaned up LoadReferencedAssets 5 years ago
srikappa 886fe22b16 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa b57dd02d90 Removed a debug print command 5 years ago
puvvadar b21553f64d Merge branch 'main' into mp_editor_pipeline 5 years ago
sconel 2e9ae76596 Removed print statement, adding in new files that were missed 5 years ago
srikappa 4994103627 Add const ref function parameters as needed 5 years ago
sconel b04bfc459f Asset Preload fix for json serialization and prefab game mode 5 years ago
srikappa 0da6e450a6 Improved comments 5 years ago
Tom Hulton-Harrop b2523217c3
Update snapping settings to be stored in the Settings Registry (#646)
* add overload to ActionManager to support capturing an AZStd::function

* move snapping settings to new settings registry

* remove unneeded reference in ViewportSettings

* move viewport setting function implementations to .cpp file

* add more sensible default values for snapping

* fix variable name for angle snapping

* remove const from function prototype value parameters

* add import/export api for free functions

* change from std::bind to a lambda

* remove redundant const for constexpr string_view

* add AZStd alias for std::abs
5 years ago
kberg-amzn bdaa7eb3c1
Merge pull request #544 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components, visibility fixes for gameplay runtime and localprediction player controller component.
5 years ago
bosnichd 440c40e490
Remove (almost) all references to pRenderer (#651)
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
5 years ago
igarri 6e15e87e41 Asset Browser Table view filtering 5 years ago
jjjoness 9a113c083d Checked all Search boxes and made them compliant with UX specs. 5 years ago
sphrose 29f3185c0b Merge branch 'main' into LY-113714 5 years ago
igarri 662951eb98 Merge branch 'main' into LYN-1767-AB 5 years ago
igarri 65550d3f1c Entries updating on the table view 5 years ago
karlberg 6b9ecc69c9 two more unit test touchpoints where core systems may not be initialized 5 years ago
Danilo Aimini 656a8443bc
Merge pull request #382 from aws-lumberyard-dev/Prefab/Instantiate/Loop
LYN-3245 | Detect circular dependencies on Instantiate Prefab and cancel operation
5 years ago
daimini e24827efb3 Fix direct editing of a reference 5 years ago
karlberg ae8a49c4ef fix bad merge 5 years ago
daimini 4662290d92 Switching IsPrefabInInstanceAncestorHierarchy to use const refs 5 years ago
daimini 47001dc0c3 Merge main 5 years ago
karlberg 1df2fe1d48 Merging latest origin 5 years ago
srikappa 1c04160966 Added a missing header 5 years ago
srikappa eb8084d3f6 Initial draft for getting instantiation to work immediately after creation is undone 5 years ago
puvvadar c4115fca11 Merge branch 'main' into mp_editor_pipeline 5 years ago
greerdv 9f5987d431 Merge branch 'main' into non-uniform-scale-ux 5 years ago
greerdv 3817c05d81 fixing unit test 5 years ago
Tom Hulton-Harrop c5a06b8953
Restore grid and angle snapping (#640)
Restore grid and angle snapping (LYN-3367)
5 years ago
greerdv 4202f646e4 Merge branch 'main' into non-uniform-scale-ux 5 years ago
greerdv 9e22268107 feedback from PR 5 years ago
greerdv 2c6d04f673 feedback from PR 5 years ago
karlberg c21b4a577d Merge remote-tracking branch 'origin' into MultiplayerComponents 5 years ago
AMZN-mnaumov 5fb923738e
Merge pull request #614 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15474
[ATOM-15474] Material Editor camera controller zoom respects viewport boundary
5 years ago
puvvadar 108f4dfdd6 Merge branch 'main' into mp_editor_pipeline 5 years ago
greerdv ad6479967f changing add NUS button from invisible to read only when NUS component already present 5 years ago
mnaumov dfd0cbb0fd Material Editor camera controller zoom respects viewport boundary 5 years ago
chiyenteng ede1889507
[CherryPick][LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#585)
* [LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#490)
5 years ago
karlberg 751d13dd7b Merge remote-tracking branch 'origin' into MultiplayerComponents 5 years ago
rgba16f 7b95b5e329
Merge pull request #556 from aws-lumberyard-dev/MoveDebugDisplayGlobalID
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework
Rename g_mainViewportEntityDebugDisplayId to g_defaultSceneEntityDebugDisplayId
5 years ago
greerdv 45cbe4767f adding comment to AddNonUniformScaleButton 5 years ago
greerdv a49017ec23 merging from main 5 years ago
greerdv e1f7d04bc2 adding icon for non-uniform scale component 5 years ago
Tom Hulton-Harrop cec56d7b27
Merge pull request #546 from aws-lumberyard-dev/hultonha_LYN-2315_camera-phase-4
Camera Updates - Part 4
5 years ago
sphrose 7eb6cc10b6 Made change affect all modifiable containers. 5 years ago
greerdv cd93df4ca8 hiding button to add non-uniform scale when there already is a NUS component on the entity 5 years ago
srikappa-amzn a5ccfa6053
Merge pull request #456 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix undo for nested prefab creation by providing link patches to the undo node
5 years ago
rgba16f 1c1a9aeab4 Merge remote-tracking branch 'upstream/main' into MoveDebugDisplayGlobalID 5 years ago
rgba16f 593528532f Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework and rename it to g_defaultSceneEntityDebugDisplayId 5 years ago
greerdv 5e94c9c838 fixing highlighting behaviour when trying to drag components above non-uniform scale component 5 years ago
jackalbe 8b1251c9f7
{LYN-2185} Helios - Added GraphObjectProxy::GetMethodList() function (#392)
* {LYN-2185} Helios - Added GraphObjectProxy::GetMethodList() function

* Updated the EditorPythonConsoleInterface to get Python type name info
* Added PythonBehaviorInfo to the GraphObjectProxy object to reflect abstract calls that can be invoked
* removed SCENE_DATA_API from Reflect() function

Jira: https://jira.agscollab.com/browse/LYN-2185
Tests: Added tests GraphObjectProxy_GetClassInfo_Loads & GraphObjectProxy_GetClassInfo_CorrectFormats to regress test

* fix compile error

* etchPythonTypeName() returns AZStd::string

* put None into a const char
5 years ago
greerdv d9b3b7ccfa adding non-uniform scale component via button on transform component and forcing it to be adjacent in the component sort order and visible 5 years ago
hultonha a206896074 remove QPoint from lower-level interfaces, switch to use AzFramework::ScreenPoint 5 years ago
karlberg bbe3fcfdd9 Cleans up some debug code 5 years ago
sphrose 3e42e8ed14 merge main 5 years ago
karlberg d0a561fa01 merging latest origin 5 years ago
karlberg d5ad5d9596 Removing some more ebus dependencies within the vis system 5 years ago
lumberyard-employee-dm bcbe1bfef7
LYN-2537 AssetBundler updates (#426)
* LYN-2537 Updated the AssetBundler code to looks for the AssetSeedList
files within the Assets/Engine directory
Updated the MissingDependencyScanner GetXMLDependenciesFile functions to
use the Assets/Engine directory as well

Also fixed the MissingDependencyScanner to properly located dependency
xml files within gem directories

* Adding back input argument validation for the AssetBundler command options.

Also added an application_options settings registry file that contains the list of valid command options for the ComponentApplication

* Adding missing end of file newline for applications_options.setreg

* Fixed the AssetBundler help output for the bundleSeed command
5 years ago
srikappa a7624bb985 Removed returning AZ::Failure when AZ::Assert is thrown 5 years ago
karlberg 822368ef01 Changes to get visibility system working again in-game 5 years ago
Chris Galvan 8b0b3f4d02 [LYN-3078] Removed legacy CMaterial and all related/unused classes. 5 years ago
puvvadar 2f4120cdfb Update Ctrl+G logic to account for prefab processing status and timing 5 years ago
AMZN-koppersr 5eeeaf4346 Fixed several release build compile errors. 5 years ago
AMZN-mnaumov bdd276d209
Merge pull request #467 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15426
[ATOM-15426] Fixing missing asset crashing Editor
5 years ago
mnaumov e7600cef94 PR feedback 5 years ago
mnaumov 01bba93f28 PR feedback 5 years ago
greerdv c8e8c1de66 Merge branch 'main' into non-uniform-scale-ux 5 years ago
Chris Galvan 6ace9ffedb [LYN-1731] Removed temporary bus for checking if the new viewport interaction model is enabled. 5 years ago
greerdv cee4ca8067 WIP adding button to transform component to add non-uniform scale component 5 years ago
mnaumov ce367b4383 Fixing missing asset crashing Editor 5 years ago
daimini bc3f285601 Refactored IsPrefabInInstanceAncestorHierarchy to use Instance Optional References. Added more information to the error message. 5 years ago
sconel 6e8b1d1000 Update on how we move string values in AddProductDependency 5 years ago
sconel a9de24ef7d Addressed PR feedback on function args and names 5 years ago
srikappa 18c352cdb1 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
daimini 7f971f726d Merge branch 'main' into Prefab/Instantiate/Loop 5 years ago
srikappa d433cd623b Fix undo for nested prefab creation by providing link patches to the undo node 5 years ago
daimini e22398700d Simplified some checks, added early outs. 5 years ago
Chris Galvan 217ba1e816 [LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled. 5 years ago
sconel 15b1ae4b2d Removed excess whitespace 5 years ago
sconel 7df8a88b0e Merge branch 'main' into Spawnable/ProductDependency 5 years ago
sconel 845b748061 Updated PrefabBuilder to include product dependencies defined in AddProductDependency 5 years ago
daimini 8f1499581b Merge branch 'main' into Prefab/Create/IgnoreLevel 5 years ago
Nicholas Van Sickle 3c5c692148
Merge pull request #411 from aws-lumberyard-dev/nvsickle/FixBoxSelect
Fix viewport box selection
5 years ago
daimini 6271aaa77f Exclude level container entity from prefab external reference gathering code 5 years ago
Eric Phister fbdd26bbbc
Merge pull request #410 from aws-lumberyard-dev/ly-sdk/phistere/LYN-2723-Merge
LYN-2723: Fixes issues with bad project or engine paths

Cherry-pick: 6ce7a6d30c57c941459b43c157861df5d9143ae1
5 years ago
AMZN-koppersr 5e4094b258
Revamped AzFramework::Scene (#332)
Updated AzFramework::Scene to allow it to serve as the one-stop location for localized singletons. Localized singletons in this case are instance that can only occur once in an environment but multiple times within an application. As an example, this allows settings up a single camera per viewport for instance.

Highlights of changes:

Replaced the original ebuses with interfaces and events for easy of use and performance.
Removed the Entity Context specific code and moved that to new locations within the Entity Context itself.
Allowed basic inheritance. If a subsystem isn't found in a scene the parent can optionally be searched.
Scenes can enter a zombie state and avoid immediately being deleted. This is needed for situations where subsystems can't be destroyed until async calls have been completed.
5 years ago
Hasareej 9e27929d10
Merge pull request #95 from aws-lumberyard-dev/hasareej_LYN-2475_viewportui_switcher
Initial pass of ViewportUiSwitcher.
5 years ago
nvsickle cbf5a3f5b1 Use aznumeric_cast in EditorBoxSelect::Display2d 5 years ago
lumberyard-employee-dm 3dec5d3b71
LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
5 years ago
nvsickle a90793cb94 Fix viewport box selection rendering 5 years ago
Eric Phister 7dd7e82d86 LYN-2723: Fixes issues with bad project or engine paths (#369)
* Setup NativeUIRequests as an AZ::Interface.  Adds a NativeUISystemComponent to AzFramework Application.

* Renames NativeUISystemComponent (class) to NativeUISystem, since it's no longer a Component.

* Minor update to SettingsRegistryInterface::Remove doc-comments for accuracy.

* Fixes to make an early fatal shutdown of Editor occur without crash.

* LYN-2723: Updates startup to handle errors: engine root is empty, no valid project.json found (mismatched engine name), or bad project path (launch project picker dialog).

* LYN-2723: Minor formatting/spelling edits.

* LYN-2723: Moves ParseCommandLine from ComponentApplication to SettingsRegistryMergeUtils so it can be used in more places.

* Misc fixes. 'wait_for_connect' setting wasn't being properly applied to AP connection settings. Fix infinite loop in CCmdLine::Next.

* LYN-2723: Addresses review feedback.

* LYN-2723: Reverts some changes that caused a unit test to fail.

* LYN-2723: Reverts one more change that was unnecessary.
5 years ago
sconel c3c90cc821 Merge branch 'main' into Spawnable/ProductDependency 5 years ago
chiyenteng efc0cbacba
Prevent AzToolsFramework benchmarks timeout for now (#398) (#403) 5 years ago
srikappa-amzn f6cd7aa5db
Merge pull request #378 from aws-lumberyard-dev/Prefab/CreatePrefab
LYN-3159 - Fixed an assert during loading a level with prefabs that had patches on them
5 years ago
daimini 48c34628f6 Exclude the Level root prefab container when creating prefabs. 5 years ago
srikappa 6947e8fe29 Added an IsObject check for nested instance DOM during link creation that happens during prefab loading 5 years ago
sconel 3b49b59c32 Added AddProductDependency calls to PrefabProcessorContext 5 years ago
Guthrie Adams 518c6cb760
Merge pull request #385 from aws-lumberyard-dev/Atom/guthadam/ATOM-14003
ATOM-14003 adding image thumbnails to material inspector properties
5 years ago
Guthrie Adams 167b7f36a6
Merge pull request #373 from aws-lumberyard-dev/Atom/guthadam/ATOM-15370
ATOM-15370 Fix thumbnail scaling and sizing issues
5 years ago
hasareej 11d39892d5 Fixing QString to QIcon conversion. 5 years ago
hasareej a30c952fa2 Deleting the EditorTransformComponentSelection switcher. 5 years ago
igarri b7c2495911 Working base 5 years ago
guthadam 5cac07b4c1 ATOM-14003 adding image thumbnails to material inspector properties
https://jira.agscollab.com/browse/ATOM-14003
5 years ago
daimini b758a1553f GetTemplateIdFromFilePath now asserts if it's passed an absolute path. This is helpful for debugging, since the function would silently fail even if the file was actually loaded. 5 years ago
daimini c07a7c3766 Detect and block instantiations that would generate circular dependencies in the instance hierarchy. 5 years ago
mnaumov 793d60f150 Merge main 5 years ago
guthadam 1d093f9c29 Merge branch 'main' into Atom/guthadam/ATOM-15370 5 years ago
srikappa 26604fd66c Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 06803040ac Fixed an assert during loading a level with prefabs 5 years ago
guthadam eeafb5eaa3 ATOM-15370 Fix thumbnail scaling and sizing issues
TLDR
Thumbnails size will be removed from the system.
Each thumbnail class is responsible for determining its stored size.
Images and other thumbnail types can be scaled up or down within reason without blurring.

The thumbnail system uses the concept of context and size organize thumbnails by size based on their intended use.  However, most of the thumbnail classes do not respect or use the specified size, which is 16 by 16 pixels and really only usable for small icons.

The thumbnails are currently being used in the asset browser tree control, the larger asset browser previews, the material component property asset controls, the material component inspector for the large preview, and other places.  Each of these places use completely different sizes, some of which are large and change dynamically. Whenever the thumbnails are painted they are scaled to the desired size.

Material and mesh thumbnails were always being captured at 512x512 regardless of what the rest of the thumbnail system said.  Source, product, and folder thumbnails would be stored at the original asset size.  The loading movie thumbnail was always drawn at 16 by 16 and scale up so it was always blurry.  Image thumbnails were always scaled down to 16 by 16 and scale up for larger previews.

Rather than worrying about the size of each context, each thumbnail class will store the image at whenever it deems to be a large enough size that can be scaled down when used.

This may eliminate the need for multiple thumbnail contexts which are not being used anyway.

https://jira.agscollab.com/browse/ATOM-15370
5 years ago
daimini caa982372f Remove include for removed interface in EditorPrefabComponent.cpp 5 years ago
daimini 797ee26f87 Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly. 5 years ago
mnaumov 03e681ca5f Merge from main 5 years ago
mnaumov 5f33337fec Merge main 5 years ago
AMZN-mnaumov a00d47365e
Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
[ATOM-14585] Enlarged thumbnails on hover
5 years ago
greerdv b113f09a71 first pass of changing transform to use float for scale internally rather than Vector3 5 years ago
igarri d6ed9d100e Merge branch 'main' into LYN-1767-AB 5 years ago
hultonha 0952b7bd87 update Cluster file name to ButtonGroup 5 years ago
hultonha 0da9a05d87 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
hultonha 56477b7cc7 merge from main and resolve conflicts 5 years ago
mnaumov fdcb19f45a Reverting some unused code 5 years ago
mnaumov 91f027a05c PR feedback 5 years ago
AMZN-daimini 44f1a627e7
Merge pull request #300 from aws-lumberyard-dev/Prefab/LYN-3100
KEYSTONE USE CASE | Save changes to non-root container entities in the link to the parent instance
5 years ago
mnaumov c4e3c39ee2 PR feedback 5 years ago
Chris Galvan 5d2db78f74 [LYN-3272] Added missing call in unit test. 5 years ago
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 5 years ago
hasareej c85fbe86ba Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
hasareej 9cf8070c9e Styling and Review Feedback Changes 5 years ago
igarri f24ae99b3e Merge branch 'main' into LYN-1767-AB 5 years ago
hultonha fc591e292e tidy-up to some naming for types 5 years ago
hultonha a4b8db2f94 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
hultonha b27daeead5 updates to viewport ui switcher id and usage 5 years ago
mnaumov 0bcc85e4d8 scope pointer 5 years ago
mnaumov 30458bc1be PR feedback 5 years ago
daimini 833ca2767d Fix a bug with level save erasing link information on Instances. All changes to non-root container entities are now saved as patches in the link to the parent instance. 5 years ago
Guthrie Adams fb26308a26
Merge pull request #291 from aws-lumberyard-dev/Atom/guthadam/ATOM-15326
ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
5 years ago
mnaumov 9f4606c17a Removing test code 5 years ago
mnaumov b215d1c098 Enlarged thumbnails on hover 5 years ago
guthadam 923f234d71 ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
This change adds support for streaming image thumbnails in the asset browser tree and thumbnail widget.

This is a prerequisite for displaying image previews inside of the material inspector.

https://jira.agscollab.com/browse/ATOM-15326

https://jira.agscollab.com/browse/ATOM-14003
5 years ago
Chris Burel 28170ffe41 Add newlines to the end of all files 5 years ago
AMZN-daimini e772afa06e
Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
5 years ago
greerdv 540f0dcd98 Merge branch 'main' into non-uniform-scale-trackview 5 years ago
greerdv 40655eba03 removing element-wise scale setters from transform bus 5 years ago
greerdv 099f43237d removing long deprecated transform scale functions 5 years ago
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 5 years ago
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 5 years ago
mnaumov 09a0676b9c Adding custom title to PropertyAssetCtrl 5 years ago
daimini 8f79379bc8 Fixes as per Ram's review 5 years ago
daimini 76739de282 Fix spacing 5 years ago
daimini ea43eb3ac9 Set position of instantiated prefab 5 years ago
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
daimini c9a4b6f50b Better handle the default case for Instantiate 5 years ago
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 5 years ago
hultonha cc4d69f279 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 5 years ago
daimini cf4bbe569b Remove Prefab cache undo node generation for container entities - will move that work to a separate PR. 5 years ago
igarri 0ebe6c6079 Setup Table model and Table view 5 years ago
mnaumov 5f0e7f2cbc merge from main 5 years ago
daimini 67fa4a332b Change CreateLink to return the LinkId 5 years ago
daimini ca8d6f8818 Instantiate Prefab 5 years ago
Luis Sempé 8996976efb
Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
Fixed Lua IDE startup
5 years ago
luissemp 49322b040b Fixed Lua IDE startup 5 years ago
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 5 years ago
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 5 years ago
amzn-sean b0cb5a381b
Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main
LYN-2998
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
fixed entities not being deselected when entering game mode in editor.
5 years ago
mnaumov 5f4275336c Fixing deadlock related to thumbnails
Adding smoothing to thumbnails in AssetBrowser
5 years ago
AMZN-daimini 62bc7a66bb
Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
5 years ago
srikappa-amzn f8c5048b56
Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
5 years ago
srikappa 78892c8d7e Improved a couple of comments 5 years ago
AMZN-mnaumov f4a57663fa
Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
5 years ago
AMZN-mnaumov 3994d80c7e
Merge pull request #148 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15271
[ATOM-15271] Fixing thumbnail pixelation
5 years ago
sphrose b1d8330870 Review fixes. 5 years ago
AMZN-daimini 7901fe8625
Reset the whole Qt model when an entry in the EditorEntityModel is removed. (#48) (#82)
An optimization introduced in Prefab mode currently changes the relative ordering of children, causing stale QModelIndex variables to still be referenced and crash the Editor sporadically. This change is theoretically a bit slower, but still much faster than the pre-optimization times.

Co-authored-by: Shirang Jia <shiranj@amazon.com>

Co-authored-by: Shirang Jia <shiranj@amazon.com>
5 years ago
mnaumov 7e48bee48f Fixing thumbnail pixelation 5 years ago
srikappa 967d182ccc Fixed a couple of typos 5 years ago
srikappa 8d94f45b19 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
mnaumov 6abf17439a Adding "Create New Material" context menu option to folder in Material Editor
Improving MaterialBrowser filter to show empty folders
5 years ago
srikappa 707f7cb6ce Added some comments 5 years ago
srikappa 8bc2998d82 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 65b2d9de1b Added couple of helper functions 5 years ago
Chris Galvan 7f169855f3 Merge branch 'main' into cgalvan/EntityHelperRefactor 5 years ago
srikappa f3ff5ec886 Add helper method for adding link in CreatePrefab 5 years ago
Chris Galvan 06d6ab9715 [LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback. 5 years ago
srikappa 889158e3a9 A couple of minor fixes 5 years ago
sphrose 2dbd9e4a05 Changed to use direct line drawing rather than adding svg. 5 years ago
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 5 years ago
srikappa 22d6e1ec0d Modularized undo instannce update undo operation and enabled setting container entity to be selected 5 years ago
Esteban Papp a6c7815685
SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile 5 years ago
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
amzn-sean beafc80939 Fixed entities not being deselected when entering game mode in editor.
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
jira: LYN-2998
5 years ago
hasareej f6fc8f95a9 Fixed random button highlights & toolbar order. 5 years ago
hasareej 969f94ffb5 Initial pass of ViewportUiSwitcher. 5 years ago
sphrose fece27b1b0 Merge branch 'main' into LY-113714 5 years ago
mcgarrah bff55bd688 LYN-2726 Updated the Settings Registry Merge Utils logic to determine
the project root and engine root to fix issues with running the Editor
or AssetProcessor from within the project folder overriding the
project_path with the engine root bootstrap.cfg project_path entry

The order in which the project path is overridden as follows
1. The <engine-root>/bootstrap.cfg is first merged into the Settings
   Registry. Any '/Amazon/AzCore/Bootstrap/project_path' would be used
   if the following steps don't override that key.
2. Followed by general *.setreg/*.setregpatch files being merged into
   the Settings Registry which can override the
   '/Amazon/AzCore/Bootstrap/project_path' key
3. Next a project.json file searched upwards from the current executable
   directory to determine the project path
4. Finally if a command line parameter that overrides the project path
   is supplied it is used instead
5 years ago
srikappa 0b29e4ffea Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 778d60bd0c Replaced unique instance queue with checks in template to instance mapper 5 years ago
srikappa-amzn 76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
Make creation of new prefabs use a relative path to the project
5 years ago
Terry Michaels 020d7801bb
Make sure Recent Files list is correctly enabled/disabled when the list changes (#73)
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
5 years ago
srikappa c63f09adce Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 5 years ago
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 5 years ago
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 5 years ago
srikappa a371edd07f Initial commit of CreatePrefab work 5 years ago
Chris Galvan 0f13a71bd2 [LYN-2255] Refactored some EditorEntityHelpers so they can be re-used. 5 years ago
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 5 years ago
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 5 years ago
sphrose a71a5746cc [LY-113714]
Jira: LY-113714
https://jira.agscollab.com/browse/LY-113714
5 years ago
Alex Peterson cd12226849
Merge branch 'main' into github/staging 5 years ago
greerdv 8ee92978f4 setting max value for scale 5 years ago
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 5 years ago
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 5 years ago
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 5 years ago
alexpete c2cbd430fe Integrating up through commit 90f050496 5 years ago
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
5 years ago
alexpete 75dc720198 Integrating latest 47acbe8 5 years ago
alexpete a10351f38d Initial commit 5 years ago