removed my beautiful subscripts

Author: jnyfah

ZEngine/ZEngine/Core/Maths/Matrix.h

@@ -6,35 +6,18 @@ namespace ZEngine::Core::Maths
     template <typename T, size_t R, size_t C, typename = std::enable_if_t<std::is_arithmetic_v<T> && (R >= 1) && (C >= 1)>>
     struct Matrix
     {
-        T m_data[R * C];
+        T  m_data[R * C];
 
-        struct RowProxy
+        T& operator()(size_t row, size_t col)
         {
-            T* row_data;
-
-            T& operator[](size_t col)
-            {
-                ZENGINE_VALIDATE_ASSERT(col < C, "Column index out of range");
-                return row_data[col];
-            }
-
-            const T& operator[](size_t col) const
-            {
-                ZENGINE_VALIDATE_ASSERT(col < C, "Column index out of range");
-                return row_data[col];
-            }
-        };
-
-        RowProxy operator[](size_t row)
-        {
-            ZENGINE_VALIDATE_ASSERT(row < R, "Row index out of range");
-            return RowProxy{&m_data[row * C]};
+            ZENGINE_VALIDATE_ASSERT(row < R && col < C, "Index out of range");
+            return m_data[row * C + col];
         }
 
-        const RowProxy operator[](size_t row) const
+        const T& operator()(size_t row, size_t col) const
         {
-            ZENGINE_VALIDATE_ASSERT(row < R, "Row index out of range");
-            return RowProxy{const_cast<T*>(&m_data[row * C])};
+            ZENGINE_VALIDATE_ASSERT(row < R && col < C, "Index out of range");
+            return m_data[row * C + col];
         }
 
         Matrix<T, R, C> operator+(Matrix<T, R, C>& other)
@@ -489,9 +472,9 @@ namespace ZEngine::Core::Maths
                 T sum = T{};
                 for (size_t k = 0; k < K; ++k)
                 {
-                    sum += a[i][k] * b[k][j];
+                    sum += a(i, k) * b(k, j);
                 }
-                result[i][j] = sum;
+                result(i, j) = sum;
             }
         }
         return result;

ZEngine/tests/Maths/Matrix_test.cpp

@@ -8,40 +8,40 @@ constexpr float EPSILON = 1e-5f;
 TEST(MatrixTest, ConstructionAndIndexingFloat)
 {
     Mat2f m2(1.1f, 2.2f, 3.3f, 4.4f);
-    EXPECT_NEAR(m2[0][0], 1.1f, EPSILON);
-    EXPECT_NEAR(m2[0][1], 2.2f, EPSILON);
-    EXPECT_NEAR(m2[1][0], 3.3f, EPSILON);
-    EXPECT_NEAR(m2[1][1], 4.4f, EPSILON);
+    EXPECT_NEAR(m2(0, 0), 1.1f, EPSILON);
+    EXPECT_NEAR(m2(0,1), 2.2f, EPSILON);
+    EXPECT_NEAR(m2(1,0), 3.3f, EPSILON);
+    EXPECT_NEAR(m2(1,1), 4.4f, EPSILON);
 
     Mat3f m3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f);
-    EXPECT_NEAR(m3[0][0], 1.0f, EPSILON);
-    EXPECT_NEAR(m3[1][1], 5.0f, EPSILON);
-    EXPECT_NEAR(m3[2][2], 9.0f, EPSILON);
+    EXPECT_NEAR(m3(0,0), 1.0f, EPSILON);
+    EXPECT_NEAR(m3(1,1), 5.0f, EPSILON);
+    EXPECT_NEAR(m3(2,2), 9.0f, EPSILON);
 
     Mat4f m4(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f);
-    EXPECT_NEAR(m4[0][0], 1.0f, EPSILON);
-    EXPECT_NEAR(m4[1][2], 7.0f, EPSILON);
-    EXPECT_NEAR(m4[3][3], 16.0f, EPSILON);
+    EXPECT_NEAR(m4(0,0), 1.0f, EPSILON);
+    EXPECT_NEAR(m4(1,2), 7.0f, EPSILON);
+    EXPECT_NEAR(m4(3,3), 16.0f, EPSILON);
 }
 
 TEST(MatrixTest, ArithmeticOpsFloat)
 {
     Mat2f a2(1, 2, 3, 4);
     Mat2f b2(0.5f, 0.5f, 0.5f, 0.5f);
     Mat2f c2 = a2 + b2;
-    EXPECT_NEAR(c2[0][0], 1.5f, EPSILON);
-    EXPECT_NEAR(c2[1][1], 4.5f, EPSILON);
+    EXPECT_NEAR(c2(0,0), 1.5f, EPSILON);
+    EXPECT_NEAR(c2(1,1), 4.5f, EPSILON);
 
     Mat2f d2 = a2 * 2.0f;
-    EXPECT_NEAR(d2[0][1], 4.0f, EPSILON);
+    EXPECT_NEAR(d2(0,1), 4.0f, EPSILON);
     Mat2f e2 = a2 / 2.0f;
-    EXPECT_NEAR(e2[1][0], 1.5f, EPSILON);
+    EXPECT_NEAR(e2(1,0), 1.5f, EPSILON);
 
     Mat3f a3(1, 2, 3, 4, 5, 6, 7, 8, 9);
     Mat3f b3(9, 8, 7, 6, 5, 4, 3, 2, 1);
     Mat3f c3 = a3 + b3;
-    EXPECT_NEAR(c3[0][0], 10.0f, EPSILON);
-    EXPECT_NEAR(c3[2][2], 10.0f, EPSILON);
+    EXPECT_NEAR(c3(0,0), 10.0f, EPSILON);
+    EXPECT_NEAR(c3(2,2), 10.0f, EPSILON);
 }
 
 TEST(MatrixTest, DeterminantFloat)
@@ -64,15 +64,15 @@ TEST(MatrixTest, Identity)
 
     for (int i = 0; i < 2; ++i)
         for (int j = 0; j < 2; ++j)
-            EXPECT_NEAR(I2[i][j], (i == j ? 1.0f : 0.0f), EPSILON);
+            EXPECT_NEAR(I2(i,j), (i == j ? 1.0f : 0.0f), EPSILON);
 
     for (int i = 0; i < 3; ++i)
         for (int j = 0; j < 3; ++j)
-            EXPECT_NEAR(I3[i][j], (i == j ? 1.0f : 0.0f), EPSILON);
+            EXPECT_NEAR(I3(i,j), (i == j ? 1.0f : 0.0f), EPSILON);
 
     for (int i = 0; i < 4; ++i)
         for (int j = 0; j < 4; ++j)
-            EXPECT_NEAR(I4[i][j], (i == j ? 1.0f : 0.0f), EPSILON);
+            EXPECT_NEAR(I4(i,j), (i == j ? 1.0f : 0.0f), EPSILON);
 }
 
 TEST(MatrixTest, Inverse)
@@ -82,19 +82,19 @@ TEST(MatrixTest, Inverse)
     Mat2f shouldBeIdentity2 = m2 * inv2;
     for (int i = 0; i < 2; ++i)
         for (int j = 0; j < 2; ++j)
-            EXPECT_NEAR(shouldBeIdentity2[i][j], (i == j ? 1.0f : 0.0f), EPSILON);
+            EXPECT_NEAR(shouldBeIdentity2(i,j), (i == j ? 1.0f : 0.0f), EPSILON);
 
     Mat3f m3(1, 2, 3, 0, 1, 4, 5, 6, 0);
     Mat3f inv3              = m3.Inverse();
     Mat3f shouldBeIdentity3 = m3 * inv3;
     for (int i = 0; i < 3; ++i)
         for (int j = 0; j < 3; ++j)
-            EXPECT_NEAR(shouldBeIdentity3[i][j], (i == j ? 1.0f : 0.0f), EPSILON);
+            EXPECT_NEAR(shouldBeIdentity3(i,j), (i == j ? 1.0f : 0.0f), EPSILON);
 
     Mat4f m4(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
     Mat4f inv4              = m4.Inverse();
     Mat4f shouldBeIdentity4 = m4 * inv4;
     for (int i = 0; i < 4; ++i)
         for (int j = 0; j < 4; ++j)
-            EXPECT_NEAR(shouldBeIdentity4[i][j], (i == j ? 1.0f : 0.0f), EPSILON);
+            EXPECT_NEAR(shouldBeIdentity4(i,j), (i == j ? 1.0f : 0.0f), EPSILON);
 }