Commit Graph

407 Commits (bd2a2ebcf580cd9c53e1ea439659ca34009bf08c)

Author SHA1 Message Date
rgba16f d4bad61f9a
DebugDraw gem fixes for Atom (#885)
* Work in progress on adapting the DebugDraw gem to use AzFramework::DebugDisplayRequests API

* Cleanup fixes for DebugDisplayRequestBus & DebugDraw gem.

Remove SandboxIntegration implementation of the DebugDisplayRequestBus
Add DrawWireCylinder & DrawWireCone to the DebugDisplayRequestBus interface
Remove SetFillMode & DrawTexture functions from the DebugDisplayRequestBus interface
Fixup uses of the SetFillMode api, replace with new Draw[Wire|Solid]X functions.
Fixes to the DebugDraw gem to get it compiling with new warnings settings.

* Changes to get the DebugDraw gem working with Atom/RHI/Code/Include/Atom/RHI

Add GetWidth, GetHeight, GetDepth utility accessors to RHI::Viewport
Start cleaning out unnecessary Cry includes from DebugDraw gem
Fixes for AtomFont FFont.cpp 3d screen aligned text drawing.
Clean out no longer supported code for 3d text to render multiple strings for the same entity location

* Cleanup some unused or commented code

* Update with PR feedback from Nick Van Sickle
5 years ago
amzn-sj 86932f95d6 Fix more Linux test failures. 5 years ago
greerdv fadd227698 fix aztoolsframework tests 5 years ago
greerdv 0315d97fe6 fix white box editor physics tests 5 years ago
greerdv 945f55378e merge from main 5 years ago
mnaumov ff2a6c3acd Asset hint displays product name instead of source name 5 years ago
amzn-sj d369912727 Merge branch 'main' into LYN-2461 5 years ago
cgalvan 6f23138338
Merge pull request #809 from aws-lumberyard-dev/cgalvan/DuplicateEntities
[LYN-2255] Implemented duplication of entities with prefabs.
5 years ago
Terry Michaels d785b3310f
Make sure to autoscroll to a selected entity after a rename (#872) 5 years ago
Chris Galvan 21620a0d73 [LYN-2255] Fixed additional alias replacement case, and removed now unneeded specific alias replacement. 5 years ago
amzn-sj e54963f0a9 Set project_path in the SettingsRegistry in the test SetUp() functions for tests that require a project to be set 5 years ago
Chris Galvan 3d1fa538c2 [LYN-2255] Added extra protection for duplicate replacement of alias logic by bookending the strings. 5 years ago
Chris Galvan 20ee399864 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
chiyenteng 01f31cdc56
Move the basic Prefab workflows out from behind the WIP flag (#769)
* Move the basic Prefab workflows out from behind the WIP flag
5 years ago
Chris Galvan 1a15007dcb Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
Chris Galvan c105894aa5 [LYN-2255] Made PrefabTestFixture have the prefab system enabled so that the duplicate tests pass on Jenkins (they rely on the PrefabEditorEntityOwnershipInterface being registered). 5 years ago
amzn-sj ff35804ce3 Change prefab assert to warning 5 years ago
Danilo Aimini c93c457356
Merge pull request #772 from aws-lumberyard-dev/Prefab/Create/PositionFix
LYN-3833 | Position of entity is different after creating it into a prefab
5 years ago
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
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
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
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
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
Hasareej a13c9e8d53
Hasareej lyn 2301 cluster space (#717)
ViewportUi widget anchoring & alignment update.
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
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
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
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