From 9443c1590bc8e7fb260994a043ea25eb3928f463 Mon Sep 17 00:00:00 2001 From: lizzie Date: Tue, 1 Sep 2026 06:40:41 +0000 Subject: [PATCH] evil --- src/input_common/drivers/mouse.cpp | 56 +++++++++---------- .../configure_input_player_widget.cpp | 42 +++++++------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index 6aa09ffc9e..4444f0ac3b 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -88,8 +88,8 @@ void Mouse::UpdateStickInput() { last_mouse_change *= maximum_stick_range; } - SetAxis(identifier, mouse_axis_x, last_mouse_change.x); - SetAxis(identifier, mouse_axis_y, -last_mouse_change.y); + SetAxis(identifier, mouse_axis_x, last_mouse_change[0]); + SetAxis(identifier, mouse_axis_y, -last_mouse_change[1]); // Decay input over time const float clamped_length = (std::min)(1.0f, length); @@ -104,20 +104,20 @@ void Mouse::UpdateMotionInput() { const float sensitivity = 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); + const float rotation_velocity = std::sqrt(last_motion_change[0] * last_motion_change[0] + + last_motion_change[1] * last_motion_change[1]); // Clamp rotation speed if (rotation_velocity > maximum_rotation_speed / sensitivity) { const float multiplier = maximum_rotation_speed / rotation_velocity / sensitivity; - last_motion_change.x = last_motion_change.x * multiplier; - last_motion_change.y = last_motion_change.y * multiplier; + last_motion_change[0] = last_motion_change[0] * multiplier; + last_motion_change[1] = last_motion_change[1] * multiplier; } const BasicMotion motion_data{ - .gyro_x = last_motion_change.x * sensitivity, - .gyro_y = last_motion_change.y * sensitivity, - .gyro_z = last_motion_change.z * sensitivity, + .gyro_x = last_motion_change[0] * sensitivity, + .gyro_y = last_motion_change[1] * sensitivity, + .gyro_z = last_motion_change[2] * sensitivity, .accel_x = 0, .accel_y = 0, .accel_z = 0, @@ -125,10 +125,10 @@ void Mouse::UpdateMotionInput() { }; if (IsMousePanningEnabled()) { - last_motion_change.x = 0; - last_motion_change.y = 0; + last_motion_change[0] = 0; + last_motion_change[1] = 0; } - last_motion_change.z = 0; + last_motion_change[2] = 0; SetMotion(motion_identifier, 0, motion_data); } @@ -136,13 +136,13 @@ void Mouse::UpdateMotionInput() { void Mouse::Move(int x, int y, int center_x, int center_y) { if (IsMousePanningEnabled()) { auto const mouse_change_int = Common::Vec(x, y) - Common::Vec(center_x, center_y); - auto const mouse_change = Common::Vec(float(mouse_change_int.x), float(mouse_change_int.y)); + auto const mouse_change = Common::Vec(float(mouse_change_int[0]), float(mouse_change_int[1])); auto const x_sensitivity = Settings::values.mouse_panning_x_sensitivity.GetValue() * default_panning_sensitivity; auto const y_sensitivity = Settings::values.mouse_panning_y_sensitivity.GetValue() * default_panning_sensitivity; auto const deadzone_cw = Settings::values.mouse_panning_deadzone_counterweight.GetValue() * default_deadzone_counterweight; - last_motion_change += {-mouse_change.y * x_sensitivity, -mouse_change.x * y_sensitivity, 0}; - last_mouse_change.x += mouse_change.x * x_sensitivity; - last_mouse_change.y += mouse_change.y * y_sensitivity; + last_motion_change += {-mouse_change[1] * x_sensitivity, -mouse_change[0] * y_sensitivity, 0}; + last_mouse_change[0] += mouse_change[0] * x_sensitivity; + last_mouse_change[1] += mouse_change[1] * y_sensitivity; // Bind the mouse change to [0 <= deadzone_cw <= 1.0] const float length = last_mouse_change.Length(); if (length < deadzone_cw && length != 0.0f) { @@ -158,13 +158,13 @@ void Mouse::Move(int x, int y, int center_x, int center_y) { Settings::values.mouse_panning_x_sensitivity.GetValue() * default_stick_sensitivity; const float y_sensitivity = Settings::values.mouse_panning_y_sensitivity.GetValue() * default_stick_sensitivity; - SetAxis(identifier, mouse_axis_x, static_cast(mouse_move.x) * x_sensitivity); - SetAxis(identifier, mouse_axis_y, static_cast(-mouse_move.y) * y_sensitivity); + SetAxis(identifier, mouse_axis_x, float(mouse_move[0]) * x_sensitivity); + SetAxis(identifier, mouse_axis_y, float(-mouse_move[1]) * y_sensitivity); last_motion_change = { - static_cast(-mouse_move.y) * x_sensitivity, - static_cast(-mouse_move.x) * y_sensitivity, - last_motion_change.z, + float(-mouse_move[1]) * x_sensitivity, + float(-mouse_move[0]) * y_sensitivity, + last_motion_change[2], }; } } @@ -213,18 +213,18 @@ void Mouse::ReleaseButton(MouseButton button) { SetAxis(identifier, mouse_axis_y, 0); } - last_motion_change.x = 0; - last_motion_change.y = 0; + last_motion_change[0] = 0; + last_motion_change[1] = 0; button_pressed = false; } void Mouse::MouseWheelChange(int x, int y) { - wheel_position.x += x; - wheel_position.y += y; - last_motion_change.z += static_cast(y); - SetAxis(identifier, wheel_axis_x, static_cast(wheel_position.x)); - SetAxis(identifier, wheel_axis_y, static_cast(wheel_position.y)); + wheel_position[0] += x; + wheel_position[1] += y; + last_motion_change[2] += static_cast(y); + SetAxis(identifier, wheel_axis_x, static_cast(wheel_position[0])); + SetAxis(identifier, wheel_axis_y, static_cast(wheel_position[1])); } void Mouse::ReleaseAllButtons() { diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index 2c1c424bdc..faf4e021ec 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp @@ -2950,37 +2950,37 @@ void PlayerControlPreview::Draw3dCube(QPainter& p, QPointF center, const Common: }; for (Common::Vec& point : cube) { - float temp = point.y; - point.y = std::cos(euler.x) * point.y - std::sin(euler.x) * point.z; - point.z = std::sin(euler.x) * temp + std::cos(euler.x) * point.z; - temp = point.x; - point.x = std::cos(euler.y) * point.x + std::sin(euler.y) * point.z; - point.z = -std::sin(euler.y) * temp + std::cos(euler.y) * point.z; - temp = point.x; - point.x = std::cos(euler.z) * point.x - std::sin(euler.z) * point.y; - point.y = std::sin(euler.z) * temp + std::cos(euler.z) * point.y; + float temp = point[1]; + point[1] = std::cos(euler[0]) * point[1] - std::sin(euler[0]) * point[2]; + point[2] = std::sin(euler[0]) * temp + std::cos(euler[0]) * point[2]; + temp = point[0]; + point[0] = std::cos(euler[1]) * point[0] + std::sin(euler[1]) * point[2]; + point[2] = -std::sin(euler[1]) * temp + std::cos(euler[1]) * point[2]; + temp = point[0]; + point[0] = std::cos(euler[2]) * point[0] - std::sin(euler[2]) * point[1]; + point[1] = std::sin(euler[2]) * temp + std::cos(euler[2]) * point[1]; point *= size; } const std::array front_face{ - center + QPointF{cube[0].x, cube[0].y}, - center + QPointF{cube[1].x, cube[1].y}, - center + QPointF{cube[2].x, cube[2].y}, - center + QPointF{cube[3].x, cube[3].y}, + center + QPointF{cube[0][0], cube[0][1]}, + center + QPointF{cube[1][0], cube[1][1]}, + center + QPointF{cube[2][0], cube[2][1]}, + center + QPointF{cube[3][0], cube[3][1]}, }; const std::array back_face{ - center + QPointF{cube[4].x, cube[4].y}, - center + QPointF{cube[5].x, cube[5].y}, - center + QPointF{cube[6].x, cube[6].y}, - center + QPointF{cube[7].x, cube[7].y}, + center + QPointF{cube[4][0], cube[4][1]}, + center + QPointF{cube[5][0], cube[5][1]}, + center + QPointF{cube[6][0], cube[6][1]}, + center + QPointF{cube[7][0], cube[7][1]}, }; DrawPolygon(p, front_face); DrawPolygon(p, back_face); - p.drawLine(center + QPointF{cube[0].x, cube[0].y}, center + QPointF{cube[4].x, cube[4].y}); - p.drawLine(center + QPointF{cube[1].x, cube[1].y}, center + QPointF{cube[5].x, cube[5].y}); - p.drawLine(center + QPointF{cube[2].x, cube[2].y}, center + QPointF{cube[6].x, cube[6].y}); - p.drawLine(center + QPointF{cube[3].x, cube[3].y}, center + QPointF{cube[7].x, cube[7].y}); + p.drawLine(center + QPointF{cube[0][0], cube[0][1]}, center + QPointF{cube[4][0], cube[4][1]}); + p.drawLine(center + QPointF{cube[1][0], cube[1][1]}, center + QPointF{cube[5][0], cube[5][1]}); + p.drawLine(center + QPointF{cube[2][0], cube[2][1]}, center + QPointF{cube[6][0], cube[6][1]}); + p.drawLine(center + QPointF{cube[3][0], cube[3][1]}, center + QPointF{cube[7][0], cube[7][1]}); } template