Commit Graph

24 Commits

Author SHA1 Message Date
John 5eb7254faa Merge branch 'development' into LYN-5265_state_tracker_impl 2021-09-29 13:42:03 +01:00
hultonha 7da866e81a Update to how entity space is treated in the viewport (#4263)
* first pass fixes for how entity space is handled in the viewport interaction model

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

* small updates to simplify space handling

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

* fix for influence group with one entity selected

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

* some tidy-up and fix for scale manipulator snapping

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

* couple of small fixes for scale manipulator

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

* small comment update

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

* fixes for integration test failures

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

* add test for rotation manipulator

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

* add test coverage for rotation manipulators

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

* add tests for translation manipulators and some other tidy-up changes

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

* add tests for translating a group of entities

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

* add some tests for scale manipulators

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

* some updates and formatting changes (clang-format) to ViewportScreen

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

* simplify usage of lround code

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

* update missed name updates

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

* update usage of WorldToScreenNdc

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

* updates following review feedback

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

* some more small tidy-up changes

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

* move static variables to be marked inline

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

* small formatting fixes

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-28 09:26:20 +01:00
John a94f7c222d Remove constructors without ViewportEditorModeTrackerInterface ptr.
Signed-off-by: John <jonawals@amazon.com>
2021-09-27 09:23:26 +01:00
John beaa90a968 Call sites for editor mode activate/deactivate.
Signed-off-by: John <jonawals@amazon.com>
2021-09-22 16:24:33 +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
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
hultonha 52095e3e16 Ensure undo/redo operation for change entity selection is atomic (#4122) 2021-09-15 11:12:26 +01: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 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 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
Esteban Papp 588d702e43 Code/Framework/AzToolsFramework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-20 17:53:31 -07:00
Esteban Papp 3522f622f3 more castings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:06:20 -07:00
hultonha 659e486cd7 Add an integration test to validate pick mode crash (#2935)
* add an integration test to validate pick mode crash

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

* update to test after review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-09 11:56:19 +01:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
hultonha 51733f3809 Fix for rotation matching and resetting also scaling the entity transform (#1856)
* fix issue with rotation matching (ditto)

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

* fix for context menu appearing

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

* minor tidy-up in EditorContextMenu

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

* add option to disable cursor during free-look

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

* small fixes after PR comments

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-07 15:48:33 +01:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07: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
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
Tom Hulton-Harrop 108b6f8e0c Updates to ensure OnEntityTransformChanged is called correctly (LYN-2644) (#1405) 2021-06-18 12:44:34 +01:00
Tom Hulton-Harrop d9b1ccd323 Add align grid button to Viewport UI (#1311)
* first pass of adding grid snapping button

* update to request current grid size

* show/hide snapping option based on selection

* small tidy-up changes

* small updates following review feedback

* added some unit tests for snapping functionality and some small tidy-up/refactoring

* small refactor to ensure snap to grid ui only appears with snapping enabled

* add missing include to resolve build error

* fixes for build

* add & to make compiler happy
2021-06-16 12:58:01 +01:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00