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

added to_string method to matrix

Browse Source
This commit is contained in:
Orange
2024-05-18 13:28:04 +03:00
parent 53bd451072
commit 4e01f3ee09
4 changed files with 75 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/matrix.cpp
View File

@@ -4,6 +4,9 @@
*/
#include "uml/matrix.h"
#include <format>
#include "uml/Vector3.h"
#include <utility>
#include <stdexcept>
@@ -204,6 +207,25 @@ namespace uml
return out;
}
std::string matrix::to_string() const
{
std::string str;
for (size_t i = 0; i < m_rows; i++)
{
for (size_t j = 0; j < m_columns; ++j)
{
str += std::format("{:.1f}",at(i, j));
if (j == m_columns-1)
str += '\n';
else
str += ' ';
}
}
return str;
}
float matrix::det() const
{
if (m_rows + m_columns == 2)
@@ -279,11 +301,11 @@ namespace uml
matrix matrix::to_screen_matrix(float screenWidth, float screenHeight)
{
return matrix({
{screenWidth / 2.f, 0.f, 0.f, 0.f},
{0.f, -screenHeight / 2.f, 0.f, 0.f},
{0.f, 0.f, 1.f, 0.f},
{screenWidth / 2.f, screenHeight / 2.f, 0.f, 1.f},
});
{screenWidth / 2.f, 0.f, 0.f, 0.f},
{0.f, -screenHeight / 2.f, 0.f, 0.f},
{0.f, 0.f, 1.f, 0.f},
{screenWidth / 2.f, screenHeight / 2.f, 0.f, 1.f},
});
}
const float * matrix::raw() const