mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-09-05 12:00:05 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f6e7686038 |
Vendored
+1
@@ -11,6 +11,7 @@
|
|||||||
#include <limits>
|
#include <limits>
|
||||||
#include <span>
|
#include <span>
|
||||||
#include <array>
|
#include <array>
|
||||||
|
#include <algorithm>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
namespace Tz {
|
namespace Tz {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <cstdlib>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <llvm/Demangle/Demangle.h>
|
#include <llvm/Demangle/Demangle.h>
|
||||||
|
|||||||
@@ -4,16 +4,17 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <chrono>
|
#include <thread>
|
||||||
#include <fmt/ranges.h>
|
#include <fmt/ranges.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include "common/param_package.h"
|
#include "common/param_package.h"
|
||||||
#include "common/settings.h"
|
#include "common/settings.h"
|
||||||
#include "common/steady_clock.h"
|
#include "common/thread.h"
|
||||||
#include "input_common/drivers/mouse.h"
|
#include "input_common/drivers/mouse.h"
|
||||||
|
|
||||||
namespace InputCommon {
|
namespace InputCommon {
|
||||||
|
constexpr int update_time = 10;
|
||||||
constexpr float default_panning_sensitivity = 0.0010f;
|
constexpr float default_panning_sensitivity = 0.0010f;
|
||||||
constexpr float default_stick_sensitivity = 0.0006f;
|
constexpr float default_stick_sensitivity = 0.0006f;
|
||||||
constexpr float default_deadzone_counterweight = 0.01f;
|
constexpr float default_deadzone_counterweight = 0.01f;
|
||||||
@@ -73,7 +74,7 @@ Mouse::Mouse(std::string input_engine_) : InputEngine(std::move(input_engine_))
|
|||||||
last_motion_change = {};
|
last_motion_change = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mouse::UpdateStickInput(Common::SteadyClock::time_point timestamp) {
|
void Mouse::UpdateStickInput() {
|
||||||
if (!IsMousePanningEnabled()) {
|
if (!IsMousePanningEnabled()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -99,9 +100,12 @@ void Mouse::UpdateStickInput(Common::SteadyClock::time_point timestamp) {
|
|||||||
last_mouse_change *= clamped_decay;
|
last_mouse_change *= clamped_decay;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mouse::UpdateMotionInput(Common::SteadyClock::time_point timestamp) {
|
void Mouse::UpdateMotionInput() {
|
||||||
const float sensitivity = IsMousePanningEnabled() ? default_motion_panning_sensitivity : default_motion_sensitivity;
|
const float sensitivity =
|
||||||
const float rotation_velocity = std::sqrt(last_motion_change.x * last_motion_change.x + last_motion_change.y * last_motion_change.y);
|
IsMousePanningEnabled() ? default_motion_panning_sensitivity : default_motion_sensitivity;
|
||||||
|
|
||||||
|
const float rotation_velocity = std::sqrt(last_motion_change.x * last_motion_change.x +
|
||||||
|
last_motion_change.y * last_motion_change.y);
|
||||||
|
|
||||||
// Clamp rotation speed
|
// Clamp rotation speed
|
||||||
if (rotation_velocity > maximum_rotation_speed / sensitivity) {
|
if (rotation_velocity > maximum_rotation_speed / sensitivity) {
|
||||||
@@ -117,7 +121,7 @@ void Mouse::UpdateMotionInput(Common::SteadyClock::time_point timestamp) {
|
|||||||
.accel_x = 0,
|
.accel_x = 0,
|
||||||
.accel_y = 0,
|
.accel_y = 0,
|
||||||
.accel_z = 0,
|
.accel_z = 0,
|
||||||
.delta_timestamp = u64(std::chrono::duration_cast<std::chrono::microseconds>(timestamp - last_notify_timestamp).count()),
|
.delta_timestamp = update_time * 1000,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (IsMousePanningEnabled()) {
|
if (IsMousePanningEnabled()) {
|
||||||
@@ -173,10 +177,8 @@ void Mouse::Move(int x, int y, int center_x, int center_y) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Mouse::NotifyChanged() {
|
void Mouse::NotifyChanged() {
|
||||||
auto const timestamp = Common::SteadyClock::Now();
|
UpdateStickInput();
|
||||||
UpdateStickInput(timestamp);
|
UpdateMotionInput();
|
||||||
UpdateMotionInput(timestamp);
|
|
||||||
last_notify_timestamp = Common::SteadyClock::Now();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mouse::MouseMove(f32 touch_x, f32 touch_y) {
|
void Mouse::MouseMove(f32 touch_x, f32 touch_y) {
|
||||||
|
|||||||
@@ -7,9 +7,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <chrono>
|
|
||||||
|
|
||||||
#include "common/steady_clock.h"
|
|
||||||
#include "common/polyfill_thread.h"
|
#include "common/polyfill_thread.h"
|
||||||
#include "common/vector_math.h"
|
#include "common/vector_math.h"
|
||||||
#include "input_common/input_engine.h"
|
#include "input_common/input_engine.h"
|
||||||
@@ -103,18 +101,17 @@ public:
|
|||||||
Common::Input::ButtonNames GetUIName(const Common::ParamPackage& params) const override;
|
Common::Input::ButtonNames GetUIName(const Common::ParamPackage& params) const override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void UpdateStickInput(Common::SteadyClock::time_point timestamp);
|
void UpdateStickInput();
|
||||||
void UpdateMotionInput(Common::SteadyClock::time_point timestamp);
|
void UpdateMotionInput();
|
||||||
bool IsMousePanningEnabled();
|
bool IsMousePanningEnabled();
|
||||||
|
|
||||||
Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const;
|
Common::Input::ButtonNames GetUIButtonName(const Common::ParamPackage& params) const;
|
||||||
|
|
||||||
Common::Vec2<int> mouse_origin{};
|
Common::Vec2<int> mouse_origin;
|
||||||
Common::Vec2<int> last_mouse_position{};
|
Common::Vec2<int> last_mouse_position;
|
||||||
Common::Vec2<float> last_mouse_change{};
|
Common::Vec2<float> last_mouse_change;
|
||||||
Common::Vec3<float> last_motion_change{};
|
Common::Vec3<float> last_motion_change;
|
||||||
Common::Vec2<int> wheel_position{};
|
Common::Vec2<int> wheel_position;
|
||||||
Common::SteadyClock::time_point last_notify_timestamp{};
|
|
||||||
bool button_pressed = false;
|
bool button_pressed = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -538,7 +538,6 @@ void GRenderWindow::mouseReleaseEvent(QMouseEvent* event) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void GRenderWindow::ConstrainMouse() {
|
void GRenderWindow::ConstrainMouse() {
|
||||||
input_subsystem->GetMouse()->NotifyChanged(); // required to reset mouse once it's no longer moved
|
|
||||||
if (QtCommon::emu_thread == nullptr || !Settings::values.mouse_panning) {
|
if (QtCommon::emu_thread == nullptr || !Settings::values.mouse_panning) {
|
||||||
mouse_constrain_timer.stop();
|
mouse_constrain_timer.stop();
|
||||||
return;
|
return;
|
||||||
@@ -553,12 +552,15 @@ void GRenderWindow::ConstrainMouse() {
|
|||||||
const auto pos = mapFromGlobal(QCursor::pos());
|
const auto pos = mapFromGlobal(QCursor::pos());
|
||||||
const int new_pos_x = std::clamp(pos.x(), 0, width());
|
const int new_pos_x = std::clamp(pos.x(), 0, width());
|
||||||
const int new_pos_y = std::clamp(pos.y(), 0, height());
|
const int new_pos_y = std::clamp(pos.y(), 0, height());
|
||||||
|
|
||||||
QCursor::setPos(mapToGlobal(QPoint{new_pos_x, new_pos_y}));
|
QCursor::setPos(mapToGlobal(QPoint{new_pos_x, new_pos_y}));
|
||||||
} else {
|
return;
|
||||||
const int center_x = width() / 2;
|
|
||||||
const int center_y = height() / 2;
|
|
||||||
QCursor::setPos(mapToGlobal(QPoint{center_x, center_y}));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const int center_x = width() / 2;
|
||||||
|
const int center_y = height() / 2;
|
||||||
|
|
||||||
|
QCursor::setPos(mapToGlobal(QPoint{center_x, center_y}));
|
||||||
}
|
}
|
||||||
|
|
||||||
void GRenderWindow::wheelEvent(QWheelEvent* event) {
|
void GRenderWindow::wheelEvent(QWheelEvent* event) {
|
||||||
|
|||||||
@@ -37,16 +37,10 @@ EmuWindow_SDL3::EmuWindow_SDL3(InputCommon::InputSubsystem* input_subsystem_, Co
|
|||||||
SDL_SetWindowTitle(this_->render_window, title.c_str());
|
SDL_SetWindowTitle(this_->render_window, title.c_str());
|
||||||
return 2000;
|
return 2000;
|
||||||
}, this);
|
}, this);
|
||||||
mouse_timer = SDL_AddTimer(100, [](void *userdata, SDL_TimerID, Uint32) -> Uint32 {
|
|
||||||
auto* this_ = (EmuWindow_SDL3*)userdata;
|
|
||||||
this_->input_subsystem->GetMouse()->NotifyChanged();
|
|
||||||
return 100;
|
|
||||||
}, this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EmuWindow_SDL3::~EmuWindow_SDL3() {
|
EmuWindow_SDL3::~EmuWindow_SDL3() {
|
||||||
SDL_RemoveTimer(titlebar_timer);
|
SDL_RemoveTimer(titlebar_timer);
|
||||||
SDL_RemoveTimer(mouse_timer);
|
|
||||||
system.HIDCore().UnloadInputDevices();
|
system.HIDCore().UnloadInputDevices();
|
||||||
input_subsystem->Shutdown();
|
input_subsystem->Shutdown();
|
||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
|
|||||||
@@ -84,9 +84,6 @@ protected:
|
|||||||
/// Periodic changer of titlebar (independent of event loop)
|
/// Periodic changer of titlebar (independent of event loop)
|
||||||
SDL_TimerID titlebar_timer;
|
SDL_TimerID titlebar_timer;
|
||||||
|
|
||||||
// Mouse resetter once it
|
|
||||||
SDL_TimerID mouse_timer;
|
|
||||||
|
|
||||||
/// Is the window still open?
|
/// Is the window still open?
|
||||||
bool is_open = true;
|
bool is_open = true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user