mirror of
https://github.com/orange-cpp/omath.git
synced 2026-06-22 07:04:34 +00:00
added additional method
This commit is contained in:
@@ -466,6 +466,23 @@ namespace omath::projection
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[[nodiscard("You must view camera space coordinates")]]
|
||||||
|
constexpr Vector3<NumericType> world_to_view_coordinates(const Vector3<NumericType>& world_coordinates) const noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
const auto view_coordinates =
|
||||||
|
calc_view_matrix()
|
||||||
|
* mat_column_from_vector<NumericType, Mat4X4Type::get_store_ordering()>(world_coordinates);
|
||||||
|
|
||||||
|
return {view_coordinates.at(0, 0), view_coordinates.at(1, 0), view_coordinates.at(2, 0)};
|
||||||
|
}
|
||||||
|
const auto view_coordinates =
|
||||||
|
get_view_matrix()
|
||||||
|
* mat_column_from_vector<NumericType, Mat4X4Type::get_store_ordering()>(world_coordinates);
|
||||||
|
|
||||||
|
return {view_coordinates.at(0, 0), view_coordinates.at(1, 0), view_coordinates.at(2, 0)};
|
||||||
|
}
|
||||||
[[nodiscard("You must use view port position")]] constexpr std::expected<Vector3<NumericType>, Error>
|
[[nodiscard("You must use view port position")]] constexpr std::expected<Vector3<NumericType>, Error>
|
||||||
world_to_view_port(const Vector3<NumericType>& world_position,
|
world_to_view_port(const Vector3<NumericType>& world_position,
|
||||||
const ViewPortClipping& clipping = ViewPortClipping::AUTO) const noexcept
|
const ViewPortClipping& clipping = ViewPortClipping::AUTO) const noexcept
|
||||||
|
|||||||
@@ -580,6 +580,48 @@ TEST(UnitTestProjection, AabbUnityEngineStraddlesNearNotCulled)
|
|||||||
EXPECT_FALSE(cam.is_aabb_culled_by_frustum(aabb));
|
EXPECT_FALSE(cam.is_aabb_culled_by_frustum(aabb));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(UnitTestProjection, WorldToViewCoordinates_TranslatedSourceCamera)
|
||||||
|
{
|
||||||
|
constexpr float k_eps = 1e-4f;
|
||||||
|
constexpr auto fov = omath::projection::FieldOfView::from_degrees(90.f);
|
||||||
|
auto cam = omath::source_engine::Camera({10.f, 20.f, 30.f}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
|
||||||
|
|
||||||
|
const auto view_coordinates = cam.world_to_view_coordinates({15.f, 12.f, 37.f});
|
||||||
|
|
||||||
|
EXPECT_NEAR(view_coordinates.x, 8.f, k_eps);
|
||||||
|
EXPECT_NEAR(view_coordinates.y, 7.f, k_eps);
|
||||||
|
EXPECT_NEAR(view_coordinates.z, 5.f, k_eps);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(UnitTestProjection, WorldToViewCoordinates_RotatedSourceCamera)
|
||||||
|
{
|
||||||
|
constexpr float k_eps = 1e-4f;
|
||||||
|
constexpr auto fov = omath::projection::FieldOfView::from_degrees(90.f);
|
||||||
|
const omath::source_engine::ViewAngles angles{omath::source_engine::PitchAngle::from_degrees(0.f),
|
||||||
|
omath::source_engine::YawAngle::from_degrees(90.f),
|
||||||
|
omath::source_engine::RollAngle::from_degrees(0.f)};
|
||||||
|
auto cam = omath::source_engine::Camera({10.f, 20.f, 30.f}, angles, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
|
||||||
|
|
||||||
|
const auto view_coordinates = cam.world_to_view_coordinates({14.f, 26.f, 38.f});
|
||||||
|
|
||||||
|
EXPECT_NEAR(view_coordinates.x, 4.f, k_eps);
|
||||||
|
EXPECT_NEAR(view_coordinates.y, 8.f, k_eps);
|
||||||
|
EXPECT_NEAR(view_coordinates.z, 6.f, k_eps);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(UnitTestProjection, WorldToViewCoordinates_ColumnMajorOpenGlCamera)
|
||||||
|
{
|
||||||
|
constexpr float k_eps = 1e-4f;
|
||||||
|
constexpr auto fov = omath::projection::FieldOfView::from_degrees(90.f);
|
||||||
|
auto cam = omath::opengl_engine::Camera({10.f, 20.f, 30.f}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
|
||||||
|
|
||||||
|
const auto view_coordinates = cam.world_to_view_coordinates({14.f, 26.f, 22.f});
|
||||||
|
|
||||||
|
EXPECT_NEAR(view_coordinates.x, 4.f, k_eps);
|
||||||
|
EXPECT_NEAR(view_coordinates.y, 6.f, k_eps);
|
||||||
|
EXPECT_NEAR(view_coordinates.z, -8.f, k_eps);
|
||||||
|
}
|
||||||
|
|
||||||
TEST(UnitTestProjection, CalcViewAnglesFromViewMatrix_LookingForward)
|
TEST(UnitTestProjection, CalcViewAnglesFromViewMatrix_LookingForward)
|
||||||
{
|
{
|
||||||
constexpr float k_eps = 1e-4f;
|
constexpr float k_eps = 1e-4f;
|
||||||
|
|||||||
Reference in New Issue
Block a user