debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-10-30 11:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

evil

Browse Source
This commit is contained in:
lizzie
2026-09-01 06:40:41 +00:00
parent da71711bed
commit 9443c1590b
2 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input_common/drivers/mouse.cpp
+28 -28
View File
@@ -88,8 +88,8 @@ void Mouse::UpdateStickInput() {
last_mouse_change *= maximum_stick_range; last_mouse_change *= maximum_stick_range;
} }
SetAxis(identifier, mouse_axis_x, last_mouse_change.x); SetAxis(identifier, mouse_axis_x, last_mouse_change[0]);
SetAxis(identifier, mouse_axis_y, -last_mouse_change.y); SetAxis(identifier, mouse_axis_y, -last_mouse_change[1]);
// Decay input over time // Decay input over time
const float clamped_length = (std::min)(1.0f, length); const float clamped_length = (std::min)(1.0f, length);
@@ -104,20 +104,20 @@ void Mouse::UpdateMotionInput() {
const float sensitivity = const float sensitivity =
IsMousePanningEnabled() ? default_motion_panning_sensitivity : default_motion_sensitivity; IsMousePanningEnabled() ? default_motion_panning_sensitivity : default_motion_sensitivity;
const float rotation_velocity = std::sqrt(last_motion_change.x * last_motion_change.x + const float rotation_velocity = std::sqrt(last_motion_change[0] * last_motion_change[0] +
last_motion_change.y * last_motion_change.y); last_motion_change[1] * last_motion_change[1]);
// Clamp rotation speed // Clamp rotation speed
if (rotation_velocity > maximum_rotation_speed / sensitivity) { if (rotation_velocity > maximum_rotation_speed / sensitivity) {
const float multiplier = maximum_rotation_speed / rotation_velocity / sensitivity; const float multiplier = maximum_rotation_speed / rotation_velocity / sensitivity;
last_motion_change.x = last_motion_change.x * multiplier; last_motion_change[0] = last_motion_change[0] * multiplier;
last_motion_change.y = last_motion_change.y * multiplier; last_motion_change[1] = last_motion_change[1] * multiplier;
} }
const BasicMotion motion_data{ const BasicMotion motion_data{
.gyro_x = last_motion_change.x * sensitivity, .gyro_x = last_motion_change[0] * sensitivity,
.gyro_y = last_motion_change.y * sensitivity, .gyro_y = last_motion_change[1] * sensitivity,
.gyro_z = last_motion_change.z * sensitivity, .gyro_z = last_motion_change[2] * sensitivity,
.accel_x = 0, .accel_x = 0,
.accel_y = 0, .accel_y = 0,
.accel_z = 0, .accel_z = 0,
@@ -125,10 +125,10 @@ void Mouse::UpdateMotionInput() {
}; };
if (IsMousePanningEnabled()) { if (IsMousePanningEnabled()) {
last_motion_change.x = 0; last_motion_change[0] = 0;
last_motion_change.y = 0; last_motion_change[1] = 0;
} }
last_motion_change.z = 0; last_motion_change[2] = 0;
SetMotion(motion_identifier, 0, motion_data); 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) { void Mouse::Move(int x, int y, int center_x, int center_y) {
if (IsMousePanningEnabled()) { if (IsMousePanningEnabled()) {
auto const mouse_change_int = Common::Vec<int, 2>(x, y) - Common::Vec<int, 2>(center_x, center_y); auto const mouse_change_int = Common::Vec<int, 2>(x, y) - Common::Vec<int, 2>(center_x, center_y);
auto const mouse_change = Common::Vec<float, 2>(float(mouse_change_int.x), float(mouse_change_int.y)); auto const mouse_change = Common::Vec<float, 2>(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 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 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; 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_motion_change += {-mouse_change[1] * x_sensitivity, -mouse_change[0] * y_sensitivity, 0};
last_mouse_change.x += mouse_change.x * x_sensitivity; last_mouse_change[0] += mouse_change[0] * x_sensitivity;
last_mouse_change.y += mouse_change.y * y_sensitivity; last_mouse_change[1] += mouse_change[1] * y_sensitivity;
// Bind the mouse change to [0 <= deadzone_cw <= 1.0] // Bind the mouse change to [0 <= deadzone_cw <= 1.0]
const float length = last_mouse_change.Length(); const float length = last_mouse_change.Length();
if (length < deadzone_cw && length != 0.0f) { 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; Settings::values.mouse_panning_x_sensitivity.GetValue() * default_stick_sensitivity;
const float y_sensitivity = const float y_sensitivity =
Settings::values.mouse_panning_y_sensitivity.GetValue() * default_stick_sensitivity; Settings::values.mouse_panning_y_sensitivity.GetValue() * default_stick_sensitivity;
SetAxis(identifier, mouse_axis_x, static_cast<float>(mouse_move.x) * x_sensitivity); SetAxis(identifier, mouse_axis_x, float(mouse_move[0]) * x_sensitivity);
SetAxis(identifier, mouse_axis_y, static_cast<float>(-mouse_move.y) * y_sensitivity); SetAxis(identifier, mouse_axis_y, float(-mouse_move[1]) * y_sensitivity);
last_motion_change = { last_motion_change = {
static_cast<float>(-mouse_move.y) * x_sensitivity, float(-mouse_move[1]) * x_sensitivity,
static_cast<float>(-mouse_move.x) * y_sensitivity, float(-mouse_move[0]) * y_sensitivity,
last_motion_change.z, last_motion_change[2],
}; };
} }
} }
@@ -213,18 +213,18 @@ void Mouse::ReleaseButton(MouseButton button) {
SetAxis(identifier, mouse_axis_y, 0); SetAxis(identifier, mouse_axis_y, 0);
} }
last_motion_change.x = 0; last_motion_change[0] = 0;
last_motion_change.y = 0; last_motion_change[1] = 0;
button_pressed = false; button_pressed = false;
} }
void Mouse::MouseWheelChange(int x, int y) { void Mouse::MouseWheelChange(int x, int y) {
wheel_position.x += x; wheel_position[0] += x;
wheel_position.y += y; wheel_position[1] += y;
last_motion_change.z += static_cast<f32>(y); last_motion_change[2] += static_cast<f32>(y);
SetAxis(identifier, wheel_axis_x, static_cast<f32>(wheel_position.x)); SetAxis(identifier, wheel_axis_x, static_cast<f32>(wheel_position[0]));
SetAxis(identifier, wheel_axis_y, static_cast<f32>(wheel_position.y)); SetAxis(identifier, wheel_axis_y, static_cast<f32>(wheel_position[1]));
} }
void Mouse::ReleaseAllButtons() { void Mouse::ReleaseAllButtons() {
src/yuzu/configuration/configure_input_player_widget.cpp
+21 -21
View File
@@ -2950,37 +2950,37 @@ void PlayerControlPreview::Draw3dCube(QPainter& p, QPointF center, const Common:
}; };
for (Common::Vec<f32, 3>& point : cube) { for (Common::Vec<f32, 3>& point : cube) {
float temp = point.y; float temp = point[1];
point.y = std::cos(euler.x) * point.y - std::sin(euler.x) * point.z; point[1] = std::cos(euler[0]) * point[1] - std::sin(euler[0]) * point[2];
point.z = std::sin(euler.x) * temp + std::cos(euler.x) * point.z; point[2] = std::sin(euler[0]) * temp + std::cos(euler[0]) * point[2];
temp = point.x; temp = point[0];
point.x = std::cos(euler.y) * point.x + std::sin(euler.y) * point.z; point[0] = std::cos(euler[1]) * point[0] + std::sin(euler[1]) * point[2];
point.z = -std::sin(euler.y) * temp + std::cos(euler.y) * point.z; point[2] = -std::sin(euler[1]) * temp + std::cos(euler[1]) * point[2];
temp = point.x; temp = point[0];
point.x = std::cos(euler.z) * point.x - std::sin(euler.z) * point.y; point[0] = std::cos(euler[2]) * point[0] - std::sin(euler[2]) * point[1];
point.y = std::sin(euler.z) * temp + std::cos(euler.z) * point.y; point[1] = std::sin(euler[2]) * temp + std::cos(euler[2]) * point[1];
point *= size; point *= size;
} }
const std::array<QPointF, 4> front_face{ const std::array<QPointF, 4> front_face{
center + QPointF{cube[0].x, cube[0].y}, center + QPointF{cube[0][0], cube[0][1]},
center + QPointF{cube[1].x, cube[1].y}, center + QPointF{cube[1][0], cube[1][1]},
center + QPointF{cube[2].x, cube[2].y}, center + QPointF{cube[2][0], cube[2][1]},
center + QPointF{cube[3].x, cube[3].y}, center + QPointF{cube[3][0], cube[3][1]},
}; };
const std::array<QPointF, 4> back_face{ const std::array<QPointF, 4> back_face{
center + QPointF{cube[4].x, cube[4].y}, center + QPointF{cube[4][0], cube[4][1]},
center + QPointF{cube[5].x, cube[5].y}, center + QPointF{cube[5][0], cube[5][1]},
center + QPointF{cube[6].x, cube[6].y}, center + QPointF{cube[6][0], cube[6][1]},
center + QPointF{cube[7].x, cube[7].y}, center + QPointF{cube[7][0], cube[7][1]},
}; };
DrawPolygon(p, front_face); DrawPolygon(p, front_face);
DrawPolygon(p, back_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[0][0], cube[0][1]}, center + QPointF{cube[4][0], cube[4][1]});
p.drawLine(center + QPointF{cube[1].x, cube[1].y}, center + QPointF{cube[5].x, cube[5].y}); p.drawLine(center + QPointF{cube[1][0], cube[1][1]}, center + QPointF{cube[5][0], cube[5][1]});
p.drawLine(center + QPointF{cube[2].x, cube[2].y}, center + QPointF{cube[6].x, cube[6].y}); p.drawLine(center + QPointF{cube[2][0], cube[2][1]}, center + QPointF{cube[6][0], cube[6][1]});
p.drawLine(center + QPointF{cube[3].x, cube[3].y}, center + QPointF{cube[7].x, cube[7].y}); p.drawLine(center + QPointF{cube[3][0], cube[3][1]}, center + QPointF{cube[7][0], cube[7][1]});
} }
template <size_t N> template <size_t N>