Cynopolis/Vector3D
1
0
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Adding a merge checker script

Browse Source
This commit is contained in:
Quinn
2025-05-21 17:46:49 -04:00
parent dee19b54ad
commit 8a15459fc8
5 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Matrix.cpp
View File

@@ -212,8 +212,8 @@ Matrix<rows, columns>::Transpose() const
// explicitly define the determinant for a 2x2 matrix because it is definitely
// the fastest way to calculate a 2x2 matrix determinant
template <>
inline float Matrix<0, 0>::Det() const { return 1e+6; }
// template <>
// inline float Matrix<0, 0>::Det() const { return 1e+6; }
template <>
inline float Matrix<1, 1>::Det() const { return this->matrix[0]; }
template <>

23
src/Matrix.hpp
View File

@@ -10,10 +10,10 @@
// TODO: Add a function for SVD decomposition
// TODO: Add a function for LQ decomposition
template <uint8_t rows, uint8_t columns>
class Matrix
{
template <uint8_t rows, uint8_t columns> class Matrix {
public:
static_assert(rows > 0, "Template error: rows must be greater than 0.");
static_assert(columns > 0, "Template error: columns must be greater than 0.");
/**
* @brief create a matrix but leave all of its values unitialized
*/
@@ -37,8 +37,7 @@ public:
/**
* @brief Initialize a matrix directly with any number of arguments
*/
template <typename... Args>
Matrix(Args... args);
template <typename... Args> Matrix(Args... args);
/**
* @brief set the matrix diagonals to 1 and all other values to 0
@@ -189,14 +188,17 @@ public:
Matrix<rows, columns> operator-(const Matrix<rows, columns> &other) const;
template <uint8_t other_columns>
Matrix<rows, other_columns> operator*(const Matrix<columns, other_columns> &other) const;
Matrix<rows, other_columns>
operator*(const Matrix<columns, other_columns> &other) const;
Matrix<rows, columns> operator*(float scalar) const;
template <uint8_t sub_rows, uint8_t sub_columns, uint8_t row_offset, uint8_t column_offset>
template <uint8_t sub_rows, uint8_t sub_columns, uint8_t row_offset,
uint8_t column_offset>
Matrix<sub_rows, sub_columns> SubMatrix() const;
template <uint8_t sub_rows, uint8_t sub_columns, uint8_t row_offset, uint8_t column_offset>
template <uint8_t sub_rows, uint8_t sub_columns, uint8_t row_offset,
uint8_t column_offset>
void SetSubMatrix(const Matrix<sub_rows, sub_columns> &sub_matrix);
/**
@@ -210,8 +212,9 @@ public:
static float DotProduct(const Matrix<vector_size, 1> &vec1,
const Matrix<vector_size, 1> &vec2);
static float DotProduct(const Matrix<1, 1> &vec1,
const Matrix<1, 1> &vec2) { return vec1.Get(0, 0) * vec2.Get(0, 0); }
static float DotProduct(const Matrix<1, 1> &vec1, const Matrix<1, 1> &vec2) {
return vec1.Get(0, 0) * vec2.Get(0, 0);
}
protected:
std::array<float, rows * columns> matrix;