Merge pull request #32 from orange-cpp/u/orange-cpp/examples

U/orange cpp/examples

CMakeLists.txt

@@ -5,18 +5,29 @@ project(omath VERSION 1.0.1 LANGUAGES CXX)
 include(CMakePackageConfigHelpers)
 
 
-option(OMATH_BUILD_TESTS "Build unit tests" ON)
+option(OMATH_BUILD_TESTS "Build unit tests" OFF)
 option(OMATH_THREAT_WARNING_AS_ERROR "Set highest level of warnings and force compiler to treat them as errors" ON)
 option(OMATH_BUILD_AS_SHARED_LIBRARY "Build Omath as .so or .dll" OFF)
 option(OMATH_USE_AVX2 "Omath will use AVX2 to boost performance" ON)
-
+option(OMATH_IMGUI_INTEGRATION "Omath will define method to convert omath types to imgui types" OFF)
+option(OMATH_BUILD_EXAMPLES "Build example projects with you can learn & play" OFF)
 
 if (OMATH_BUILD_AS_SHARED_LIBRARY)
-    add_library(omath SHARED source/Vector3.cpp)
+    add_library(omath SHARED source/Matrix.cpp)
 else()
     add_library(omath STATIC source/Matrix.cpp)
 endif()
 
+add_library(omath::omath ALIAS omath)
+
+if (OMATH_IMGUI_INTEGRATION)
+    target_compile_definitions(omath PUBLIC OMATH_IMGUI_INTEGRATION)
+endif()
+
+if (OMATH_USE_AVX2)
+    target_compile_definitions(omath PUBLIC OMATH_USE_AVX2)
+endif()
+
 set_target_properties(omath PROPERTIES
         ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
         LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
@@ -31,9 +42,6 @@ endif()
 
 target_compile_features(omath PUBLIC cxx_std_23)
 
-if (OMATH_USE_AVX2)
-    target_compile_definitions(omath PUBLIC OMATH_USE_AVX2)
-endif()
 
 add_subdirectory(source)
 
@@ -42,6 +50,10 @@ if(OMATH_BUILD_TESTS)
     add_subdirectory(tests)
 endif()
 
+if (OMATH_BUILD_EXAMPLES)
+    add_subdirectory(examples)
+endif()
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND OMATH_THREAT_WARNING_AS_ERROR)
     target_compile_options(omath PRIVATE /W4 /WX)
 elseif(OMATH_THREAT_WARNING_AS_ERROR)

README.md

@@ -12,14 +12,14 @@
 Oranges's Math Library (omath) is a comprehensive, open-source library aimed at providing efficient, reliable, and versatile mathematical functions and algorithms. Developed primarily in C++, this library is designed to cater to a wide range of mathematical operations essential in scientific computing, engineering, and academic research.
 
 ## 👁‍🗨 Features
-- **Efficiency**: Optimized for performance, ensuring quick computations.
+- **Efficiency**: Optimized for performance, ensuring quick computations using AVX2.
 - **Versatility**: Includes a wide array of mathematical functions and algorithms.
 - **Ease of Use**: Simplified interface for convenient integration into various projects.
 - **Projectile Prediction**: Projectile prediction engine with O(N) algo complexity, that can power you projectile aim-bot.
 - **3D Projection**: No need to find view-projection matrix anymore you can make your own projection pipeline.
 - **Collision Detection**: Production ready code to handle collision detection by using simple interfaces.
 - **No Additional Dependencies**: No additional dependencies need to use OMath except unit test execution
-
+- **Ready for meta-programming**: Omath use templates for common types like Vectors, Matrixes etc, to handle all types!
 ## ⏬ Getting Started
 ### Prerequisites
 - C++ Compiler
@@ -72,8 +72,11 @@ TEST(UnitTestProjection, IsPointOnScreen)
 With `omath/projection` module you can achieve simple ESP hack for powered by Source/Unreal/Unity engine games, like [Apex Legends](https://store.steampowered.com/app/1172470/Apex_Legends/).
 
 ![banner](https://i.imgur.com/lcJrfcZ.png)
-![Watch Video](https://youtu.be/lM_NJ1yCunw?si=5E87OrQMeypxSJ3E)
+Or for InfinityWard Engine based games. Like Call of Duty Black Ops 2!
+![banner](https://i.imgur.com/F8dmdoo.png)
 
+Or even advanced projectile aimbot
+[Watch Video](https://youtu.be/lM_NJ1yCunw?si=5E87OrQMeypxSJ3E)
 </details>
 
 ## 🫵🏻 Contributing

examples/CMakeLists.txt

@@ -0,0 +1,4 @@
+project(examples)
+
+add_executable(ExampleProjectionMatrixBuilder ExampleProjMatBuilder.cpp)
+target_link_libraries(ExampleProjectionMatrixBuilder PRIVATE omath::omath)

examples/ExampleProjMatBuilder.cpp

@@ -0,0 +1,40 @@
+//
+// Created by Vlad on 3/19/2025.
+//
+#include <iostream>
+#include <omath/engines/opengl_engine/Camera.hpp>
+#include <omath/engines/opengl_engine/Formulas.hpp>
+#include <omath/projection/Camera.hpp>
+#include <print>
+
+
+int main()
+{
+    std::println("OMATH Projection Matrix Builder");
+
+    float fov = 0;
+    float near = 0;
+    float far = 0;
+    float viewPortWidth = 0;
+    float viewPortHeight = 0;
+
+    std::print("Enter camera fov: ");
+    std::cin >> fov;
+
+    std::print("Enter camera z near: ");
+    std::cin >> near;
+
+    std::print("Enter camera z far: ");
+    std::cin >> far;
+
+    std::print("Enter camera screen width: ");
+    std::cin >> viewPortWidth;
+
+    std::print("Enter camera screen height: ");
+    std::cin >> viewPortHeight;
+
+    const auto mat =
+            omath::opengl_engine::CalcPerspectiveProjectionMatrix(fov, viewPortWidth / viewPortHeight, near, far);
+
+    std::print("{}", mat.ToString());
+};

include/omath/Angle.hpp

@@ -19,7 +19,7 @@ namespace omath
     class Angle
     {
         Type m_angle;
-        constexpr Angle(const Type& degrees)
+        constexpr explicit Angle(const Type& degrees)
         {
             if constexpr (flags == AngleFlags::Normalized)
                 m_angle = angles::WrapAngle(degrees, min, max);
@@ -36,7 +36,7 @@ namespace omath
         [[nodiscard]]
         constexpr static Angle FromDegrees(const Type& degrees)
         {
-            return {degrees};
+            return Angle{degrees};
         }
         constexpr Angle() : m_angle(0)
         {
@@ -45,7 +45,7 @@ namespace omath
         [[nodiscard]]
         constexpr static Angle FromRadians(const Type& degrees)
         {
-            return {angles::RadiansToDegrees<Type>(degrees)};
+            return Angle{angles::RadiansToDegrees<Type>(degrees)};
         }
 
         [[nodiscard]]
@@ -96,7 +96,6 @@ namespace omath
             return Cos() / Sin();
         }
 
-        [[nodiscard]]
         constexpr Angle& operator+=(const Angle& other)
         {
             if constexpr (flags == AngleFlags::Normalized)
@@ -116,7 +115,6 @@ namespace omath
         [[nodiscard]]
         constexpr std::partial_ordering operator<=>(const Angle& other) const = default;
 
-        [[nodiscard]]
         constexpr Angle& operator-=(const Angle& other)
         {
             return operator+=(-other);
@@ -146,7 +144,7 @@ namespace omath
         [[nodiscard]]
         constexpr Angle operator-() const
         {
-            return {-m_angle};
+            return Angle{-m_angle};
         }
     };
 }

include/omath/Mat.hpp

@@ -8,6 +8,7 @@
 #include <stdexcept>
 #include <utility>
 #include "Vector3.hpp"
+#include <iomanip>
 
 namespace omath
 {
@@ -34,11 +35,13 @@ namespace omath
     class Mat final
     {
     public:
-        constexpr Mat()
+        constexpr Mat() noexcept
         {
             Clear();
         }
-        constexpr static MatStoreType GetStoreOrdering()
+
+        [[nodiscard]]
+        constexpr static MatStoreType GetStoreOrdering() noexcept
         {
             return StoreType;
         }
@@ -72,6 +75,7 @@ namespace omath
             m_data = other.m_data;
         }
 
+        [[nodiscard]]
         constexpr Type& operator[](const size_t row, const size_t col)
         {
             return At(row, col);
@@ -100,7 +104,8 @@ namespace omath
             return {Rows, Columns};
         }
 
-        [[nodiscard]] constexpr const Type& At(const size_t rowIndex, const size_t columnIndex) const
+        [[nodiscard]]
+        constexpr const Type& At(const size_t rowIndex, const size_t columnIndex) const
         {
             if (rowIndex >= Rows || columnIndex >= Columns)
                 throw std::out_of_range("Index out of range");
@@ -177,6 +182,7 @@ namespace omath
             return *this = *this * other;
         }
 
+        [[nodiscard]]
         constexpr Mat operator*(const Type& f) const noexcept
         {
             Mat result(*this);
@@ -192,6 +198,7 @@ namespace omath
             return *this;
         }
 
+        [[nodiscard]]
         constexpr Mat operator/(const Type& f) const noexcept
         {
             Mat result(*this);
@@ -290,15 +297,20 @@ namespace omath
         std::string ToString() const noexcept
         {
             std::ostringstream oss;
+            oss << "[[";
+
             for (size_t i = 0; i < Rows; ++i)
             {
+                if (i > 0)
+                    oss << " [";
+
                 for (size_t j = 0; j < Columns; ++j)
                 {
-                    oss << At(i, j);
+                    oss << std::setw(9) << std::fixed << std::setprecision(3) << At(i, j);
                     if (j != Columns - 1)
-                        oss << ' ';
+                        oss << ", ";
                 }
-                oss << '\n';
+                oss << (i == Rows - 1 ? "]]" : "]\n");
             }
             return oss.str();
         }

include/omath/Triangle.hpp

@@ -6,6 +6,16 @@
 
 namespace omath
 {
+        /*
+        |\
+        | \
+      a |  \ hypot
+        |   \
+        -----
+          b
+        */
+
+
     template<class Vector>
     class Triangle final
     {

include/omath/Vector2.hpp

@@ -3,13 +3,19 @@
 //
 
 #pragma once
-#include <tuple>
 #include <cmath>
+#include <tuple>
+
+#ifdef OMATH_IMGUI_INTEGRATION
+#include <imgui.h>
+#endif
+
 
 namespace omath
 {
 
-    template<class Type> requires std::is_arithmetic_v<Type>
+    template<class Type>
+        requires std::is_arithmetic_v<Type>
     class Vector2
     {
     public:
@@ -19,7 +25,9 @@ namespace omath
         // Constructors
         constexpr Vector2() = default;
 
-        constexpr Vector2(const Type& x, const Type& y) : x(x), y(y) {}
+        constexpr Vector2(const Type& x, const Type& y) : x(x), y(y)
+        {
+        }
 
         // Equality operators
         [[nodiscard]]
@@ -145,23 +153,12 @@ namespace omath
 
         constexpr Vector2& Abs()
         {
-            //FIXME: Replace with std::abs, if it will become constexprable
+            // FIXME: Replace with std::abs, if it will become constexprable
             x = x < 0 ? -x : x;
             y = y < 0 ? -y : y;
             return *this;
         }
 
-        template<class type>
-        [[nodiscard]] constexpr const type& As() const
-        {
-            return *reinterpret_cast<const type*>(this);
-        }
-        template<class type>
-        [[nodiscard]] constexpr type& As()
-        {
-            return *reinterpret_cast<type*>(this);
-        }
-
         [[nodiscard]] constexpr Vector2 operator-() const
         {
             return {-x, -y};
@@ -188,7 +185,7 @@ namespace omath
             return {x / fl, y / fl};
         }
 
-         // Sum of elements
+        // Sum of elements
         [[nodiscard]] constexpr Type Sum() const
         {
             return x + y;
@@ -199,5 +196,13 @@ namespace omath
         {
             return std::make_tuple(x, y);
         }
+
+#ifdef OMATH_IMGUI_INTEGRATION
+        [[nodiscard]]
+        ImVec2 ToImVec2() const
+        {
+            return {static_cast<float>(this->x), static_cast<float>(this->y)};
+        }
+#endif
     };
-}
+} // namespace omath

include/omath/Vector3.hpp

@@ -4,13 +4,12 @@
 
 #pragma once
 
+#include "Vector2.hpp"
 #include <cstdint>
-#include <functional>
-#include "omath/Vector2.hpp"
-#include "omath/Angle.hpp"
 #include <expected>
-#include <immintrin.h>
-
+#include <functional>
+#include "omath/Angle.hpp"
+#include "omath/Vector2.hpp"
 
 namespace omath
 {
@@ -110,45 +109,45 @@ namespace omath
             return *this;
         }
 
-        [[nodiscard]] constexpr float DistToSqr(const Vector3& vOther) const
+        [[nodiscard]] constexpr Type DistToSqr(const Vector3& vOther) const
         {
             return (*this - vOther).LengthSqr();
         }
 
-        [[nodiscard]] constexpr float Dot(const Vector3& vOther) const
+        [[nodiscard]] constexpr Type Dot(const Vector3& vOther) const
         {
             return Vector2<Type>::Dot(vOther) + z * vOther.z;
         }
 
 #ifndef _MSC_VER
-        [[nodiscard]] constexpr float Length() const
+        [[nodiscard]] constexpr Type Length() const
         {
             return std::hypot(x, y, z);
         }
 
-        [[nodiscard]] constexpr float Length2D() const
+        [[nodiscard]] constexpr Type Length2D() const
         {
             return Vector2::Length();
         }
-        [[nodiscard]] float DistTo(const Vector3& vOther) const
+        [[nodiscard]] Type DistTo(const Vector3& vOther) const
         {
             return (*this - vOther).Length();
         }
         [[nodiscard]] constexpr Vector3 Normalized() const
         {
-            const float length = this->Length();
+            const Type length = this->Length();
 
             return length != 0 ? *this / length : *this;
         }
 #else
-        [[nodiscard]] float Length() const
+        [[nodiscard]] Type Length() const
         {
             return std::hypot(this->x, this->y, z);
         }
 
         [[nodiscard]] Vector3 Normalized() const
         {
-            const float length = this->Length();
+            const Type length = this->Length();
 
             return length != 0 ? *this / length : *this;
         }
@@ -158,14 +157,14 @@ namespace omath
             return Vector2<Type>::Length();
         }
 
-        [[nodiscard]] float DistTo(const Vector3& vOther) const
+        [[nodiscard]] Type DistTo(const Vector3& vOther) const
         {
             return (*this - vOther).Length();
         }
 #endif
 
 
-        [[nodiscard]] constexpr float LengthSqr() const
+        [[nodiscard]] constexpr Type LengthSqr() const
         {
             return Vector2<Type>::LengthSqr() + z * z;
         }
@@ -214,7 +213,7 @@ namespace omath
                 this->x * v.y - this->y * v.x
             };
         }
-        [[nodiscard]] constexpr float Sum() const
+        [[nodiscard]] constexpr Type Sum() const
         {
             return Sum2D() + z;
         }
@@ -238,12 +237,12 @@ namespace omath
             return false;
         }
 
-        [[nodiscard]] constexpr float Sum2D() const
+        [[nodiscard]] constexpr Type Sum2D() const
         {
             return Vector2<Type>::Sum();
         }
 
-        [[nodiscard]] constexpr std::tuple<float, float, float> AsTuple() const
+        [[nodiscard]] constexpr std::tuple<Type, Type, Type> AsTuple() const
         {
             return std::make_tuple(this->x, this->y, z);
         }

include/omath/Vector4.hpp

@@ -6,6 +6,7 @@
 #include <omath/Vector3.hpp>
 #include <algorithm>
 
+
 namespace omath
 {
     template <class Type>
@@ -81,7 +82,7 @@ namespace omath
             return Vector3<Type>::LengthSqr() + w * w;
         }
 
-        [[nodiscard]] constexpr float Dot(const Vector4& vOther) const
+        [[nodiscard]] constexpr Type Dot(const Vector4& vOther) const
         {
             return Vector3<Type>::Dot(vOther) + w * vOther.w;
         }
@@ -98,7 +99,7 @@ namespace omath
 
             return *this;
         }
-        constexpr Vector4& Clamp(const float min, const float max)
+        constexpr Vector4& Clamp(const Type& min, const Type& max)
         {
             this->x = std::clamp(this->x, min, max);
             this->y = std::clamp(this->y, min, max);
@@ -126,7 +127,7 @@ namespace omath
         }
 
         [[nodiscard]]
-        constexpr Vector4 operator*(const float scalar) const
+        constexpr Vector4 operator*(const Type& scalar) const
         {
             return {this->x * scalar, this->y * scalar, this->z * scalar, w * scalar};
         }
@@ -138,7 +139,7 @@ namespace omath
         }
 
         [[nodiscard]]
-        constexpr Vector4 operator/(const float scalar) const
+        constexpr Vector4 operator/(const Type& scalar) const
         {
             return {this->x / scalar, this->y / scalar, this->z / scalar, w / scalar};
         }
@@ -154,5 +155,19 @@ namespace omath
         {
             return Vector3<Type>::Sum() + w;
         }
+
+#ifdef OMATH_IMGUI_INTEGRATION
+        [[nodiscard]]
+        ImVec4 ToImVec4() const
+        {
+            return
+            {
+                static_cast<float>(this->x),
+                static_cast<float>(this->y),
+                static_cast<float>(this->z),
+                static_cast<float>(w),
+            };
+        }
+#endif
     };
 }

include/omath/engines/OpenGL/Formulas.hpp

@@ -1,54 +0,0 @@
-//
-// Created by Orange on 12/23/2024.
-//
-#pragma once
-#include "Constants.hpp"
-
-
-namespace omath::opengl
-{
-    [[nodiscard]]
-    inline Vector3<float> ForwardVector(const ViewAngles& angles)
-    {
-        const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsForward);
-
-        return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
-    }
-
-    [[nodiscard]]
-    inline Vector3<float> RightVector(const ViewAngles& angles)
-    {
-        const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsRight);
-
-        return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
-    }
-
-    [[nodiscard]]
-    inline Vector3<float> UpVector(const ViewAngles& angles)
-    {
-        const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsUp);
-
-        return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
-    }
-
-    [[nodiscard]] inline Mat4x4 CalcViewMatrix(const ViewAngles& angles, const Vector3<float>& cam_origin)
-    {
-        return MatCameraView<float, MatStoreType::COLUMN_MAJOR>(-ForwardVector(angles), RightVector(angles), UpVector(angles), cam_origin);
-    }
-
-
-    [[nodiscard]]
-    inline Mat4x4 CalcPerspectiveProjectionMatrix(const float fieldOfView, const float aspectRatio, const float near,
-                                                  const float far)
-    {
-        const float fovHalfTan = std::tan(angles::DegreesToRadians(fieldOfView) / 2.f);
-
-        return {
-                    {1.f / (aspectRatio * fovHalfTan), 0, 0, 0},
-                    {0, 1.f / (fovHalfTan), 0, 0},
-                    {0, 0, -(far + near) / (far - near), -(2.f * far * near) / (far - near)},
-                    {0, 0, -1, 0},
-
-            };
-    }
-}

include/omath/engines/iw_engine/Camera.hpp

@@ -0,0 +1,21 @@
+//
+// Created by Vlad on 3/17/2025.
+//
+
+#pragma once
+#include "Constants.hpp"
+#include "omath/projection/Camera.hpp"
+
+namespace omath::iw_engine
+{
+    class Camera final : public projection::Camera<Mat4x4, ViewAngles>
+    {
+    public:
+        Camera(const Vector3<float>& position, const ViewAngles& viewAngles, const projection::ViewPort& viewPort,
+               const Angle<float, 0.f, 180.f, AngleFlags::Clamped>& fov, float near, float far);
+        void LookAt(const Vector3<float>& target) override;
+    protected:
+        [[nodiscard]] Mat4x4 CalcViewMatrix() const override;
+        [[nodiscard]] Mat4x4 CalcProjectionMatrix() const override;
+    };
+}

include/omath/engines/iw_engine/Constants.hpp

@@ -0,0 +1,25 @@
+//
+// Created by Vlad on 3/17/2025.
+//
+
+#pragma once
+#include <omath/Vector3.hpp>
+#include <omath/Mat.hpp>
+#include <omath/Angle.hpp>
+#include <omath/ViewAngles.hpp>
+
+namespace omath::iw_engine
+{
+    constexpr Vector3<float> kAbsUp = {0, 0, 1};
+    constexpr Vector3<float> kAbsRight = {0, -1, 0};
+    constexpr Vector3<float> kAbsForward = {1, 0, 0};
+
+    using Mat4x4 = Mat<4, 4, float, MatStoreType::ROW_MAJOR>;
+    using Mat3x3 = Mat<4, 4, float, MatStoreType::ROW_MAJOR>;
+    using Mat1x3 = Mat<1, 3, float, MatStoreType::ROW_MAJOR>;
+    using PitchAngle = Angle<float, -89.f, 89.f, AngleFlags::Clamped>;
+    using YawAngle = Angle<float, -180.f, 180.f, AngleFlags::Normalized>;
+    using RollAngle = Angle<float, -180.f, 180.f, AngleFlags::Normalized>;
+
+    using ViewAngles = omath::ViewAngles<PitchAngle, YawAngle, RollAngle>;
+}

include/omath/engines/iw_engine/Formulas.hpp

@@ -0,0 +1,24 @@
+//
+// Created by Vlad on 3/17/2025.
+//
+
+#pragma once
+#include "Constants.hpp"
+
+namespace omath::iw_engine
+{
+    [[nodiscard]]
+    Vector3<float> ForwardVector(const ViewAngles& angles);
+
+    [[nodiscard]]
+    Vector3<float> RightVector(const ViewAngles& angles);
+
+    [[nodiscard]]
+    Vector3<float> UpVector(const ViewAngles& angles);
+
+    [[nodiscard]] Mat4x4 CalcViewMatrix(const ViewAngles& angles, const Vector3<float>& cam_origin);
+
+
+    [[nodiscard]]
+    Mat4x4 CalcPerspectiveProjectionMatrix(float fieldOfView, float aspectRatio, float near, float far);
+} // namespace omath::source

include/omath/engines/opengl_engine/Camera.hpp

@@ -5,7 +5,7 @@
 #include "Constants.hpp"
 #include "omath/projection/Camera.hpp"
 
-namespace omath::opengl
+namespace omath::opengl_engine
 {
     class Camera final : public projection::Camera<Mat4x4, ViewAngles>
     {

include/omath/engines/opengl_engine/Constants.hpp

@@ -8,7 +8,7 @@
 #include <omath/Angle.hpp>
 #include <omath/ViewAngles.hpp>
 
-namespace omath::opengl
+namespace omath::opengl_engine
 {
     constexpr Vector3<float> kAbsUp = {0, 1, 0};
     constexpr Vector3<float> kAbsRight = {1, 0, 0};

include/omath/engines/opengl_engine/Formulas.hpp

@@ -0,0 +1,24 @@
+//
+// Created by Orange on 12/23/2024.
+//
+#pragma once
+#include "Constants.hpp"
+
+
+namespace omath::opengl_engine
+{
+    [[nodiscard]]
+    Vector3<float> ForwardVector(const ViewAngles& angles);
+
+    [[nodiscard]]
+    Vector3<float> RightVector(const ViewAngles& angles);
+
+    [[nodiscard]]
+    Vector3<float> UpVector(const ViewAngles& angles);
+
+    [[nodiscard]] Mat4x4 CalcViewMatrix(const ViewAngles& angles, const Vector3<float>& cam_origin);
+
+
+    [[nodiscard]]
+    Mat4x4 CalcPerspectiveProjectionMatrix(float fieldOfView, float aspectRatio, float near, float far);
+} // namespace omath::opengl_engine

include/omath/engines/source_engine/Camera.hpp

@@ -5,7 +5,7 @@
 #include "Constants.hpp"
 #include "omath/projection/Camera.hpp"
 
-namespace omath::source
+namespace omath::source_engine
 {
     class Camera final : public projection::Camera<Mat4x4, ViewAngles>
     {
@@ -13,6 +13,7 @@ namespace omath::source
         Camera(const Vector3<float>& position, const ViewAngles& viewAngles, const projection::ViewPort& viewPort,
                const Angle<float, 0.f, 180.f, AngleFlags::Clamped>& fov, float near, float far);
         void LookAt(const Vector3<float>& target) override;
+    protected:
         [[nodiscard]] Mat4x4 CalcViewMatrix() const override;
         [[nodiscard]] Mat4x4 CalcProjectionMatrix() const override;
     };

include/omath/engines/source_engine/Constants.hpp

@@ -7,7 +7,8 @@
 #include <omath/Mat.hpp>
 #include <omath/Angle.hpp>
 #include <omath/ViewAngles.hpp>
-namespace omath::source
+
+namespace omath::source_engine
 {
     constexpr Vector3<float> kAbsUp = {0, 0, 1};
     constexpr Vector3<float> kAbsRight = {0, -1, 0};

include/omath/engines/source_engine/Formulas.hpp

@@ -0,0 +1,23 @@
+//
+// Created by Orange on 12/4/2024.
+//
+#pragma once
+#include "Constants.hpp"
+
+namespace omath::source_engine
+{
+    [[nodiscard]]
+    Vector3<float> ForwardVector(const ViewAngles& angles);
+
+    [[nodiscard]]
+    Vector3<float> RightVector(const ViewAngles& angles);
+
+    [[nodiscard]]
+    Vector3<float> UpVector(const ViewAngles& angles);
+
+    [[nodiscard]] Mat4x4 CalcViewMatrix(const ViewAngles& angles, const Vector3<float>& cam_origin);
+
+
+    [[nodiscard]]
+    Mat4x4 CalcPerspectiveProjectionMatrix(float fieldOfView, float aspectRatio, float near, float far);
+} // namespace omath::source

include/omath/projection/Camera.hpp

@@ -38,7 +38,7 @@ namespace omath::projection
         {
 
         }
-
+    protected:
         virtual void LookAt(const Vector3<float>& target) = 0;
 
         [[nodiscard]] virtual Mat4x4Type CalcViewMatrix() const = 0;
@@ -49,41 +49,44 @@ namespace omath::projection
         {
             return CalcProjectionMatrix() * CalcViewMatrix();
         }
+    public:
+
+        [[nodiscard]] const Mat4x4Type& GetViewProjectionMatrix() const
+        {
+            if (!m_viewProjectionMatrix.has_value())
+                m_viewProjectionMatrix = CalcViewProjectionMatrix();
+
+            return m_viewProjectionMatrix.value();
+        }
 
         void SetFieldOfView(const FieldOfView& fov)
         {
             m_fieldOfView = fov;
-            m_viewProjectionMatrix = CalcViewProjectionMatrix();
         }
 
         void SetNearPlane(const float near)
         {
             m_nearPlaneDistance = near;
-            m_viewProjectionMatrix = CalcViewProjectionMatrix();
         }
 
         void SetFarPlane(const float far)
         {
             m_farPlaneDistance = far;
-            m_viewProjectionMatrix = CalcViewProjectionMatrix();
         }
 
         void SetViewAngles(const ViewAnglesType& viewAngles)
         {
             m_viewAngles = viewAngles;
-            m_viewProjectionMatrix = CalcViewProjectionMatrix();
         }
 
         void SetOrigin(const Vector3<float>& origin)
         {
             m_origin = origin;
-            m_viewProjectionMatrix = CalcViewProjectionMatrix();
         }
 
         void SetViewPort(const ViewPort& viewPort)
         {
             m_viewPort = viewPort;
-            m_viewProjectionMatrix = CalcViewProjectionMatrix();
         }
 
         [[nodiscard]] const FieldOfView& GetFieldOfView() const
@@ -113,10 +116,9 @@ namespace omath::projection
 
         [[nodiscard]] std::expected<Vector3<float>, Error> WorldToScreen(const Vector3<float>& worldPosition) const
         {
-            if (!m_viewProjectionMatrix.has_value())
-                m_viewProjectionMatrix = CalcViewProjectionMatrix();
+            const auto& viewProjMatrix = GetViewProjectionMatrix();
 
-            auto projected = m_viewProjectionMatrix.value() * MatColumnFromVector<float, Mat4x4Type::GetStoreOrdering()>(worldPosition);
+            auto projected = viewProjMatrix * MatColumnFromVector<float, Mat4x4Type::GetStoreOrdering()>(worldPosition);
 
             if (projected.At(3, 0) == 0.0f)
                 return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);

source/engines/CMakeLists.txt

@@ -1,2 +1,3 @@
-add_subdirectory(Source)
-add_subdirectory(OpenGL)
+add_subdirectory(source_engine)
+add_subdirectory(opengl_engine)
+add_subdirectory(iw_engine)

source/engines/OpenGL/CMakeLists.txt

@@ -1 +0,0 @@
-target_sources(omath PRIVATE Camera.cpp)

source/engines/Source/CMakeLists.txt

@@ -1 +0,0 @@
-target_sources(omath PRIVATE Camera.cpp)

source/engines/iw_engine/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(omath PRIVATE Camera.cpp Formulas.cpp)

source/engines/iw_engine/Camera.cpp

@@ -0,0 +1,34 @@
+//
+// Created by Vlad on 3/17/2025.
+//
+#include "omath/engines/iw_engine/Camera.hpp"
+#include "omath/engines/iw_engine/Formulas.hpp"
+
+namespace omath::iw_engine
+{
+
+    Camera::Camera(const Vector3<float>& position, const ViewAngles& viewAngles, const projection::ViewPort& viewPort,
+                   const Angle<float, 0.f, 180.f, AngleFlags::Clamped>& fov, const float near, const float far) :
+        projection::Camera<Mat4x4, ViewAngles>(position, viewAngles, viewPort, fov, near, far)
+    {
+    }
+    void Camera::LookAt([[maybe_unused]] const Vector3<float>& target)
+    {
+        const float distance = m_origin.DistTo(target);
+        const auto delta = target - m_origin;
+
+
+        m_viewAngles.pitch = PitchAngle::FromRadians(std::asin(delta.z / distance));
+        m_viewAngles.yaw = -YawAngle::FromRadians(std::atan2(delta.y, delta.x));
+        m_viewAngles.roll = RollAngle::FromRadians(0.f);
+    }
+    Mat4x4 Camera::CalcViewMatrix() const
+    {
+        return iw_engine::CalcViewMatrix(m_viewAngles, m_origin);
+    }
+    Mat4x4 Camera::CalcProjectionMatrix() const
+    {
+        return CalcPerspectiveProjectionMatrix(m_fieldOfView.AsDegrees(), m_viewPort.AspectRatio(), m_nearPlaneDistance,
+                                               m_farPlaneDistance);
+    }
+} // namespace omath::openg

source/engines/iw_engine/Formulas.cpp

@@ -0,0 +1,47 @@
+//
+// Created by Vlad on 3/19/2025.
+//
+#include "omath/engines/iw_engine/Formulas.hpp"
+
+
+namespace omath::iw_engine
+{
+
+    Vector3<float> ForwardVector(const ViewAngles& angles)
+    {
+        const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsForward);
+
+        return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
+    }
+
+    Vector3<float> RightVector(const ViewAngles& angles)
+    {
+        const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsRight);
+
+        return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
+    }
+    Vector3<float> UpVector(const ViewAngles& angles)
+    {
+        const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsUp);
+
+        return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
+    }
+    Mat4x4 CalcViewMatrix(const ViewAngles& angles, const Vector3<float>& cam_origin)
+    {
+        return MatCameraView(ForwardVector(angles), RightVector(angles), UpVector(angles), cam_origin);
+    }
+    Mat4x4 CalcPerspectiveProjectionMatrix(const float fieldOfView, const float aspectRatio, const float near,
+                                           const float far)
+    {
+        // NOTE: Need magic number to fix fov calculation, since source inherit Quake proj matrix calculation
+        constexpr auto kMultiplyFactor = 0.75f;
+        const float fovHalfTan = std::tan(angles::DegreesToRadians(fieldOfView) / 2.f) * kMultiplyFactor;
+
+        return {
+                {1.f / (aspectRatio * fovHalfTan), 0, 0, 0},
+                {0, 1.f / fovHalfTan, 0, 0},
+                {0, 0, (far + near) / (far - near), -(2.f * far * near) / (far - near)},
+                {0, 0, 1, 0},
+        };
+    }
+} // namespace omath::iw_engine

source/engines/opengl_engine/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(omath PRIVATE Camera.cpp Formulas.cpp)

source/engines/opengl_engine/Camera.cpp

@@ -1,11 +1,11 @@
 //
 // Created by Orange on 12/23/2024.
 //
-#include "omath/engines/OpenGL/Camera.hpp"
-#include "omath/engines/OpenGL/Formulas.hpp"
+#include "omath/engines/opengl_engine/Camera.hpp"
+#include "omath/engines/opengl_engine/Formulas.hpp"
 
 
-namespace omath::opengl
+namespace omath::opengl_engine
 {
 
     Camera::Camera(const Vector3<float>& position, const ViewAngles& viewAngles, const projection::ViewPort& viewPort,
@@ -25,7 +25,7 @@ namespace omath::opengl
     }
     Mat4x4 Camera::CalcViewMatrix() const
     {
-        return opengl::CalcViewMatrix(m_viewAngles, m_origin);
+        return opengl_engine::CalcViewMatrix(m_viewAngles, m_origin);
     }
     Mat4x4 Camera::CalcProjectionMatrix() const
     {

source/engines/opengl_engine/Formulas.cpp

@@ -0,0 +1,46 @@
+//
+// Created by Vlad on 3/19/2025.
+//
+#include "omath/engines/opengl_engine/Formulas.hpp"
+
+
+namespace omath::opengl_engine
+{
+
+    Vector3<float> ForwardVector(const ViewAngles& angles)
+    {
+        const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsForward);
+
+        return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
+    }
+    Vector3<float> RightVector(const ViewAngles& angles)
+    {
+        const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsRight);
+
+        return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
+    }
+    Vector3<float> UpVector(const ViewAngles& angles)
+    {
+        const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsUp);
+
+        return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
+    }
+    Mat4x4 CalcViewMatrix(const ViewAngles& angles, const Vector3<float>& cam_origin)
+    {
+        return MatCameraView<float, MatStoreType::COLUMN_MAJOR>(-ForwardVector(angles), RightVector(angles),
+                                                                UpVector(angles), cam_origin);
+    }
+    Mat4x4 CalcPerspectiveProjectionMatrix(const float fieldOfView, const float aspectRatio, const float near,
+                                           const float far)
+    {
+        const float fovHalfTan = std::tan(angles::DegreesToRadians(fieldOfView) / 2.f);
+
+        return {
+                {1.f / (aspectRatio * fovHalfTan), 0, 0, 0},
+                {0, 1.f / (fovHalfTan), 0, 0},
+                {0, 0, -(far + near) / (far - near), -(2.f * far * near) / (far - near)},
+                {0, 0, -1, 0},
+
+        };
+    }
+} // namespace omath::opengl_engine

source/engines/source_engine/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(omath PRIVATE Camera.cpp Formulas.cpp)

source/engines/source_engine/Camera.cpp

@@ -1,11 +1,11 @@
 //
 // Created by Orange on 12/4/2024.
 //
-#include "omath/engines/Source/Camera.hpp"
-#include "omath/engines/Source/Formulas.hpp"
+#include "omath/engines/source_engine/Camera.hpp"
+#include "omath/engines/source_engine/Formulas.hpp"
 
 
-namespace omath::source
+namespace omath::source_engine
 {
 
     Camera::Camera(const Vector3<float>& position, const ViewAngles& viewAngles, const projection::ViewPort& viewPort,
@@ -26,7 +26,7 @@ namespace omath::source
 
     Mat4x4 Camera::CalcViewMatrix() const
     {
-        return source::CalcViewMatrix(m_viewAngles, m_origin);
+        return source_engine::CalcViewMatrix(m_viewAngles, m_origin);
     }
 
     Mat4x4 Camera::CalcProjectionMatrix() const

source/engines/source_engine/Formulas.cpp

@@ -1,47 +1,39 @@
 //
-// Created by Orange on 12/4/2024.
+// Created by Vlad on 3/19/2025.
 //
-#pragma once
-#include "Constants.hpp"
+#include <omath/engines/source_engine/Formulas.hpp>
 
-namespace omath::source
+
+namespace omath::source_engine
 {
-    [[nodiscard]]
-    inline Vector3<float> ForwardVector(const ViewAngles& angles)
+    Vector3<float> ForwardVector(const ViewAngles& angles)
     {
         const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsForward);
 
         return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
     }
 
-    [[nodiscard]]
-    inline Vector3<float> RightVector(const ViewAngles& angles)
+    Vector3<float> RightVector(const ViewAngles& angles)
     {
         const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsRight);
 
         return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
     }
-
-    [[nodiscard]]
-    inline Vector3<float> UpVector(const ViewAngles& angles)
+    Vector3<float> UpVector(const ViewAngles& angles)
     {
         const auto vec = MatRotation(angles) * MatColumnFromVector(kAbsUp);
 
         return {vec.At(0, 0), vec.At(1, 0), vec.At(2, 0)};
     }
 
-    [[nodiscard]] inline Mat4x4 CalcViewMatrix(const ViewAngles& angles, const Vector3<float>& cam_origin)
+    Mat4x4 CalcViewMatrix(const ViewAngles& angles, const Vector3<float>& cam_origin)
     {
         return MatCameraView(ForwardVector(angles), RightVector(angles), UpVector(angles), cam_origin);
     }
-
-
-    [[nodiscard]]
-    inline Mat4x4 CalcPerspectiveProjectionMatrix(const float fieldOfView, const float aspectRatio, const float near,
-                                                  const float far)
+    Mat4x4 CalcPerspectiveProjectionMatrix(const float fieldOfView, const float aspectRatio, const float near,
+                                           const float far)
     {
-        // NOTE: Needed tp make thing draw normal, since source is wierd
-        // and use tricky projection matrix formula.
+        // NOTE: Need magic number to fix fov calculation, since source inherit Quake proj matrix calculation
         constexpr auto kMultiplyFactor = 0.75f;
 
         const float fovHalfTan = std::tan(angles::DegreesToRadians(fieldOfView) / 2.f) * kMultiplyFactor;
@@ -54,4 +46,4 @@ namespace omath::source
 
         };
     }
-} // namespace omath::source
+} // namespace omath::source_engine

source/projectile_prediction/ProjPredEngineAVX2.cpp

@@ -108,8 +108,8 @@ namespace omath::projectile_prediction
     }
     ProjPredEngineAVX2::ProjPredEngineAVX2(const float gravityConstant, const float simulationTimeStep,
                                            const float maximumSimulationTime) :
-        m_gravityConstant(gravityConstant), m_simulationTimeStep(maximumSimulationTime),
-        m_maximumSimulationTime(simulationTimeStep)
+        m_gravityConstant(gravityConstant), m_simulationTimeStep(simulationTimeStep),
+        m_maximumSimulationTime(maximumSimulationTime)
     {
     }
     std::optional<float> ProjPredEngineAVX2::CalculatePitch(const Vector3<float>& projOrigin,

source/projectile_prediction/Projectile.cpp

@@ -4,15 +4,15 @@
 
 #include "omath/projectile_prediction/Projectile.hpp"
 
-#include <omath/engines/Source/Formulas.hpp>
+#include <omath/engines/source_engine/Formulas.hpp>
 
 namespace omath::projectile_prediction
 {
     Vector3<float> Projectile::PredictPosition(const float pitch, const float yaw, const float time, const float gravity) const
     {
-        auto currentPos = m_origin + source::ForwardVector({source::PitchAngle::FromDegrees(-pitch),
-                                                            source::YawAngle::FromDegrees(yaw),
-                                                            source::RollAngle::FromDegrees(0)}) *
+        auto currentPos = m_origin + source_engine::ForwardVector({source_engine::PitchAngle::FromDegrees(-pitch),
+                                                            source_engine::YawAngle::FromDegrees(yaw),
+                                                            source_engine::RollAngle::FromDegrees(0)}) *
                                              m_launchSpeed * time;
         currentPos.z -= (gravity * m_gravityScale) * (time * time) * 0.5f;
 

tests/CMakeLists.txt

@@ -22,6 +22,7 @@ add_executable(unit-tests
         engines/UnitTestOpenGL.cpp
         engines/UnitTestUnityEngine.cpp
         engines/UnitTestSourceEngine.cpp
+        engines/UnitTestIwEngine.cpp
 
 )
 
@@ -34,6 +35,6 @@ set_target_properties(unit-tests PROPERTIES
         CXX_STANDARD_REQUIRED ON)
 
 
-target_link_libraries(unit-tests PRIVATE gtest gtest_main omath)
+target_link_libraries(unit-tests PRIVATE gtest gtest_main omath::omath)
 
 gtest_discover_tests(unit-tests)

tests/engines/UnitTestIwEngine.cpp

@@ -0,0 +1,69 @@
+//
+// Created by Vlad on 3/17/2025.
+//
+#include <gtest/gtest.h>
+#include <omath/engines/iw_engine/Camera.hpp>
+#include <omath/engines/iw_engine/Constants.hpp>
+#include <omath/engines/iw_engine/Formulas.hpp>
+
+
+TEST(UnitTestEwEngine, ForwardVector)
+{
+    const auto forward = omath::source_engine::ForwardVector({});
+
+    EXPECT_EQ(forward, omath::source_engine::kAbsForward);
+}
+
+TEST(UnitTestEwEngine, RightVector)
+{
+    const auto right = omath::source_engine::RightVector({});
+
+    EXPECT_EQ(right, omath::source_engine::kAbsRight);
+}
+
+TEST(UnitTestEwEngine, UpVector)
+{
+    const auto up = omath::source_engine::UpVector({});
+    EXPECT_EQ(up, omath::source_engine::kAbsUp);
+}
+
+TEST(UnitTestEwEngine, ProjectTargetMovedFromCamera)
+{
+    constexpr auto fov = omath::projection::FieldOfView::FromDegrees(90.f);
+    const auto cam = omath::source_engine::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
+
+
+    for (float distance = 0.02f; distance < 1000.f; distance += 0.01f)
+    {
+        const auto projected = cam.WorldToScreen({distance, 0, 0});
+
+        EXPECT_TRUE(projected.has_value());
+
+        if (!projected.has_value())
+            continue;
+
+        EXPECT_NEAR(projected->x, 960, 0.00001f);
+        EXPECT_NEAR(projected->y, 540, 0.00001f);
+    }
+}
+
+TEST(UnitTestEwEngine, CameraSetAndGetFov)
+{
+    constexpr auto fov = omath::projection::FieldOfView::FromDegrees(90.f);
+    auto cam = omath::source_engine::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
+
+    EXPECT_EQ(cam.GetFieldOfView().AsDegrees(), 90.f);
+    cam.SetFieldOfView(omath::projection::FieldOfView::FromDegrees(50.f));
+
+    EXPECT_EQ(cam.GetFieldOfView().AsDegrees(), 50.f);
+}
+
+TEST(UnitTestEwEngine, CameraSetAndGetOrigin)
+{
+    auto cam = omath::source_engine::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, {}, 0.01f, 1000.f);
+
+    EXPECT_EQ(cam.GetOrigin(), omath::Vector3<float>{});
+    cam.SetFieldOfView(omath::projection::FieldOfView::FromDegrees(50.f));
+
+    EXPECT_EQ(cam.GetFieldOfView().AsDegrees(), 50.f);
+}

tests/engines/UnitTestOpenGL.cpp

@@ -2,35 +2,35 @@
 // Created by Orange on 11/23/2024.
 //
 #include <gtest/gtest.h>
-#include <omath/engines/OpenGL/Camera.hpp>
-#include <omath/engines/OpenGL/Constants.hpp>
-#include <omath/engines/OpenGL/Formulas.hpp>
+#include <omath/engines/opengl_engine//Camera.hpp>
+#include <omath/engines/opengl_engine/Constants.hpp>
+#include <omath/engines/opengl_engine/Formulas.hpp>
 
 
 TEST(UnitTestOpenGL, ForwardVector)
 {
-    const auto forward = omath::opengl::ForwardVector({});
+    const auto forward = omath::opengl_engine::ForwardVector({});
 
-    EXPECT_EQ(forward, omath::opengl::kAbsForward);
+    EXPECT_EQ(forward, omath::opengl_engine::kAbsForward);
 }
 
 TEST(UnitTestOpenGL, RightVector)
 {
-    const auto right = omath::opengl::RightVector({});
+    const auto right = omath::opengl_engine::RightVector({});
 
-    EXPECT_EQ(right, omath::opengl::kAbsRight);
+    EXPECT_EQ(right, omath::opengl_engine::kAbsRight);
 }
 
 TEST(UnitTestOpenGL, UpVector)
 {
-    const auto up = omath::opengl::UpVector({});
-    EXPECT_EQ(up, omath::opengl::kAbsUp);
+    const auto up = omath::opengl_engine::UpVector({});
+    EXPECT_EQ(up, omath::opengl_engine::kAbsUp);
 }
 
 TEST(UnitTestOpenGL, ProjectTargetMovedFromCamera)
 {
     constexpr auto fov = omath::projection::FieldOfView::FromDegrees(90.f);
-    auto cam = omath::opengl::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
+    const auto cam = omath::opengl_engine::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
 
 
     for (float distance = -10.f; distance > -1000.f; distance -= 0.01f)
@@ -50,7 +50,7 @@ TEST(UnitTestOpenGL, ProjectTargetMovedFromCamera)
 TEST(UnitTestOpenGL, CameraSetAndGetFov)
 {
     constexpr auto fov = omath::projection::FieldOfView::FromDegrees(90.f);
-    auto cam = omath::opengl::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
+    auto cam = omath::opengl_engine::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
 
     EXPECT_EQ(cam.GetFieldOfView().AsDegrees(), 90.f);
     cam.SetFieldOfView(omath::projection::FieldOfView::FromDegrees(50.f));
@@ -60,7 +60,7 @@ TEST(UnitTestOpenGL, CameraSetAndGetFov)
 
 TEST(UnitTestOpenGL, CameraSetAndGetOrigin)
 {
-    auto cam = omath::opengl::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, {}, 0.01f, 1000.f);
+    auto cam = omath::opengl_engine::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, {}, 0.01f, 1000.f);
 
     EXPECT_EQ(cam.GetOrigin(), omath::Vector3<float>{});
     cam.SetFieldOfView(omath::projection::FieldOfView::FromDegrees(50.f));

tests/engines/UnitTestSourceEngine.cpp

@@ -2,35 +2,35 @@
 // Created by Orange on 11/23/2024.
 //
 #include <gtest/gtest.h>
-#include <omath/engines/Source/Camera.hpp>
-#include <omath/engines/Source/Constants.hpp>
-#include <omath/engines/Source/Formulas.hpp>
+#include <omath/engines/source_engine/Camera.hpp>
+#include <omath/engines/source_engine/Constants.hpp>
+#include <omath/engines/source_engine/Formulas.hpp>
 
 
 TEST(UnitTestSourceEngine, ForwardVector)
 {
-    const auto forward = omath::source::ForwardVector({});
+    const auto forward = omath::source_engine::ForwardVector({});
 
-    EXPECT_EQ(forward, omath::source::kAbsForward);
+    EXPECT_EQ(forward, omath::source_engine::kAbsForward);
 }
 
 TEST(UnitTestSourceEngine, RightVector)
 {
-    const auto right = omath::source::RightVector({});
+    const auto right = omath::source_engine::RightVector({});
 
-    EXPECT_EQ(right, omath::source::kAbsRight);
+    EXPECT_EQ(right, omath::source_engine::kAbsRight);
 }
 
 TEST(UnitTestSourceEngine, UpVector)
 {
-    const auto up = omath::source::UpVector({});
-    EXPECT_EQ(up, omath::source::kAbsUp);
+    const auto up = omath::source_engine::UpVector({});
+    EXPECT_EQ(up, omath::source_engine::kAbsUp);
 }
 
 TEST(UnitTestSourceEngine, ProjectTargetMovedFromCamera)
 {
     constexpr auto fov = omath::projection::FieldOfView::FromDegrees(90.f);
-    auto cam = omath::source::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
+    const auto cam = omath::source_engine::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
 
 
     for (float distance = 0.02f; distance < 1000.f; distance += 0.01f)
@@ -50,7 +50,7 @@ TEST(UnitTestSourceEngine, ProjectTargetMovedFromCamera)
 TEST(UnitTestSourceEngine, CameraSetAndGetFov)
 {
     constexpr auto fov = omath::projection::FieldOfView::FromDegrees(90.f);
-    auto cam = omath::source::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
+    auto cam = omath::source_engine::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
 
     EXPECT_EQ(cam.GetFieldOfView().AsDegrees(), 90.f);
     cam.SetFieldOfView(omath::projection::FieldOfView::FromDegrees(50.f));
@@ -60,7 +60,7 @@ TEST(UnitTestSourceEngine, CameraSetAndGetFov)
 
 TEST(UnitTestSourceEngine, CameraSetAndGetOrigin)
 {
-    auto cam = omath::source::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, {}, 0.01f, 1000.f);
+    auto cam = omath::source_engine::Camera({0, 0, 0}, {}, {1920.f, 1080.f}, {}, 0.01f, 1000.f);
 
     EXPECT_EQ(cam.GetOrigin(), omath::Vector3<float>{});
     cam.SetFieldOfView(omath::projection::FieldOfView::FromDegrees(50.f));

tests/general/UnitTestMat.cpp

@@ -127,7 +127,7 @@ TEST_F(UnitTestMat, ToString)
 {
     const std::string str = m2.ToString();
     EXPECT_FALSE(str.empty());
-    EXPECT_EQ(str, "1 2\n3 4\n");
+    EXPECT_EQ(str, "[[    1.000,     2.000]\n [    3.000,     4.000]]");
 }
 
 // Test assignment operators

tests/general/UnitTestProjection.cpp

@@ -3,15 +3,14 @@
 //
 #include <complex>
 #include <gtest/gtest.h>
-#include <omath/Matrix.hpp>
-#include <omath/engines/Source/Camera.hpp>
+#include <omath/engines/source_engine/Camera.hpp>
 #include <omath/projection/Camera.hpp>
 #include <print>
 
 TEST(UnitTestProjection, Projection)
 {
     const auto x = omath::Angle<float, 0.f, 180.f, omath::AngleFlags::Clamped>::FromDegrees(90.f);
-    auto cam = omath::source::Camera({0, 0, 0}, omath::source::ViewAngles{}, {1920.f, 1080.f}, x, 0.01f, 1000.f);
+    auto cam = omath::source_engine::Camera({0, 0, 0}, omath::source_engine::ViewAngles{}, {1920.f, 1080.f}, x, 0.01f, 1000.f);
 
     const auto projected = cam.WorldToScreen({1000, 0, 50});
     std::print("{} {} {}", projected->x, projected->y, projected->z);