Replace std::array with raw arrays in matrices

mogemimi · Jan 28, 2018 · d2a55a1 · d2a55a1
1 parent b35d3dd
commit d2a55a1
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 22 deletions.
diff --git a/include/Pomdog/Math/detail/FloatingPointMatrix2x2.hpp b/include/Pomdog/Math/detail/FloatingPointMatrix2x2.hpp
@@ -7,7 +7,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
-#include <array>
 
 namespace Pomdog {
 namespace Detail {
@@ -18,7 +17,7 @@ class POMDOG_EXPORT FloatingPointMatrix2x2 {
     static_assert(std::is_floating_point<T>::value, "T is floating point.");
     typedef T value_type;
 
-    std::array<std::array<T, 2>, 2> m;
+    T m[2][2];
 
 private:
     static constexpr std::size_t RowSize = 2;

diff --git a/include/Pomdog/Math/detail/FloatingPointMatrix3x2.hpp b/include/Pomdog/Math/detail/FloatingPointMatrix3x2.hpp
@@ -7,7 +7,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
-#include <array>
 
 namespace Pomdog {
 namespace Detail {
@@ -18,7 +17,7 @@ class POMDOG_EXPORT FloatingPointMatrix3x2 {
     static_assert(std::is_floating_point<T>::value, "T is floating point.");
     typedef T value_type;
 
-    std::array<std::array<T, 2>, 3> m;
+    T m[3][2];
 
 private:
     static constexpr std::size_t RowSize = 3;

diff --git a/include/Pomdog/Math/detail/FloatingPointMatrix3x3.hpp b/include/Pomdog/Math/detail/FloatingPointMatrix3x3.hpp
@@ -7,7 +7,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
-#include <array>
 
 namespace Pomdog {
 namespace Detail {
@@ -18,7 +17,7 @@ class POMDOG_EXPORT FloatingPointMatrix3x3 {
     static_assert(std::is_floating_point<T>::value, "T is floating point.");
     typedef T value_type;
 
-    std::array<std::array<T, 3>, 3> m;
+    T m[3][3];
 
 private:
     static constexpr std::size_t RowSize = 3;

diff --git a/include/Pomdog/Math/detail/FloatingPointMatrix4x4.hpp b/include/Pomdog/Math/detail/FloatingPointMatrix4x4.hpp
@@ -7,7 +7,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
-#include <array>
 
 namespace Pomdog {
 namespace Detail {
@@ -18,13 +17,7 @@ class POMDOG_EXPORT FloatingPointMatrix4x4 {
     static_assert(std::is_floating_point<T>::value, "T is floating point.");
     typedef T value_type;
 
-    //union {
-    //    std::array<std::array<T, 4>, 4> m;
-    //#if defined __i386__ || defined __x86_64__
-    //    std::array<__m128, 4>
-    //#endif
-    //};
-    std::array<std::array<T, 4>, 4> m;
+    T m[4][4];
 
 private:
     static constexpr std::size_t RowSize = 4;

diff --git a/src/Math/detail/FloatingPointMatrix2x2.cpp b/src/Math/detail/FloatingPointMatrix2x2.cpp
@@ -191,14 +191,14 @@ template <typename T>
 const T* FloatingPointMatrix2x2<T>::Data() const noexcept
 {
     static_assert(std::is_floating_point<T>::value, "T is floating point number");
-    return m[0].data();
+    return m[0];
 }
 
 template <typename T>
 T* FloatingPointMatrix2x2<T>::Data() noexcept
 {
     static_assert(std::is_floating_point<T>::value, "T is floating point number");
-    return m[0].data();
+    return m[0];
 }
 
 template <typename T>

diff --git a/src/Math/detail/FloatingPointMatrix3x2.cpp b/src/Math/detail/FloatingPointMatrix3x2.cpp
@@ -381,14 +381,14 @@ template <typename T>
 const T* FloatingPointMatrix3x2<T>::Data() const noexcept
 {
     static_assert(std::is_floating_point<T>::value, "T is floating point number");
-    return m[0].data();
+    return m[0];
 }
 
 template <typename T>
 T* FloatingPointMatrix3x2<T>::Data() noexcept
 {
     static_assert(std::is_floating_point<T>::value, "T is floating point number");
-    return m[0].data();
+    return m[0];
 }
 
 template <typename T>

diff --git a/src/Math/detail/FloatingPointMatrix3x3.cpp b/src/Math/detail/FloatingPointMatrix3x3.cpp
@@ -626,14 +626,14 @@ template <typename T>
 const T* FloatingPointMatrix3x3<T>::Data() const noexcept
 {
     static_assert(std::is_floating_point<T>::value, "T is floating point number");
-    return m[0].data();
+    return m[0];
 }
 
 template <typename T>
 T* FloatingPointMatrix3x3<T>::Data() noexcept
 {
     static_assert(std::is_floating_point<T>::value, "T is floating point number");
-    return m[0].data();
+    return m[0];
 }
 
 template <typename T>

diff --git a/src/Math/detail/FloatingPointMatrix4x4.cpp b/src/Math/detail/FloatingPointMatrix4x4.cpp
@@ -1231,14 +1231,14 @@ template <typename T>
 const T* FloatingPointMatrix4x4<T>::Data() const noexcept
 {
     static_assert(std::is_floating_point<T>::value, "T is floating point number");
-    return m[0].data();
+    return m[0];
 }
 
 template <typename T>
 T* FloatingPointMatrix4x4<T>::Data() noexcept
 {
     static_assert(std::is_floating_point<T>::value, "T is floating point number");
-    return m[0].data();
+    return m[0];
 }
 
 template <typename T>