Slendi/smath
1
0
Fork 0
mirror of https://github.com/slendidev/smath.git synced 2026-01-30 16:58:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source 
Signed-off-by: Slendi <slendi@socopon.com>
This commit is contained in:
Slendi
2026-01-10 15:33:04 +02:00
parent 830c64b25a
commit aa8e3b1637
1 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/smath.hpp
View File

@@ -577,46 +577,49 @@ using Vec2d = Vec<2, double>;
using Vec3d = Vec<3, double>; using Vec3d = Vec<3, double>;
using Vec4d = Vec<4, double>; using Vec4d = Vec<4, double>;
template<class T> constexpr auto deg(T const value) template<class T>
using angle_ret_t = std::conditional_t<std::is_same_v<T, float>, float, double>;
template<class T> constexpr auto deg(T value)
{ {
using R = std::common_type_t<T, double>; using R = angle_ret_t<T>;
if constexpr (detail::SMATH_ANGLE_UNIT_ID == detail::AngularUnit::Degrees) { if constexpr (detail::SMATH_ANGLE_UNIT_ID == detail::AngularUnit::Degrees) {
return static_cast<R>(value); return static_cast<R>(value);
} else if constexpr (detail::SMATH_ANGLE_UNIT_ID } else if constexpr (detail::SMATH_ANGLE_UNIT_ID
== detail::AngularUnit::Radians) { == detail::AngularUnit::Radians) {
return static_cast<R>(value) * static_cast<R>(std::numbers::pi / 180.0); return static_cast<R>(value) * static_cast<R>(std::numbers::pi / 180.0);
} else if constexpr (detail::SMATH_ANGLE_UNIT_ID } else {
== detail::AngularUnit::Turns) {
return static_cast<R>(value) / static_cast<R>(360.0); return static_cast<R>(value) / static_cast<R>(360.0);
} }
} }
template<class T> constexpr auto rad(T const value) template<class T> constexpr auto rad(T value)
{ {
using R = std::common_type_t<T, double>; using R = angle_ret_t<T>;
if constexpr (detail::SMATH_ANGLE_UNIT_ID == detail::AngularUnit::Degrees) { if constexpr (detail::SMATH_ANGLE_UNIT_ID == detail::AngularUnit::Degrees) {
return static_cast<R>(value) * static_cast<R>(180.0 / std::numbers::pi); return static_cast<R>(value) * static_cast<R>(180.0 / std::numbers::pi);
} else if constexpr (detail::SMATH_ANGLE_UNIT_ID } else if constexpr (detail::SMATH_ANGLE_UNIT_ID
== detail::AngularUnit::Radians) { == detail::AngularUnit::Radians) {
return static_cast<R>(value); return static_cast<R>(value);
} else if constexpr (detail::SMATH_ANGLE_UNIT_ID } else {
== detail::AngularUnit::Turns) {
return static_cast<R>(value) return static_cast<R>(value)
/ (static_cast<R>(2.0) * static_cast<R>(std::numbers::pi)); / (static_cast<R>(2.0) * static_cast<R>(std::numbers::pi));
} }
} }
template<class T> constexpr auto turns(T const value) template<class T> constexpr auto turns(T value)
{ {
using R = std::common_type_t<T, double>; using R = angle_ret_t<T>;
if constexpr (detail::SMATH_ANGLE_UNIT_ID == detail::AngularUnit::Degrees) { if constexpr (detail::SMATH_ANGLE_UNIT_ID == detail::AngularUnit::Degrees) {
return static_cast<R>(value) * static_cast<R>(360.0); return static_cast<R>(value) * static_cast<R>(360.0);
} else if constexpr (detail::SMATH_ANGLE_UNIT_ID } else if constexpr (detail::SMATH_ANGLE_UNIT_ID
== detail::AngularUnit::Radians) { == detail::AngularUnit::Radians) {
return static_cast<R>(value) return static_cast<R>(value)
* (static_cast<R>(2.0) * static_cast<R>(std::numbers::pi)); * (static_cast<R>(2.0) * static_cast<R>(std::numbers::pi));
} else if constexpr (detail::SMATH_ANGLE_UNIT_ID } else {
== detail::AngularUnit::Turns) {
return static_cast<R>(value); return static_cast<R>(value);
} }
} }
@@ -1105,28 +1108,18 @@ inline auto matrix_perspective(
template<typename T> template<typename T>
[[nodiscard]] inline auto matrix_look_at(Vec<3, T> const eye, [[nodiscard]] inline auto matrix_look_at(Vec<3, T> const eye,
Vec<3, T> const center, Vec<3, T> const up, bool flip_z_axis = false) Vec<3, T> const center, Vec<3, T> const up) -> Mat<4, 4, T>
-> Mat<4, 4, T>
{ {
auto f = (center - eye).normalized(); auto f = (center - eye).normalized_safe();
auto s = f.cross(up).normalized(); auto s = f.cross(up).normalized_safe();
auto u = s.cross(f); auto u = s.cross(f);
if (!flip_z_axis) {
return Mat<4, 4, T> { return Mat<4, 4, T> {
Vec<4, T> { s.x(), s.y(), s.z(), 0 }, Vec<4, T> { s.x(), s.y(), s.z(), 0 },
Vec<4, T> { u.x(), u.y(), u.z(), 0 }, Vec<4, T> { u.x(), u.y(), u.z(), 0 },
Vec<4, T> { -f.x(), -f.y(), -f.z(), 0 }, Vec<4, T> { -f.x(), -f.y(), -f.z(), 0 },
Vec<4, T> { -s.dot(eye), -u.dot(eye), f.dot(eye), 1 }, Vec<4, T> { -s.dot(eye), -u.dot(eye), f.dot(eye), 1 },
}; };
} else {
return Mat<4, 4, T> {
Vec<4, T> { s.x(), s.y(), s.z(), 0 },
Vec<4, T> { u.x(), u.y(), u.z(), 0 },
Vec<4, T> { f.x(), f.y(), f.z(), 0 },
Vec<4, T> { -s.dot(eye), -u.dot(eye), -f.dot(eye), 1 },
};
}
} }
template<typename T> template<typename T>