Commit Graph

784 Commits

Author SHA1 Message Date
jonawals 4aff76343f Provisional implemenation and testing of central state tracker to track viewport editing modes. (#4112)
* Provisional impl and testing of central state tracker.

Signed-off-by: John <jonawals@amazon.com>

* Add missing namespace comment.

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModeState -> ViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModesTracker -> ViewportEditorModeTracker

Signed-off-by: John <jonawals@amazon.com>

* GetEditorModeState ->GetViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* GetNumTrackedViewports -> GetTrackedViewportCount

Signed-off-by: John <jonawals@amazon.com>

* IsViewportStateBeingTracked -> IsViewportModeTracked

Signed-off-by: John <jonawals@amazon.com>

* Fix API comments.

Signed-off-by: John <jonawals@amazon.com>

* Delete hangover file.

Signed-off-by: John <jonawals@amazon.com>

* Delete more hangover files.

Signed-off-by: John <jonawals@amazon.com>

* Minor member name refactor.

Signed-off-by: John <jonawals@amazon.com>

* Refactor nonclemanture.

Signed-off-by: John <jonawals@amazon.com>

* Rename Enter/ExitMode to Register/UnregisterMode.

Signed-off-by: John <jonawals@amazon.com>

* Error and warning msgs now return AZ::Outcomes.

Signed-off-by: John <jonawals@amazon.com>

* Change all nomenclature to Activate/Deactivate for consistency.

Signed-off-by: John <jonawals@amazon.com>

* Change tense of notification bus methods.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format (again).

Signed-off-by: John <jonawals@amazon.com>

* Fix Linux warning.

Signed-off-by: John <jonawals@amazon.com>
2021-09-20 17:37:09 +01:00
AMZN-Igarri b3db885ae5 Switched over to AzQtComponents::TableView (#3949)
Signed-off-by: igarri <igarri@amazon.com>
2021-09-20 11:10:55 +01:00
hultonha de9a27597b Additional test support for Manipulator Ditto commands (#4191)
* additional test support for manipulator ditto

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* tidy-up to changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix for non-unity build compile error

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-20 09:49:01 +01:00
AMZN-Alexandre Corcia Aguilera 4167bb6cde Warning System Changes (polish) Redo (#4009)
* Restores the branch to the old status from old branch

Signed-off-by: aaguilea <aaguilea@amazon.com>

* Changes that didnt make it from merge manually fixed

Signed-off-by: aaguilea <aaguilea@amazon.com>

* forgot one

Signed-off-by: aaguilea <aaguilea@amazon.com>

* Added Ebus in order to remove rigidbody's dependencies

Signed-off-by: aaguilea <aaguilea@amazon.com>

* answering some of the comments in the PR

Signed-off-by: aaguilea <aaguilea@amazon.com>

* Small typo changed

Signed-off-by: aaguilea <aaguilea@amazon.com>
2021-09-17 14:49:48 +01:00
lumberyard-employee-dm 58c227ceb1 Implemented C++23 deleted nullptr_t constructor/assignment for AZStd string classes (#4158)
* Added string and string_view class constructor overloads which is deleted that prevents initializing them from a nullptr or an integer type

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed locations where string and string_view were initialized with
nullptr

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix IArchive::IsInstalledToHDD signature

Updated calls to ConvertAbsolutePathToAliasedPath to use an
list initialization instead of nullptr

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-16 12:50:18 -05:00
hultonha 7e85b1512a Expose sticky select option to the SettingsRegistry and disable by default (#4149)
* expose sticky select option to the SettingsRegistry

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update missed callsites after API change to Manipulator Test Framework

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates following review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-16 09:14:37 +01:00
Mikhail Naumov a8908a987a Fixing Save level As template path (#4054)
* Fixing Save level As template path

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* CR Feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* CR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* PR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* remove emplace

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* more PR feedback

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-09-15 17:19:01 -07:00
Esteban Papp bbe437819b Enables override/virtual warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-15 14:11:17 -07:00
hultonha 52095e3e16 Ensure undo/redo operation for change entity selection is atomic (#4122) 2021-09-15 11:12:26 +01:00
Esteban Papp 36b7cb2814 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Memory/HeapSchema.h
#	Code/Framework/AzCore/AzCore/Memory/HphaSchema.h
#	Code/Framework/AzCore/AzCore/Memory/MallocSchema.h
#	Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h
2021-09-14 15:32:35 -07:00
Danilo Aimini c0426ba465 PerScreenDpi | QLabels incorrectly handle scale for icons (#4070)
* Fixes to icon generation. Generating a pixmap out of a size won't take the screen scaling factor into account, resulting in blurry results.
Note that this is not a catchall solution, every case needs to be addressed manually.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* HighDpi fixes for startup splashscreen and About dialog

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add helper function to generate appropriate pixmaps for a screen based on its dpi settings.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-14 20:35:56 +01:00
Esteban Papp ee2e728760 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-14 10:28:58 -07:00
hultonha 9d2352c3b7 Update the viewport interaction model to support single click select (#4094)
* add support for single click select

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove redundant profile macro

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates following review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix behaviour for fallthrough to match previous code

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-14 13:24:01 +01:00
hultonha 1e3c8edc40 Remove viewport freeze request bus (#4089)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-13 18:04:20 +01:00
Esteban Papp 972944e762 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Viewport.h
2021-09-13 08:59:24 -07:00
AMZN-AlexOteiza d884eef0f4 Merge pull request #4040 from aws-lumberyard-dev/automation_improv
Added EntityExists for automation
2021-09-13 17:14:35 +02:00
hultonha 7a58b72f15 Add remaining integration tests for viewport selection (box select) (#4075)
* updates to viewport box select tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add interface for querying keyboard modifiers

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove redundant casts

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update formatting options for trace functions in ActionDispatcher

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove redundant GetKeyboardModifiers call

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update how trace/log functions have been fixed to output during tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-13 15:19:46 +01:00
hultonha 28d45891f2 Remove redundant API calls from EditorViewportWidget and use new WorldToScreen call (#4022)
* remove redundant API calls from EditorViewportWidget and use new WorldToScreen call

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove additional pre/post widget render calls that are no longer required

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-13 09:36:34 +01:00
Esteban Papp 5965760612 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-10 20:27:01 -07:00
Esteban Papp 32b4958778 Code/Framework/AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-10 20:19:32 -07:00
Mike Balfour 0505f200e5 Remove extra/bad profile markers (#4031)
Many of these are just extra noise in the profile, but the one in Archive.cpp could also cause PIX to crash.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-09-10 09:11:06 -05:00
AMZN-AlexOteiza 0f0812c198 Reverted unintended change
Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>
2021-09-10 11:25:51 +02:00
AMZN-AlexOteiza e1829ac052 Added EntityExists for automation
Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>
2021-09-10 11:22:48 +02:00
Esteban Papp 9f6d4125b8 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-09 11:50:40 -07:00
Esteban Papp d836503814 some more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-09 11:50:13 -07:00
AMZN-koppersr f9ce966103 Merge pull request #3440 from aws-lumberyard-dev/Prefab/SaveAllPrefabs
Provide options to save prefabs when saving levels
2021-09-09 10:33:22 -07:00
Esteban Papp 91e9c8d81f Adds unused calls to Trace functions to prevent constant failures in release builds
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-09 09:11:19 -07:00
srikappa-amzn fd78b42f67 Merge branch 'development' into Prefab/SaveAllPrefabs
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-09 09:08:22 -07:00
hultonha d82b2a0608 Initial test coverage for viewport selection before introducing new 'single' select functionality (#3987)
* WIP changes for viewport single select and better integration tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update test to verify single click selection in the viewport

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* temporarily remove changes for single select

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* temporarily remove ChangeSelectedEntity call

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* initial tests to validate current viewport selection model

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* some tidy-up before publishing PR

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add reference to const type in loop

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* temporarily disable box select test

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-09 10:23:55 +01:00
Steve Pham e6573766c2 Fixes for release builds for unused variable warnings (#4000)
Signed-off-by: Steve Pham <spham@amazon.com>
2021-09-08 21:13:36 -07:00
srikappa-amzn b87b807de9 Fixed an unused variable error in linux build
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-08 16:07:22 -07:00
srikappa-amzn 92986c7012 Merge branch 'development' into Prefab/SaveAllPrefabs
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-08 14:11:50 -07:00
Esteban Papp d58bda5bbf WIP
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-08 13:43:30 -07:00
srikappa-amzn c7fbdb0ace Make level name appear in bold and update save all prefabs settings registry key
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-08 11:49:33 -07:00
Esteban Papp 860b28c10b more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-08 08:48:32 -07:00
hultonha 052ff90c9d Preparatory work to allow for more viewport integration tests (#3961)
* preparatory work to allow for more viewport integration tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* minor grammatical fix

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix for missed bus call update

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-08 09:36:04 +01:00
srikappa-amzn 0f1e117904 Reverted a small local change that got pushed by mistake
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-07 14:32:13 -07:00
srikappa-amzn d0b7ffab67 Changed parameter names to reflect the recursive nature of functions and some more changes
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-07 14:27:00 -07:00
Esteban Papp aad2c214a4 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-07 08:26:37 -07:00
moraaar f551e69b2b PythonProxyNotificationHandler::OnEventGenericHook acquires the Python GIL before executing (#3904)
- Protected python execution of OnEventGenericHook by trying to lock the GIL and show a descriptive error when it was not possible to lock.
- Improved mechanism to lock python mutex and GIL in PhytonSystemComponent. Acquiring/releasing GIL once per thread.
- Added unit test to verify errors are fired when trying to execute OnEventGenericHook from another thread (as it should not able to acquire the GIL).
- Improved python threading tests to actually using python buses.

Signed-off-by: moraaar moraaar@amazon.com
2021-09-07 15:35:04 +01:00
hultonha a374ea29f2 Expose setting to adjust angular manipulator circle bound (#3932)
* add debug drawing for angular manipulator bounds

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove editor viewport settings from RenderViewport

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add setting for angular manipulator circle bound

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update minimum value allowed for some camera settings

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates following review feedback, some small tidy-up

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update comment

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-06 14:22:57 +01:00
hultonha 6cc9a33845 Add a new implementation for cone/ray intersect to simplify code and fix issue with current implementation (#3902)
* add a new implementation for cone/ray intersect to simplify and fix existing issue

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* move new ray/cone intersection function to AzToolsFramework - repond to PR comments

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates following PR feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add additional comment to give more context to the intersection function

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update google test expect usage

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-06 11:36:17 +01:00
Esteban Papp 2f71b28b97 Fixes AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 15:08:43 -07:00
srikappa-amzn f6ce3678fa Used actual types instead of auto and some more minor changes
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-03 12:34:32 -07:00
chiyenteng f7d4d80e5b Add prefab reparenting python auto tests (#3653)
* Add prefab reparenting python auto tests

Signed-off-by: chiyteng <chiyteng@amazon.com>

* modify prefab python auto test framework

Signed-off-by: chiyteng <chiyteng@amazon.com>

* remove extra spaces

Signed-off-by: chiyteng <chiyteng@amazon.com>

* delete unused files

Signed-off-by: chiyteng <chiyteng@amazon.com>

* delete unused files

Signed-off-by: chiyteng <chiyteng@amazon.com>

* fix nits

Signed-off-by: chiyteng <chiyteng@amazon.com>

* Refactor prefab python tests

Signed-off-by: chiyteng <chiyteng@amazon.com>

* Fix nits

Signed-off-by: chiyteng <chiyteng@amazon.com>

* Modify comments

Signed-off-by: chiyteng <chiyteng@amazon.com>

* Fix nits and add comments for Prefab.py

Signed-off-by: chiyteng <chiyteng@amazon.com>
2021-09-03 14:06:22 -05:00
hultonha 5851031d2e Expose the ability to control manipulator line bounds (#3890)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-03 10:14:03 +01:00
srikappa-amzn 8331b8dd8a Fix a compile error by changing to const instead of constexpr
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-03 01:34:32 -07:00
srikappa-amzn fbf92e9775 Merge branch 'development' into Prefab/SaveAllPrefabs
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-02 23:40:54 -07:00
srikappa-amzn 5a8998add1 Added function comments and nullptr checks
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-02 23:35:28 -07:00
srikappa-amzn 7e75559200 Removed unused Qt classes and do some more code clean up
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-09-02 17:26:32 -07:00