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

feat: add cursor wrapped mode

Browse Source 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
This commit is contained in:
Michael Pollind
2021-10-31 09:48:06 -07:00
parent 8503915cdd
commit 90f710b8c2
6 changed files with 122 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/EditorViewportSettings.cpp
+11
View File
@@ -23,6 +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 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";
@@ -186,6 +187,16 @@ namespace SandboxEditor
AzToolsFramework::SetRegistry(ManipulatorLineBoundWidthSetting, lineBoundWidth);
}
bool ManipulatorMouseWrap()
{
return aznumeric_cast<float>(GetRegistry(ManipulatorMouseWrapSetting, false));
}
void SetManipulatorMouseWrap(bool wrapping)
{
SetRegistry(ManipulatorMouseWrapSetting, wrapping);
}
float ManipulatorCircleBoundWidth()
{
return aznumeric_cast<float>(AzToolsFramework::GetRegistry(ManipulatorCircleBoundWidthSetting, 0.1));
Code/Editor/EditorViewportSettings.h
+3
View File
@@ -57,6 +57,9 @@ namespace SandboxEditor
SANDBOX_API float ManipulatorLineBoundWidth();
SANDBOX_API void SetManipulatorLineBoundWidth(float lineBoundWidth);
SANDBOX_API bool ManipulatorMouseWrap();
SANDBOX_API void SetManipulatorMouseWrap(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->SetCursorCaptureEnabled(true);
m_inputChannelMapper->SetCursorMode(AzToolsFramework::QtEventToAzInputMapper::CURSOR_MODE_CAPTURED);
}
void ViewportMouseCursorRequestImpl::EndCursorCapture()
{
m_inputChannelMapper->SetCursorCaptureEnabled(false);
m_inputChannelMapper->SetCursorMode(AzToolsFramework::QtEventToAzInputMapper::CURSOR_MODE_NONE);
}
bool ViewportMouseCursorRequestImpl::IsMouseOver() const
Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp
+87 -22
View File
@@ -241,22 +241,39 @@ namespace AzToolsFramework
}
}
void QtEventToAzInputMapper::SetCursorMode(QtEventToAzInputMapper::CursorInputMode mode)
{
if(mode != m_cursorMode)
{
m_cursorMode = mode;
switch(m_cursorMode)
{
case CURSOR_MODE_CAPTURED:
qApp->setOverrideCursor(Qt::BlankCursor);
m_mouseDevice->SetSystemCursorState(AzFramework::SystemCursorState::ConstrainedAndHidden);
break;
case CURSOR_MODE_WRAPPED:
qApp->restoreOverrideCursor();
m_mouseDevice->SetSystemCursorState(AzFramework::SystemCursorState::UnconstrainedAndVisible);
break;
case CURSOR_MODE_NONE:
qApp->restoreOverrideCursor();
m_mouseDevice->SetSystemCursorState(AzFramework::SystemCursorState::UnconstrainedAndVisible);
break;
}
}
}
void QtEventToAzInputMapper::SetCursorCaptureEnabled(bool enabled)
{
if (m_capturingCursor != enabled)
if (enabled)
{
m_capturingCursor = enabled;
if (m_capturingCursor)
{
m_mouseDevice->SetSystemCursorState(AzFramework::SystemCursorState::ConstrainedAndHidden);
qApp->setOverrideCursor(Qt::BlankCursor);
}
else
{
m_mouseDevice->SetSystemCursorState(AzFramework::SystemCursorState::UnconstrainedAndVisible);
qApp->restoreOverrideCursor();
}
SetCursorMode(CURSOR_MODE_CAPTURED);
}
else
{
SetCursorMode(CURSOR_MODE_NONE);
}
}
@@ -436,25 +453,73 @@ namespace AzToolsFramework
return QPoint{ denormalizedX, denormalizedY };
}
void wrapCursorX(const QRect& rect, QPoint& point) {
if (rect.left() < point.x())
{
point.setX(rect.right() - 1);
}
else if (rect.right() > point.x())
{
point.setX(rect.left() + 1);
}
}
void wrapCursorY(const QRect& rect, QPoint& point) {
if (rect.top() < point.y())
{
point.setY(rect.bottom() - 1);
}
else if (rect.bottom() > point.y())
{
point.setY(rect.top() + 1);
}
}
void QtEventToAzInputMapper::HandleMouseMoveEvent(const QPoint& globalCursorPosition)
{
const QPoint cursorDelta = globalCursorPosition - m_previousGlobalCursorPosition;
QScreen* screen = m_sourceWidget->screen();
const QRect widgetRect(m_sourceWidget->mapToGlobal(QPoint(0,0)), m_sourceWidget->size());
m_mouseDevice->m_cursorPositionData2D->m_normalizedPosition =
WidgetPositionToNormalizedPosition(m_sourceWidget->mapFromGlobal(globalCursorPosition));
m_mouseDevice->m_cursorPositionData2D->m_normalizedPositionDelta = WidgetPositionToNormalizedPosition(cursorDelta);
ProcessPendingMouseEvents(cursorDelta);
switch(m_cursorMode)
{
case CURSOR_MODE_CAPTURED:
AzQtComponents::SetCursorPos(m_previousGlobalCursorPosition);
break;
case CURSOR_MODE_WRAPPED_X:
QPoint screenPos(globalCursorPosition);
wrapCursorX(widgetRect, screenPos);
QCursor::setPos(screen, screenPos);
QPoint screenDelta = globalCursorPosition - screenPos;
m_previousGlobalCursorPosition = globalCursorPosition - screenDelta;
break;
case CURSOR_MODE_WRAPPED_Y:
QPoint screenPos(globalCursorPosition);
wrapCursorY(widgetRect, screenPos);
QCursor::setPos(screen, screenPos);
QPoint screenDelta = globalCursorPosition - screenPos;
m_previousGlobalCursorPosition = globalCursorPosition - screenDelta;
break;
case CURSOR_MODE_WRAPPED:
QPoint screenPos(globalCursorPosition);
wrapCursorX(widgetRect, screenPos);
wrapCursorY(widgetRect, screenPos);
QCursor::setPos(screen, screenPos);
QPoint screenDelta = globalCursorPosition - screenPos;
m_previousGlobalCursorPosition = globalCursorPosition - screenDelta;
break;
default:
m_previousGlobalCursorPosition = globalCursorPosition;
break;
if (m_capturingCursor)
{
// Reset our cursor position to the previous point
AzQtComponents::SetCursorPos(m_previousGlobalCursorPosition);
}
else
{
m_previousGlobalCursorPosition = globalCursorPosition;
}
ProcessPendingMouseEvents(cursorDelta);
}
void QtEventToAzInputMapper::HandleKeyEvent(QKeyEvent* keyEvent)
Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.h
+17 -2
View File
@@ -41,6 +41,17 @@ namespace AzToolsFramework
Q_OBJECT
public:
enum CursorInputMode {
CURSOR_MODE_NONE,
CURSOR_MODE_CAPTURED, //< Sets whether or not the cursor should be constrained to the source widget and invisible.
//< Internally, this will reset the cursor position after each move event to ensure movement
//< events don't allow the cursor to escape. This can be used for typical camera controls
//< like a dolly or rotation, where mouse movement is important but cursor location is not.
CURSOR_MODE_WRAPPED, //< Flags whether the curser is going to wrap around the soruce widget.
CURSOR_MODE_WRAPPED_X,
CURSOR_MODE_WRAPPED_Y
};
QtEventToAzInputMapper(QWidget* sourceWidget, int syntheticDeviceId = 0);
~QtEventToAzInputMapper() = default;
@@ -56,8 +67,12 @@ namespace AzToolsFramework
//! Internally, this will reset the cursor position after each move event to ensure movement
//! events don't allow the cursor to escape. This can be used for typical camera controls
//! like a dolly or rotation, where mouse movement is important but cursor location is not.
//! @deprecated Use #SetCursorMode()
void SetCursorCaptureEnabled(bool enabled);
//! Set the cursor mode.
void SetCursorMode(QtEventToAzInputMapper::CursorInputMode mode);
void SetOverrideCursor(ViewportInteraction::CursorStyleOverride cursorStyleOverride);
void ClearOverrideCursor();
@@ -176,8 +191,8 @@ namespace AzToolsFramework
QWidget* m_sourceWidget;
// Flags whether or not Qt events should currently be processed.
bool m_enabled = true;
// Flags whether or not the cursor is being constrained to the source widget (for invisible mouse movement).
bool m_capturingCursor = false;
// Controls the cursor behavior.
QtEventToAzInputMapper::CursorInputMode m_cursorMode = CURSOR_MODE_NONE;
// Flags whether the cursor has been overridden.
bool m_overrideCursor = false;
Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
+2 -2
View File
@@ -331,12 +331,12 @@ namespace AtomToolsFramework
void RenderViewportWidget::BeginCursorCapture()
{
m_inputChannelMapper->SetCursorCaptureEnabled(true);
m_inputChannelMapper->SetCursorMode(AzToolsFramework::QtEventToAzInputMapper::CURSOR_MODE_CAPTURED);
}
void RenderViewportWidget::EndCursorCapture()
{
m_inputChannelMapper->SetCursorCaptureEnabled(false);
m_inputChannelMapper->SetCursorMode(AzToolsFramework::QtEventToAzInputMapper::CURSOR_MODE_NONE);
}
void RenderViewportWidget::SetOverrideCursor(AzToolsFramework::ViewportInteraction::CursorStyleOverride cursorStyleOverride)