raytracing/raytracer_challenge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FEAT] Add identity matrix

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2024-02-02 14:50:07 +01:00
parent 221a1e01e3
commit 5866f77915
3 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
raytracing/src/matrix.cpp
View File

@@ -58,6 +58,12 @@ Matrix::Matrix(uint8_t a_rows, uint8_t a_cols) : m_rows(a_rows), m_cols(a_cols)
/* ------------------------------------------------------------------------- */
Matrix::Matrix(const Matrix &an_other) : m_rows(an_other.m_rows), m_cols(an_other.m_cols), m_data(an_other.m_data)
{
}
/* ------------------------------------------------------------------------- */
Matrix::Matrix(const std::initializer_list<std::initializer_list<double>> &a_values) :
m_rows(a_values.size()), m_cols(a_values.size())
{
@@ -167,6 +173,20 @@ const Tuple Matrix::operator*(const Tuple &a_tuple) const
/* ------------------------------------------------------------------------- */
Matrix Matrix::identity(void)
{
Matrix the_identity = {
{1, 0, 0, 0},
{0, 1, 0, 0},
{0, 0, 1, 0},
{0, 0, 0, 1}
};
return the_identity;
}
/* ------------------------------------------------------------------------- */
bool Matrix::validate_dimensions(const std::initializer_list<std::initializer_list<double>> &a_values) const
{
for (const auto &the_row : a_values)

3
raytracing/src/matrix.h
View File

@@ -43,6 +43,7 @@ namespace Raytracer
public:
Matrix(void);
Matrix(uint8_t a_rows, uint8_t a_cols);
Matrix(const Matrix &an_other);
Matrix(const std::initializer_list<std::initializer_list<double>> &a_values);
uint8_t rows(void);
@@ -56,6 +57,8 @@ namespace Raytracer
const Matrix operator*(const Matrix &a_matrix) const;
const Tuple operator*(const Tuple &a_tuple) const;
static Matrix identity(void);
private:
bool validate_dimensions(const std::initializer_list<std::initializer_list<double>> &a_values) const;

23
tests/03_matrix.cpp
View File

@@ -171,3 +171,26 @@ TEST_CASE("[Matrix] a matrix multiplied by a tuple", "[Matrix]")
REQUIRE((a * b) == Tuple(18, 24, 33, 1));
}
/* ------------------------------------------------------------------------- */
TEST_CASE("[Matrix] Multiplying a matrix by the identity matrix", "[Matrix]")
{
Matrix a = {
{0, 1, 2, 4},
{1, 2, 4, 8},
{2, 4, 8, 16},
{4, 8, 16, 32}
};
REQUIRE((a * Matrix::identity()) == a);
}
/* ------------------------------------------------------------------------- */
TEST_CASE("[Matrix] Multiplying the identity matrix by a tuple", "[Matrix]")
{
Tuple a(1, 2, 3, 4);
REQUIRE((Matrix::identity() * a) == a);
}