birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: address changes

Browse Source 
- updated checkstyle
- update enum CursorInputMode
- minor refeactor to QtEventToAzInputMapper

Signed-off-by: Michael Pollind <mpollind@gmail.com>
This commit is contained in:
Michael Pollind
2021-12-13 07:28:28 -08:00
parent 90f710b8c2
commit fa809a76ca
6 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/EditorViewportSettings.cpp
+5 -5
View File
@@ -23,7 +23,7 @@ namespace SandboxEditor
constexpr AZStd::string_view AngleSizeSetting = "/Amazon/Preferences/Editor/AngleSize";
constexpr AZStd::string_view ShowGridSetting = "/Amazon/Preferences/Editor/ShowGrid";
constexpr AZStd::string_view StickySelectSetting = "/Amazon/Preferences/Editor/StickySelect";
constexpr AZStd::string_view ManipulatorMouseWrapSetting = "/Amazon/Preferences/Editor/Manipulator/MouseWrapping";
constexpr AZStd::string_view ViewportMouseWrapSetting = "/Amazon/Preferences/Editor/Manipulator/MouseWrapping";
constexpr AZStd::string_view ManipulatorLineBoundWidthSetting = "/Amazon/Preferences/Editor/Manipulator/LineBoundWidth";
constexpr AZStd::string_view ManipulatorCircleBoundWidthSetting = "/Amazon/Preferences/Editor/Manipulator/CircleBoundWidth";
constexpr AZStd::string_view CameraTranslateSpeedSetting = "/Amazon/Preferences/Editor/Camera/TranslateSpeed";
@@ -187,14 +187,14 @@ namespace SandboxEditor
AzToolsFramework::SetRegistry(ManipulatorLineBoundWidthSetting, lineBoundWidth);
}
bool ManipulatorMouseWrap()
bool ViewportMouseWrapSetting()
{
return aznumeric_cast<float>(GetRegistry(ManipulatorMouseWrapSetting, false));
return aznumeric_cast<bool>(GetRegistry(ViewportMouseWrapSetting, false));
}
void SetManipulatorMouseWrap(bool wrapping)
void SetViewportMouseWrapSetting(bool wrapping)
{
SetRegistry(ManipulatorMouseWrapSetting, wrapping);
SetRegistry(ViewportMouseWrapSetting, wrapping);
}
float ManipulatorCircleBoundWidth()
Code/Editor/EditorViewportSettings.h
+2 -2
View File
@@ -57,8 +57,8 @@ namespace SandboxEditor
SANDBOX_API float ManipulatorLineBoundWidth();
SANDBOX_API void SetManipulatorLineBoundWidth(float lineBoundWidth);
SANDBOX_API bool ManipulatorMouseWrap();
SANDBOX_API void SetManipulatorMouseWrap(bool wrapping);
SANDBOX_API bool ViewportMouseWrapSetting();
SANDBOX_API void SetViewportMouseWrapSetting(bool wrapping);
SANDBOX_API float ManipulatorCircleBoundWidth();
SANDBOX_API void SetManipulatorCircleBoundWidth(float circleBoundWidth);
Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp
+2 -2
View File
@@ -47,12 +47,12 @@ namespace UnitTest
void ViewportMouseCursorRequestImpl::BeginCursorCapture()
{
m_inputChannelMapper->SetCursorMode(AzToolsFramework::QtEventToAzInputMapper::CURSOR_MODE_CAPTURED);
m_inputChannelMapper->SetCursorMode(AzToolsFramework::QtEventToAzInputMapper::CursorModeCaptured);
}
void ViewportMouseCursorRequestImpl::EndCursorCapture()
{
m_inputChannelMapper->SetCursorMode(AzToolsFramework::QtEventToAzInputMapper::CURSOR_MODE_NONE);
m_inputChannelMapper->SetCursorMode(AzToolsFramework::QtEventToAzInputMapper::CursorModeNone);
}
bool ViewportMouseCursorRequestImpl::IsMouseOver() const