Commit Graph

39 Commits

Author SHA1 Message Date
Gene Walters bafcdfe037 Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628
Merging Stabilization/2106 into Development
2021-06-30 11:07:30 -07:00
Tom Hulton-Harrop 8d35f31fa6 API documentation pass for CameraInput types (#1681)
* add api comments for new camera system

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-06-30 18:16:35 +01:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Tom Hulton-Harrop 0f09a6d8bf Move new camera settings to the Settings Registry and connect them to viewport border elements (#1267)
* ensure the new camera respects changing ui values and move camera settings to the settings registry

* factor out creation of modular camera controller

* small updates before posting PR

* updates following review feedback

* updates following review feedback
2021-06-14 12:32:35 +01:00
Tom Hulton-Harrop cf8a6761bf Formatting-only change - Update Manipulator and Viewport AzToolsFramework files (#1143)
* formatting changes to AzToolsFramework viewport related types + API comment style updates

* minor format change - include ordering

* improve formatting by moving comment

* fix compile error and switch to use AZ_Printf

* small polish changes after review feedback
2021-06-07 14:50:49 +01:00
rgba16f 74f474aae2 Add unit tests for the ViewportScreen ndc <-> worldspace utility functions (#1149)
Add ScreenNdcToWorld function to enable round trip testing.
2021-06-04 18:02:09 -05:00
Tom Hulton-Harrop 3947dcf213 Add some extra cvars to control orbit point appearance and remove unused ones (#1032) 2021-06-01 09:36:00 +01:00
Tom Hulton-Harrop 36ceff84c9 Support mesh intersection for camera orbit (#982)
* wip support for mesh intersection with intersector bus

* WIP camera mesh intersection orbit logic

* remove unneeded template argument

* add bus connect/disconnect

* fix intersection logic

* small updates, additional comments, some tidy-up

* update formatting options slightly

* use aznumeric_cast

* temp workaround for negative distances with RayIntersection
2021-05-28 14:37:17 +01:00
Tom Hulton-Harrop 74a2735766 Add better support for mouse deltas with camera system (#846)
* add better support for mouse deltas with camera system

* small fixes spotted during review

* rename after review feedback

* small refactor to reduce duplication
2021-05-21 10:35:33 +01:00
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
2021-05-20 15:54:36 +01:00
hultonha bb05993355 add new orbit functionality for camrea 2021-05-17 18:25:13 +01:00
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
2021-05-17 18:21:38 +01:00
Benjamin Jillich 6ebea13783 [LYN-2520] Gem Catalog - Gem Inspector / Info Panel (#718)
* [LYN-2520] Gem Catalog - Gem Inspector / Info Panel

* Extended the gem info with a directory and documentation link, binary size in bytes and added some helper functions.
* Added the gem inspector widget that hooks into the selection model.
* Info panel is vertically scrollable and based on the UX designs.
* Added a gem sub widget which holds several gem tags, a title and a description and is reused for the depending and conflicting gems.
* Extended the gem model with several new roles and data elements.
* Added more gem info test data before we got access to the real data.
2021-05-17 15:38:30 +02:00
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
2021-05-13 16:19:53 +01:00
Tom Hulton-Harrop f9fb61cc5d Fix issue with viewport interaction ordering and viewport matrix changed handler (#695)
* fix for ctrl+mouse-wheel to cycle transform modes in the viewport

* ensure correct callback function is invoked

* remove redundant check in CameraInput
2021-05-12 09:40:37 +01:00
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::
2021-05-11 13:38:09 +01:00
nvsickle b848e2dcd1 Appease clang 2021-05-06 18:37:52 -07:00
nvsickle ea8e098e33 Tidy up MultiViewportControllerInstanceInterface 2021-05-06 17:53:23 -07:00
nvsickle e8f37bb29f Merge remote-tracking branch 'upstream/main' into nvsickle/ViewportControllerAPI 2021-05-06 17:16:39 -07:00
hultonha 36d502b560 update controls for camera and move settings to cfg file 2021-05-04 14:06:10 +01:00
hultonha 16b16706b5 add logic to convert matrix3x3 to euler angles 2021-05-04 14:05:55 +01:00
hultonha d705864f88 fix for input being 'stuck' on 2021-05-04 14:05:50 +01:00
nvsickle db9df91977 Give MultiViewportControllerInstances a pointer to their parent controller, to allow state management 2021-04-30 10:46:29 -07:00
hultonha fb46d11f6c add missing const 2021-04-30 14:52:14 +01:00
hultonha 0a4d62eeed update cvar description 2021-04-30 10:56:40 +01:00
hultonha f01e64a023 add missing includes 2021-04-30 09:21:21 +01:00
hultonha 7d96fcdf1f updates to fix camera behaviour 2021-04-29 18:39:03 +01:00
hultonha 64e06c3010 more updates to camera code 2021-04-27 19:40:45 +01:00
hultonha 1b946818a2 more tidy-up to CameraInput.cpp 2021-04-27 13:58:17 +01:00
hultonha c898318377 updated camera changes 2021-04-27 10:30:07 +01:00
hultonha 15afcc341d fixes and updates to CameraInput 2021-04-26 19:46:57 +01:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
nvsickle 4f9d7e3782 Simplify ResetInputChannels 2021-04-20 15:27:38 -07:00
nvsickle 5ea2240787 Fix editor controls working in game mode
-Implements ResetInputChannels for ViewportController API and SetEnabled for ViewportControllerList
-Disables all viewport controllers while in game mode
2021-04-20 15:27:34 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00