hdkv/yuzu
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

early-access version 1421

Browse Source
This commit is contained in:
pineappleEA
2021-02-07 15:58:56 +01:00
parent 84e1d5b26b
commit ed8560bf71
12 changed files with 481 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/input_common/mouse/mouse_input.cpp
View File

@@ -37,6 +37,9 @@ void Mouse::UpdateThread() {
if (configuring) {
UpdateYuzuSettings();
}
if (mouse_panning_timout++ > 12) {
StopPanning();
}
std::this_thread::sleep_for(std::chrono::milliseconds(update_time));
}
}
@@ -66,24 +69,35 @@ void Mouse::PressButton(int x, int y, int button_) {
mouse_info[button_index].data.pressed = true;
}
void Mouse::StopPanning() {
for (MouseInfo& info : mouse_info) {
if (Settings::values.mouse_panning) {
if (info.data.pressed) {
continue;
}
info.data.axis = {0, 0};
info.tilt_speed = 0;
}
}
}
void Mouse::MouseMove(int x, int y, int center_x, int center_y) {
for (MouseInfo& info : mouse_info) {
if (Settings::values.mouse_panning) {
const auto mouse_change = Common::MakeVec(x, y) - Common::MakeVec(center_x, center_y);
const auto angle = std::atan2(-mouse_change.y, mouse_change.x);
const auto length =
(mouse_change.y * mouse_change.y) + (mouse_change.x * mouse_change.x);
mouse_panning_timout = 0;
info.data.axis = {static_cast<int>(100 * std::cos(angle)),
static_cast<int>(100 * std::sin(angle))};
if (length < 4) {
info.tilt_speed = 0;
info.data.axis = {};
} else {
info.tilt_direction = mouse_change.Cast<float>();
info.tilt_speed = info.tilt_direction.Normalize() * info.sensitivity;
if (info.data.pressed || length < 4) {
continue;
}
info.last_mouse_change = (info.last_mouse_change * 0.8f) + (mouse_change * 0.2f);
info.data.axis = {static_cast<int>(12 * info.last_mouse_change.x),
static_cast<int>(12 * -info.last_mouse_change.y)};
info.tilt_direction = info.last_mouse_change;
info.tilt_speed = info.tilt_direction.Normalize() * info.sensitivity;
continue;
}

3
src/input_common/mouse/mouse_input.h
View File

@@ -76,11 +76,13 @@ public:
private:
void UpdateThread();
void UpdateYuzuSettings();
void StopPanning();
struct MouseInfo {
InputCommon::MotionInput motion{0.0f, 0.0f, 0.0f};
Common::Vec2<int> mouse_origin;
Common::Vec2<int> last_mouse_position;
Common::Vec2<float> last_mouse_change;
bool is_tilting = false;
float sensitivity{0.120f};
@@ -96,5 +98,6 @@ private:
Common::SPSCQueue<MouseStatus> mouse_queue;
bool configuring{false};
bool update_thread_running{true};
int mouse_panning_timout{};
};
} // namespace MouseInput