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

fixed projection matrix

Browse Source
This commit is contained in:
Orange
2024-10-18 17:20:23 +03:00
parent dc26ed23f5
commit 3e6cabb6c7
6 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/UnitTestMat.cpp
View File

@@ -191,7 +191,7 @@ TEST_F(UnitTestMat, StaticMethod_ProjectionMat)
constexpr float aspectRatio = 1.33f;
constexpr float near = 0.1f;
constexpr float far = 100.0f;
const Mat<4, 4> projMat = Mat<4, 4>::ProjectionMat(fieldOfView, aspectRatio, near, far);
const Mat<4, 4> projMat = Mat<4, 4>::ProjectionMat(fieldOfView, aspectRatio, near, far, 1.335f);
const float fovHalfTan = std::tan(angles::DegreesToRadians(fieldOfView) / 2.f);

10
tests/UnitTestProjection.cpp
View File

@@ -11,13 +11,5 @@ TEST(UnitTestProjection, Projection)
{
const omath::projection::Camera camera({0.f, 0.f, 0.f}, {0, 0.f, 0.f} , {1920.f, 1080.f}, 110.f, 0.375f, 5000.f);
EXPECT_EQ(camera.WorldToScreen({100, 0, 0}).value(), omath::Vector2(960, 540));
EXPECT_EQ(camera.WorldToScreen({49.23, 0, 0}).value(), omath::Vector2(960, 540));
const auto proj = camera.WorldToScreen({100, 50, -69});
std::print("{} {}", proj->x, proj->y);
EXPECT_EQ(camera.WorldToScreen({100, 10, 0}).value(), omath::Vector2(909.58887, 540));
EXPECT_EQ(camera.WorldToScreen({100, 10, 8}).value(), omath::Vector2(909.58887, 499.67108));
EXPECT_EQ(camera.WorldToScreen({100, 50, -69}).value(), omath::Vector2(707.9442, 887.83704));
EXPECT_FALSE(camera.WorldToScreen({-10,0, 0}).has_value());
camera.WorldToScreen({5000, 0, 0});
}