WiimoteEmu: Remove redundant Matrix library and use the one in Common.

Source/Core/Common/Matrix.cpp

@@ -4,10 +4,12 @@
 
 #include "Common/Matrix.h"
 
-#include <cmath>
 #include <algorithm>
+#include <cmath>
 
-inline void MatrixMul(int n, const float* a, const float* b, float* result)
+namespace
+{
+void MatrixMul(int n, const float* a, const float* b, float* result)
 {
   for (int i = 0; i < n; ++i)
   {
@@ -22,7 +24,10 @@ inline void MatrixMul(int n, const float* a, const float* b, float* result)
     }
   }
 }
+}  // namespace
 
+namespace Common
+{
 Matrix33 Matrix33::Identity()
 {
   Matrix33 mtx = {};
@@ -34,8 +39,8 @@ Matrix33 Matrix33::Identity()
 
 Matrix33 Matrix33::RotateX(float rad)
 {
-  float s = sin(rad);
-  float c = cos(rad);
+  const float s = sin(rad);
+  const float c = cos(rad);
   Matrix33 mtx = {};
   mtx.data[0] = 1;
   mtx.data[4] = c;
@@ -47,8 +52,8 @@ Matrix33 Matrix33::RotateX(float rad)
 
 Matrix33 Matrix33::RotateY(float rad)
 {
-  float s = sin(rad);
-  float c = cos(rad);
+  const float s = sin(rad);
+  const float c = cos(rad);
   Matrix33 mtx = {};
   mtx.data[0] = c;
   mtx.data[2] = s;
@@ -60,8 +65,8 @@ Matrix33 Matrix33::RotateY(float rad)
 
 Matrix33 Matrix33::RotateZ(float rad)
 {
-  float s = sin(rad);
-  float c = cos(rad);
+  const float s = sin(rad);
+  const float c = cos(rad);
   Matrix33 mtx = {};
   mtx.data[0] = c;
   mtx.data[1] = -s;
@@ -128,10 +133,10 @@ Matrix44 Matrix44::FromMatrix33(const Matrix33& m33)
   return mtx;
 }
 
-Matrix44 Matrix44::FromArray(const float mtxArray[16])
+Matrix44 Matrix44::FromArray(const std::array<float, 16>& arr)
 {
   Matrix44 mtx;
-  std::copy_n(mtxArray, 16, std::begin(mtx.data));
+  mtx.data = arr;
   return mtx;
 }
 
@@ -140,7 +145,7 @@ Matrix44 Matrix44::Translate(const Vec3& vec)
   Matrix44 mtx = Matrix44::Identity();
   mtx.data[3] = vec.x;
   mtx.data[7] = vec.y;
-  mtx.data[11] = vec.y;
+  mtx.data[11] = vec.z;
   return mtx;
 }
 
@@ -152,7 +157,8 @@ Matrix44 Matrix44::Shear(const float a, const float b)
   return mtx;
 }
 
-void Matrix44::Multiply(const Matrix44& a, const Matrix44& b, Matrix44& result)
+void Matrix44::Multiply(const Matrix44& a, const Matrix44& b, Matrix44* result)
 {
-  MatrixMul(4, a.data.data(), b.data.data(), result.data.data());
+  MatrixMul(4, a.data.data(), b.data.data(), result->data.data());
 }
+}  // namespace Common

Source/Core/Common/Matrix.h

@@ -9,11 +9,21 @@
 // Tiny matrix/vector library.
 // Used for things like Free-Look in the gfx backend.
 
+namespace Common
+{
 union Vec3
 {
-  Vec3() {}
+  Vec3() = default;
   Vec3(float _x, float _y, float _z) : data{_x, _y, _z} {}
 
+  Vec3& operator+=(const Vec3& rhs)
+  {
+    x += rhs.x;
+    y += rhs.y;
+    z += rhs.z;
+    return *this;
+  }
+
   std::array<float, 3> data = {};
 
   struct
@@ -24,6 +34,11 @@ union Vec3
   };
 };
 
+inline Vec3 operator+(Vec3 lhs, const Vec3& rhs)
+{
+  return lhs += rhs;
+}
+
 class Matrix33
 {
 public:
@@ -66,16 +81,16 @@ class Matrix44
 public:
   static Matrix44 Identity();
   static Matrix44 FromMatrix33(const Matrix33& m33);
-  static Matrix44 FromArray(const float mtxArray[16]);
+  static Matrix44 FromArray(const std::array<float, 16>& arr);
 
   static Matrix44 Translate(const Vec3& vec);
   static Matrix44 Shear(const float a, const float b = 0);
 
-  static void Multiply(const Matrix44& a, const Matrix44& b, Matrix44& result);
+  static void Multiply(const Matrix44& a, const Matrix44& b, Matrix44* result);
 
   Matrix44& operator*=(const Matrix44& rhs)
   {
-    Multiply(Matrix44(*this), rhs, *this);
+    Multiply(Matrix44(*this), rhs, this);
     return *this;
   }
 
@@ -85,4 +100,5 @@ public:
 inline Matrix44 operator*(Matrix44 lhs, const Matrix44& rhs)
 {
   return lhs *= rhs;
-}
+}
+}  // namespace Common