From 679d51c2898b99c24ad904e891781a147b2f6667 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Thu, 9 Apr 2020 00:39:15 -0500 Subject: [PATCH] RenderWidget: Remove mouse based Free Look since it has moved to the HotkeyScheduler --- Source/Core/DolphinQt/RenderWidget.cpp | 24 ------------------------ Source/Core/DolphinQt/RenderWidget.h | 1 - 2 files changed, 25 deletions(-) diff --git a/Source/Core/DolphinQt/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp index 6be674526a..7347fa3ef8 100644 --- a/Source/Core/DolphinQt/RenderWidget.cpp +++ b/Source/Core/DolphinQt/RenderWidget.cpp @@ -32,9 +32,7 @@ #include "DolphinQt/Resources.h" #include "DolphinQt/Settings.h" -#include "VideoCommon/FreeLookCamera.h" #include "VideoCommon/RenderBase.h" -#include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" RenderWidget::RenderWidget(QWidget* parent) : QWidget(parent) @@ -180,11 +178,6 @@ bool RenderWidget::event(QEvent* event) break; } - case QEvent::MouseMove: - if (g_freelook_camera.IsActive()) - OnFreeLookMouseMove(static_cast(event)); - [[fallthrough]]; - case QEvent::MouseButtonPress: if (!Settings::Instance().GetHideCursor() && isActiveWindow()) { @@ -237,23 +230,6 @@ bool RenderWidget::event(QEvent* event) return QWidget::event(event); } -void RenderWidget::OnFreeLookMouseMove(QMouseEvent* event) -{ - const auto mouse_move = event->pos() - m_last_mouse; - m_last_mouse = event->pos(); - - if (event->buttons() & Qt::RightButton) - { - // Camera Pitch and Yaw: - g_freelook_camera.Rotate(Common::Vec3{mouse_move.y() / 200.f, mouse_move.x() / 200.f, 0.f}); - } - else if (event->buttons() & Qt::MiddleButton) - { - // Camera Roll: - g_freelook_camera.Rotate({0.f, 0.f, mouse_move.x() / 200.f}); - } -} - void RenderWidget::PassEventToImGui(const QEvent* event) { if (!Core::IsRunningAndStarted()) diff --git a/Source/Core/DolphinQt/RenderWidget.h b/Source/Core/DolphinQt/RenderWidget.h index 650ba2d1dc..975b8399f1 100644 --- a/Source/Core/DolphinQt/RenderWidget.h +++ b/Source/Core/DolphinQt/RenderWidget.h @@ -33,7 +33,6 @@ private: void HandleCursorTimer(); void OnHideCursorChanged(); void OnKeepOnTopChanged(bool top); - void OnFreeLookMouseMove(QMouseEvent* event); void PassEventToImGui(const QEvent* event); void SetImGuiKeyMap(); void dragEnterEvent(QDragEnterEvent* event) override;