archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cellGem: Improve mouse handler orientation

Browse source 
This also makes it easily configurable with the CONE setting in the future
This commit is contained in:
Megamouse 2024-12-12 23:19:09 +01:00
parent b08829817f
commit 8dbe88782c
1 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

39
rpcs3/Emu/Cell/Modules/cellGem.cpp
View file

@ -232,8 +232,8 @@ public:
u8 rumble = 0; // Rumble intensity u8 rumble = 0; // Rumble intensity
gem_color sphere_rgb = {}; // RGB color of the sphere LED gem_color sphere_rgb = {}; // RGB color of the sphere LED
u32 hue = 0; // Tracking hue of the motion controller u32 hue = 0; // Tracking hue of the motion controller
f32 distance_mm{1500.0f}; // Distance from the camera in mm f32 distance_mm{3000.0f}; // Distance from the camera in mm
f32 radius{10.0f}; // Radius of the sphere in camera pixels f32 radius{5.0f}; // Radius of the sphere in camera pixels
bool radius_valid = true; // If the radius and distance of the sphere was computed. bool radius_valid = true; // If the radius and distance of the sphere was computed.
bool is_calibrating{false}; // Whether or not we are currently calibrating bool is_calibrating{false}; // Whether or not we are currently calibrating
@ -919,9 +919,13 @@ static inline void pos_to_gem_state(u32 gem_num, gem_config::gem_controller& con
const f32 image_x = static_cast<f32>(x_pos) / scaling_width; const f32 image_x = static_cast<f32>(x_pos) / scaling_width;
const f32 image_y = static_cast<f32>(y_pos) / scaling_height; const f32 image_y = static_cast<f32>(y_pos) / scaling_height;
// Half of the camera image
const f32 half_width = shared_data.width / 2.f;
const f32 half_height = shared_data.height / 2.f;
// Centered image coordinates in pixels // Centered image coordinates in pixels
const f32 centered_x = image_x - (shared_data.width / 2.f); const f32 centered_x = image_x - half_width;
const f32 centered_y = (shared_data.height / 2.f) - image_y; // Image coordinates increase downwards, so we have to invert this const f32 centered_y = half_height - image_y; // Image coordinates increase downwards, so we have to invert this
// Camera coordinates in mm (centered, so it's the same as world coordinates) // Camera coordinates in mm (centered, so it's the same as world coordinates)
const f32 camera_x = centered_x * mmPerPixel; const f32 camera_x = centered_x * mmPerPixel;
@ -949,10 +953,29 @@ static inline void pos_to_gem_state(u32 gem_num, gem_config::gem_controller& con
} }
else else
{ {
gem_state->quat[0] = 320.f - image_x; static constexpr f32 PI = 3.14159265f;
gem_state->quat[1] = (y_pos / scaling_width) - 180.f; const auto degree_to_rad = [](f32 degree) -> f32 { return degree * PI / 180.0f; };
gem_state->quat[2] = 1200.f;
gem_state->quat[3] = 1.f; static constexpr f32 CONE = 10.0f / 2.0f;
const f32 roll = -degree_to_rad((image_y - half_height) / half_height * CONE); // This is actually the pitch
const f32 pitch = -degree_to_rad((image_x - half_width) / half_width * CONE); // This is actually the yaw
const f32 yaw = degree_to_rad(0.0f);
const f32 cr = std::cos(roll * 0.5f);
const f32 sr = std::sin(roll * 0.5f);
const f32 cp = std::cos(pitch * 0.5f);
const f32 sp = std::sin(pitch * 0.5f);
const f32 cy = std::cos(yaw * 0.5f);
const f32 sy = std::sin(yaw * 0.5f);
const f32 q_x = sr * cp * cy - cr * sp * sy;
const f32 q_y = cr * sp * cy + sr * cp * sy;
const f32 q_z = cr * cp * sy - sr * sp * cy;
const f32 q_w = cr * cp * cy + sr * sp * sy;
gem_state->quat[0] = q_x;
gem_state->quat[1] = q_y;
gem_state->quat[2] = q_z;
gem_state->quat[3] = q_w;
} }
if (g_cfg.io.show_move_cursor) if (g_cfg.io.show_move_cursor)