diff --git a/include/omath/engines/cry_engine/formulas.hpp b/include/omath/engines/cry_engine/formulas.hpp index 3739b67..0338260 100644 --- a/include/omath/engines/cry_engine/formulas.hpp +++ b/include/omath/engines/cry_engine/formulas.hpp @@ -8,7 +8,7 @@ namespace omath::cry_engine { [[nodiscard]] - OMATH_CONSTEXPR Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept + inline OMATH_CONSTEXPR Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept { return mat_rotation_axis_z(angles.yaw) * mat_rotation_axis_y(angles.roll) @@ -16,7 +16,7 @@ namespace omath::cry_engine } [[nodiscard]] - OMATH_CONSTEXPR Vector3 forward_vector(const ViewAngles& angles) noexcept + inline OMATH_CONSTEXPR Vector3 forward_vector(const ViewAngles& angles) noexcept { const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward); @@ -24,7 +24,7 @@ namespace omath::cry_engine } [[nodiscard]] - OMATH_CONSTEXPR Vector3 right_vector(const ViewAngles& angles) noexcept + inline OMATH_CONSTEXPR Vector3 right_vector(const ViewAngles& angles) noexcept { const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right); @@ -32,7 +32,7 @@ namespace omath::cry_engine } [[nodiscard]] - OMATH_CONSTEXPR Vector3 up_vector(const ViewAngles& angles) noexcept + inline OMATH_CONSTEXPR Vector3 up_vector(const ViewAngles& angles) noexcept { const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up); @@ -40,26 +40,26 @@ namespace omath::cry_engine } [[nodiscard]] - OMATH_CONSTEXPR Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3& cam_origin) noexcept + inline OMATH_CONSTEXPR Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3& cam_origin) noexcept { return mat_camera_view(forward_vector(angles), right_vector(angles), up_vector(angles), cam_origin); } [[nodiscard]] - OMATH_CONSTEXPR Vector3 extract_origin(const Mat4X4& mat) noexcept + inline OMATH_CONSTEXPR Vector3 extract_origin(const Mat4X4& mat) noexcept { return mat_extract_origin(mat); } [[nodiscard]] - OMATH_CONSTEXPR Vector3 extract_scale(const Mat4X4& mat) noexcept + inline OMATH_CONSTEXPR Vector3 extract_scale(const Mat4X4& mat) noexcept { return mat_extract_scale(mat); } [[nodiscard]] - OMATH_CONSTEXPR ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept + inline OMATH_CONSTEXPR ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept { const auto angles = mat_extract_rotation_zyx(mat); return { @@ -69,8 +69,7 @@ namespace omath::cry_engine }; } [[nodiscard]] - OMATH_CONSTEXPR Mat4X4 - calc_perspective_projection_matrix( + inline OMATH_CONSTEXPR Mat4X4 calc_perspective_projection_matrix( const float field_of_view, const float aspect_ratio, const float near, const float far, const NDCDepthRange ndc_depth_range = NDCDepthRange::ZERO_TO_ONE) noexcept {