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

replaced numeric limits

Browse Source
This commit is contained in:
Orange
2025-12-19 23:49:54 +03:00
parent 52ca23383d
commit 4fd7f8efa6
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/omath/projection/camera.hpp
View File

@@ -230,17 +230,14 @@ namespace omath::projection
auto projected = get_view_projection_matrix() auto projected = get_view_projection_matrix()
* mat_column_from_vector<float, Mat4X4Type::get_store_ordering()>(world_position); * mat_column_from_vector<float, Mat4X4Type::get_store_ordering()>(world_position);
constexpr float w_epsilon = 1e-6f; const auto& w = projected.at(3, 0);
const auto w = projected.at(3, 0); if (w <= std::numeric_limits<float>::epsilon())
if (w <= w_epsilon) {
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS); return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
}
projected /= w; projected /= w;
if (is_ndc_out_of_bounds(projected)) { if (is_ndc_out_of_bounds(projected))
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS); return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
}
return Vector3<float>{projected.at(0, 0), projected.at(1, 0), projected.at(2, 0)}; return Vector3<float>{projected.at(0, 0), projected.at(1, 0), projected.at(2, 0)};
} }
@@ -249,29 +246,28 @@ namespace omath::projection
{ {
const auto inv_view_proj = get_view_projection_matrix().inverted(); const auto inv_view_proj = get_view_projection_matrix().inverted();
if (!inv_view_proj) { if (!inv_view_proj)
return std::unexpected(Error::INV_VIEW_PROJ_MAT_DET_EQ_ZERO); return std::unexpected(Error::INV_VIEW_PROJ_MAT_DET_EQ_ZERO);
}
auto inverted_projection = auto inverted_projection =
inv_view_proj.value() * mat_column_from_vector<float, Mat4X4Type::get_store_ordering()>(ndc); inv_view_proj.value() * mat_column_from_vector<float, Mat4X4Type::get_store_ordering()>(ndc);
constexpr float w_epsilon = 1e-6f; const auto& w = inverted_projection.at(3, 0);
const auto w = inverted_projection.at(3, 0);
if (std::abs(w) < w_epsilon) { if (std::abs(w) < std::numeric_limits<float>::epsilon())
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS); return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
}
inverted_projection /= w; inverted_projection /= w;
const Vector3<float> world_pos{inverted_projection.at(0, 0), inverted_projection.at(1, 0), const Vector3<float> world_pos{inverted_projection.at(0, 0), inverted_projection.at(1, 0),
inverted_projection.at(2, 0)}; inverted_projection.at(2, 0)};
// Validate that the computed world position is reasonable // Validate that the computed world position is reasonable
constexpr float max_reasonable_component = 1e6f; constexpr float max_reasonable_component = 1e6f;
if (!std::isfinite(world_pos.x) || !std::isfinite(world_pos.y) if (!std::isfinite(world_pos.x) || !std::isfinite(world_pos.y) || !std::isfinite(world_pos.z)
|| !std::isfinite(world_pos.z) || std::abs(world_pos.x) > max_reasonable_component || std::abs(world_pos.x) > max_reasonable_component || std::abs(world_pos.y) > max_reasonable_component
|| std::abs(world_pos.y) > max_reasonable_component || std::abs(world_pos.z) > max_reasonable_component) { || std::abs(world_pos.z) > max_reasonable_component)
{
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS); return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
} }