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

extracted some methods

Browse Source
This commit is contained in:
Orange
2024-08-30 02:42:58 +03:00
parent f447752c6f
commit 67713f52bd
5 changed files with 98 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
source/matrix.cpp
View File

@@ -1,10 +1,13 @@
#include "omath/Matrix.h"
#include "omath/Vector3.h"
#include "omath/angles.h"
#include <format>
#include "omath/Vector3.h"
#include <utility>
#include <stdexcept>
#include <utility>
#include <complex>
namespace omath
@@ -22,17 +25,26 @@ namespace omath
Set(0.f);
}
Matrix::Matrix(const std::vector<std::vector<float>> &rows)
Matrix::Matrix(const std::initializer_list<std::initializer_list<float>>& rows)
{
m_rows = rows.size();
m_columns = rows[0].size();
m_columns = rows.begin()->size();
for (const auto& row : rows)
if (row.size() != m_columns)
throw std::invalid_argument("All rows must have the same number of columns.");
m_data = std::make_unique<float[]>(m_rows * m_columns);
for (size_t i = 0; i < m_rows; ++i)
for (size_t j = 0; j < m_columns; ++j)
At(i,j) = rows[i][j];
size_t i = 0;
for (const auto& row : rows)
{
size_t j = 0;
for (const auto& value : row)
At(i, j++) = value;
++i;
}
}
Matrix::Matrix(const Matrix &other)
@@ -247,7 +259,7 @@ namespace omath
return ((i + j + 2) % 2 == 0) ? tmp : -tmp;
}
Matrix Matrix::Transpose()
Matrix Matrix::Transpose() const
{
Matrix transposed = {m_columns, m_rows};
@@ -298,14 +310,51 @@ namespace omath
return Strip(i, j).Determinant();
}
Matrix Matrix::ToScreenMatrix(float screenWidth, float screenHeight)
Matrix Matrix::ToScreenMatrix(const float screenWidth, const 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},
});
return
{
{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},
};
}
Matrix Matrix::TranslationMatrix(const Vector3 &diff)
{
return
{
{1.f, 0.f, 0.f, 0.f},
{0.f, 1.f, 0.f, 0.f},
{0.f, 0.f, 1.f, 0.f},
{diff.x, diff.y, diff.z, 1.f},
};
}
Matrix Matrix::OrientationMatrix(const Vector3 &forward, const Vector3 &right, const Vector3 &up)
{
return
{
{right.x, up.x, forward.x, 0.f},
{right.y, up.y, forward.y, 0.f},
{right.z, up.z, forward.z, 0.f},
{0.f, 0.f, 0.f, 1.f},
};
}
Matrix Matrix::ProjectionMatrix(const float fielOfView, const float aspectRatio, const float near,
const float far)
{
const float fovHalfTan = std::tan(angles::DegreesToRadians(fielOfView) / 2.f);
return
{
{1.f / (aspectRatio*fovHalfTan), 0.f, 0.f, 0.f},
{0.f, 1.f / fovHalfTan, 0.f, 0.f},
{0.f, 0.f, (far + near) / (far - near), 2.f * near * far / (far - near)},
{0.f, 0.f, -1.f, 0.f}
};
}
const float * Matrix::Raw() const

60
source/projection/Camera.cpp
View File

@@ -10,8 +10,8 @@
namespace omath::projection
{
Camera::Camera(const Vector3 &position, const Vector3 &viewAngles, const Vector3 &viewPort, const float fov, const float near,
const float far)
Camera::Camera(const Vector3 &position, const Vector3 &viewAngles, const ViewPort &viewPort,
const float fov, const float near, const float far)
{
m_origin = position;
m_viewAngles = viewAngles;
@@ -21,79 +21,41 @@ namespace omath::projection
m_farPlaneDistance = far;
}
float & Camera::GetFloat1() {
static float m_float1 = 1.52550f;
float& Camera::GetFloat1() {
static float m_float1 = 0.36689f;
return m_float1;
}
float & Camera::GetFloat2() {
float& Camera::GetFloat2() {
static float m_float2 = 1.14500f;
return m_float2;
}
Matrix Camera::GetViewMatrix() const
{
return GetTranslationMatrix() * GetOrientationMatrix();
}
Matrix Camera::GetProjectionMatrix() const
{
const float fovHalfTan = std::tan(angles::DegreesToRadians(m_fieldOfView) / 2.f);
const auto aspectRatio = m_viewPort.x / m_viewPort.y;
const auto far = m_farPlaneDistance;
const auto near = m_nearPlaneDistance;
return Matrix(
{
{1.f / (aspectRatio*fovHalfTan), 0.f, 0.f, 0.f},
{0.f, 1.f / fovHalfTan, 0.f, 0.f},
{0.f, 0.f, (far + near) / (far - near), 2.f * near * far / (far - near)},
{0.f, 0.f, -1.f, 0.f},
});
}
Matrix Camera::GetTranslationMatrix() const
{
return Matrix(
{
{1.f, 0.f, 0.f, 0.f},
{0.f, 1.f, 0.f, 0.f},
{0.f, 0.f, 1.f, 0.f},
{-m_origin.x, -m_origin.y, -m_origin.z, 1.f},
});
}
Matrix Camera::GetOrientationMatrix() const
{
const auto forward = Vector3::ForwardVector(m_viewAngles.x, m_viewAngles.y);
const auto right = Vector3::RightVector(m_viewAngles.x, m_viewAngles.y, m_viewAngles.z);
const auto up = Vector3::UpVector(m_viewAngles.x, m_viewAngles.y, m_viewAngles.z);
return Matrix(
{
{right.x, up.x, forward.x, 0.f},
{right.y, up.y, forward.y, 0.f},
{right.z, up.z, forward.z, 0.f},
{0.f, 0.f, 0.f, 1.f},
});
return Matrix::TranslationMatrix(-m_origin) * Matrix::OrientationMatrix(forward, right, up);
}
std::expected<Vector3, std::string_view> Camera::WorldToScreen(const Vector3 &worldPosition) const
{
const auto posVecAsMatrix = Matrix({{worldPosition.x, worldPosition.y, worldPosition.z, 1.f}});
const auto viewProjectionMatrix = GetViewMatrix() * GetProjectionMatrix();
auto projected = posVecAsMatrix * viewProjectionMatrix;
const auto projectionMatrix = Matrix::ProjectionMatrix(m_fieldOfView, m_viewPort.AspectRatio(),
m_nearPlaneDistance, m_farPlaneDistance);
auto projected = posVecAsMatrix * (GetViewMatrix() * projectionMatrix);
if (projected.At(0, 3) <= 0.f)
return std::unexpected("Projection point is out of camera field of view");
projected /= projected.At(0, 3);
projected *= Matrix::ToScreenMatrix(m_viewPort.x, m_viewPort.y);
projected *= Matrix::ToScreenMatrix(m_viewPort.m_width, m_viewPort.m_height);
return Vector3{projected.At(0, 0), projected.At(0, 1), projected.At(0, 2)};
}