diff --git a/matrix/AxisAngle.hpp b/matrix/AxisAngle.hpp index 51d6a3e26a..339651fe0a 100644 --- a/matrix/AxisAngle.hpp +++ b/matrix/AxisAngle.hpp @@ -38,7 +38,7 @@ public: * * @param data_ array */ - AxisAngle(const Type *data_) : + AxisAngle(const Type data_[3]) : Vector(data_) { } diff --git a/matrix/Matrix.hpp b/matrix/Matrix.hpp index 151b337884..ea2f8330d9 100644 --- a/matrix/Matrix.hpp +++ b/matrix/Matrix.hpp @@ -24,7 +24,7 @@ namespace matrix template class Vector; -template +template class Matrix { @@ -35,12 +35,12 @@ public: // Constructors Matrix() = default; - Matrix(const Type data_[][N]) + Matrix(const Type data_[M*N]) { memcpy(_data, data_, sizeof(_data)); } - Matrix(const Type *data_) + Matrix(const Type data_[M][N]) { memcpy(_data, data_, sizeof(_data)); } diff --git a/matrix/Quaternion.hpp b/matrix/Quaternion.hpp index cbf2c2b85a..180bbd57cc 100644 --- a/matrix/Quaternion.hpp +++ b/matrix/Quaternion.hpp @@ -62,7 +62,7 @@ public: * * @param data_ array */ - Quaternion(const Type *data_) : + Quaternion(const Type data_[4]) : Vector(data_) { } diff --git a/matrix/SquareMatrix.hpp b/matrix/SquareMatrix.hpp index 2e348137b1..5421dbab20 100644 --- a/matrix/SquareMatrix.hpp +++ b/matrix/SquareMatrix.hpp @@ -26,7 +26,7 @@ class SquareMatrix : public Matrix public: SquareMatrix() = default; - SquareMatrix(const Type *data_) : + SquareMatrix(const Type data_[M][M]) : Matrix(data_) { } diff --git a/matrix/Vector.hpp b/matrix/Vector.hpp index 7ea2d0caee..4c5bd915f8 100644 --- a/matrix/Vector.hpp +++ b/matrix/Vector.hpp @@ -29,7 +29,7 @@ public: { } - Vector(const Type *data_) : + Vector(const Type data_[M]) : MatrixM1(data_) { } diff --git a/matrix/Vector2.hpp b/matrix/Vector2.hpp index 7aeeb1d927..f6577e255e 100644 --- a/matrix/Vector2.hpp +++ b/matrix/Vector2.hpp @@ -30,7 +30,7 @@ public: { } - Vector2(const Type *data_) : + Vector2(const Type data_[2]) : Vector(data_) { } diff --git a/matrix/Vector3.hpp b/matrix/Vector3.hpp index 989e247032..dea65de5f4 100644 --- a/matrix/Vector3.hpp +++ b/matrix/Vector3.hpp @@ -36,7 +36,7 @@ public: { } - Vector3(const Type *data_) : + Vector3(const Type data_[3]) : Vector(data_) { }