github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-19 21:13:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Motion Data on Switch

Browse source
This commit is contained in:
Florian Märkl 2021-01-11 21:22:04 +01:00
commit 12054a91c9
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
1 changed files with 46 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

76
switch/src/io.cpp
View file

@ -468,37 +468,53 @@ bool IO::ReadGameSixAxis(ChiakiControllerState *state)
hidGetSixAxisSensorStates(this->sixaxis_handles[3], &sixaxis, 1); hidGetSixAxisSensorStates(this->sixaxis_handles[3], &sixaxis, 1);
} }
// printf("Acceleration: x=% .4f, y=% .4f, z=% .4f\n", sixaxis.acceleration.x, sixaxis.acceleration.y, sixaxis.acceleration.z); state->gyro_x = sixaxis.angular_velocity.x * 2.0f * M_PI;
// printf("Angular velocity: x=% .4f, y=% .4f, z=% .4f\n", sixaxis.angular_velocity.x, sixaxis.angular_velocity.y, sixaxis.angular_velocity.z); state->gyro_y = sixaxis.angular_velocity.z * 2.0f * M_PI;
// printf("Angle: x=% .4f, y=% .4f, z=% .4f\n", sixaxis.angle.x, sixaxis.angle.y, sixaxis.angle.z); state->gyro_z = -sixaxis.angular_velocity.y * 2.0f * M_PI;
// printf("Direction matrix:\n" state->accel_x = -sixaxis.acceleration.x;
// " [ % .4f, % .4f, % .4f ]\n" state->accel_y = -sixaxis.acceleration.z;
// " [ % .4f, % .4f, % .4f ]\n" state->accel_z = sixaxis.acceleration.y;
// " [ % .4f, % .4f, % .4f ]\n",
// sixaxis.direction.direction[0][0], sixaxis.direction.direction[1][0], sixaxis.direction.direction[2][0],
// sixaxis.direction.direction[0][1], sixaxis.direction.direction[1][1], sixaxis.direction.direction[2][1],
// sixaxis.direction.direction[0][2], sixaxis.direction.direction[1][2], sixaxis.direction.direction[2][2]);
state->gyro_x = sixaxis.angular_velocity.x; // https://d3cw3dd2w32x2b.cloudfront.net/wp-content/uploads/2015/01/matrix-to-quat.pdf
state->gyro_y = sixaxis.angular_velocity.y; float (*dm)[3] = sixaxis.direction.direction;
state->gyro_z = sixaxis.angular_velocity.z; float m[3][3] = {
state->accel_x = sixaxis.acceleration.x; { dm[0][0], dm[2][0], dm[1][0] },
state->accel_y = sixaxis.acceleration.y; { dm[0][2], dm[2][2], dm[1][2] },
state->accel_z = sixaxis.acceleration.z; { dm[0][1], dm[2][1], dm[1][1] }
};
// thank you @thestr4ng3r for the hint std::array<float, 4> q;
// https://en.wikipedia.org/wiki/Conversion_between_quaternions_and_Euler_angles#Euler_angles_to_quaternion_conversion float t;
double cy = cos(sixaxis.angle.z * 0.5); if(m[2][2] < 0)
double sy = sin(sixaxis.angle.z * 0.5); {
double cp = cos(sixaxis.angle.y * 0.5); if (m[0][0] > m[1][1])
double sp = sin(sixaxis.angle.y * 0.5); {
double cr = cos(sixaxis.angle.x * 0.5); t = 1 + m[0][0] - m[1][1] - m[2][2];
double sr = sin(sixaxis.angle.x * 0.5); q = { t, m[0][1] + m[1][0], m[2][0] + m[0][2], m[1][2] - m[2][1] };
}
state->orient_x = sr * cp * cy - cr * sp * sy; else
state->orient_y = cr * sp * cy + sr * cp * sy; {
state->orient_z = cr * cp * sy - sr * sp * cy; t = 1 - m[0][0] + m[1][1] -m[2][2];
state->orient_w = cr * cp * cy + sr * sp * sy; q = { m[0][1] + m[1][0], t, m[1][2] + m[2][1], m[2][0] - m[0][2] };
}
}
else
{
if(m[0][0] < -m[1][1])
{
t = 1 - m[0][0] - m[1][1] + m[2][2];
q = { m[2][0] + m[0][2], m[1][2] + m[2][1], t, m[0][1] - m[1][0] };
}
else
{
t = 1 + m[0][0] + m[1][1] + m[2][2];
q = { m[1][2] - m[2][1], m[2][0] - m[0][2], m[0][1] - m[1][0], t };
}
}
float fac = 0.5f / sqrt(t);
state->orient_x = q[0] * fac;
state->orient_y = q[1] * fac;
state->orient_z = -q[2] * fac;
state->orient_w = q[3] * fac;
return true; return true;
#else #else
return false; return false;