midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common/quaternion: Move Quaternion into the Common namespace

Browse Source 
Quaternion is within the common library, so it should be using the
Common namespace.
This commit is contained in:
Lioncash 2019-02-26 22:31:15 -05:00 committed by fearlessTobi
parent ad1cfc8d50
commit db58652680
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/quaternion.h
View File

@ -6,7 +6,7 @@
#include "common/vector_math.h" #include "common/vector_math.h"
namespace Math { namespace Common {
template <typename T> template <typename T>
class Quaternion { class Quaternion {
@ -46,4 +46,4 @@ inline Quaternion<float> MakeQuaternion(const Math::Vec3<float>& axis, float ang
return {axis * std::sin(angle / 2), std::cos(angle / 2)}; return {axis * std::sin(angle / 2), std::cos(angle / 2)};
} }
} // namespace Math } // namespace Common

8
src/input_common/motion_emu.cpp
View File

@ -87,8 +87,8 @@ private:
void MotionEmuThread() { void MotionEmuThread() {
auto update_time = std::chrono::steady_clock::now(); auto update_time = std::chrono::steady_clock::now();
Math::Quaternion<float> q = MakeQuaternion(Math::Vec3<float>(), 0); Common::Quaternion<float> q = Common::MakeQuaternion(Math::Vec3<float>(), 0);
Math::Quaternion<float> old_q; Common::Quaternion<float> old_q;
while (!shutdown_event.WaitUntil(update_time)) { while (!shutdown_event.WaitUntil(update_time)) {
update_time += update_duration; update_time += update_duration;
@ -98,8 +98,8 @@ private:
std::lock_guard<std::mutex> guard(tilt_mutex); std::lock_guard<std::mutex> guard(tilt_mutex);
// Find the quaternion describing current 3DS tilting // Find the quaternion describing current 3DS tilting
q = MakeQuaternion(Math::MakeVec(-tilt_direction.y, 0.0f, tilt_direction.x), q = Common::MakeQuaternion(Math::MakeVec(-tilt_direction.y, 0.0f, tilt_direction.x),
tilt_angle); tilt_angle);
} }
auto inv_q = q.Inverse(); auto inv_q = q.Inverse();