admin/omath
1
0
Fork 0
mirror of https://github.com/orange-cpp/omath.git synced 2026-02-13 07:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from orange-cpp/u/orange-cpp/mat_sqr_brackets_op

Browse Source 
Added brand new operator[] support for Mat/Matrix class
This commit is contained in:
Orange++
2024-12-21 19:34:51 +03:00
committed by GitHub
parent 390e584aee 2b9575311e
commit 232f456a4d
4 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/omath/Mat.hpp
View File

@@ -66,6 +66,11 @@ namespace omath
m_data = other.m_data; m_data = other.m_data;
} }
OMATH_API constexpr Type& operator[](const size_t row, const size_t col)
{
return At(row, col);
}
OMATH_API constexpr Mat(Mat&& other) noexcept OMATH_API constexpr Mat(Mat&& other) noexcept
{ {
m_data = std::move(other.m_data); m_data = std::move(other.m_data);

7
include/omath/Matrix.hpp
View File

@@ -37,6 +37,13 @@ namespace omath
[[nodiscard]] [[nodiscard]]
OMATH_API size_t RowCount() const noexcept; OMATH_API size_t RowCount() const noexcept;
[[nodiscard]]
OMATH_API float& operator[](size_t row, size_t column)
{
return At(row, column);
}
[[nodiscard]] [[nodiscard]]
OMATH_API size_t ColumnsCount() const noexcept; OMATH_API size_t ColumnsCount() const noexcept;

8
tests/general/UnitTestMat.cpp
View File

@@ -40,6 +40,14 @@ TEST_F(UnitTestMat, Constructor_InitializerList)
EXPECT_FLOAT_EQ(m.At(1, 1), 4.0f); EXPECT_FLOAT_EQ(m.At(1, 1), 4.0f);
} }
TEST_F(UnitTestMat, Operator_SquareBrackets)
{
EXPECT_EQ((m2[0, 0]), 1.0f);
EXPECT_EQ((m2[0, 1]), 2.0f);
EXPECT_EQ((m2[1, 0]), 3.0f);
EXPECT_EQ((m2[1, 1]), 4.0f);
}
TEST_F(UnitTestMat, Constructor_Copy) TEST_F(UnitTestMat, Constructor_Copy)
{ {
Mat<2, 2> m3 = m2; Mat<2, 2> m3 = m2;

9
tests/general/UnitTestMatrix.cpp
View File

@@ -29,6 +29,15 @@ TEST_F(UnitTestMatrix, Constructor_Size)
EXPECT_EQ(m.ColumnsCount(), 3); EXPECT_EQ(m.ColumnsCount(), 3);
} }
TEST_F(UnitTestMatrix, Operator_SquareBrackets)
{
EXPECT_EQ((m2[0, 0]), 1.0f);
EXPECT_EQ((m2[0, 1]), 2.0f);
EXPECT_EQ((m2[1, 0]), 3.0f);
EXPECT_EQ((m2[1, 1]), 4.0f);
}
TEST_F(UnitTestMatrix, Constructor_InitializerList) TEST_F(UnitTestMatrix, Constructor_InitializerList)
{ {
Matrix m{{1.0f, 2.0f}, {3.0f, 4.0f}}; Matrix m{{1.0f, 2.0f}, {3.0f, 4.0f}};