Integrated new math classes with engine

Author: Raelr

engine/core/TransitionAdapter.h

@@ -10,6 +10,7 @@
 #define SIEGE_ENGINE_TRANSITIONADAPTER_H
 
 #include <utils/math/Maths.h>
+#include <utils/math/vec/Vec3.h>
 
 #include <raylib/Vector3.hpp>
 

engine/core/entity/Entity.h

@@ -43,7 +43,7 @@ class Entity
      * @param name - a const reference to the name of the
      *               entity as a string
      */
-    Entity(const String& name) : Entity(name, {Vec3::Zero, 0.f}) {};
+    Entity(const String& name) : Entity(name, {Vec3::Zero(), 0.f}) {};
 
     /**
      * Delegate constructor for Entity, initialises

engine/core/render/Camera.cpp

@@ -19,8 +19,8 @@ static Vec3 pos {0.f, 10.f, 10.f};
 static raylib::Camera3D& GetCamera()
 {
     static raylib::Camera3D camera(FromVec3(pos),
-                                   FromVec3(Vec3::Zero),
-                                   FromVec3(Vec3::Up),
+                                   FromVec3(Vec3::Zero()),
+                                   FromVec3(Vec3::Up()),
                                    45.f,
                                    CAMERA_PERSPECTIVE);
     return camera;

engine/core/render/Camera.h

@@ -37,4 +37,4 @@ class Cam
 };
 } // namespace Siege
 
-#endif // SIEGE_ENGINE_CAMERA_H
+#endif // SIEGE_ENGINE_FPSCAMERA_H

engine/core/render/RenderSystem.cpp

@@ -43,13 +43,13 @@ void RenderSystem::DrawFrame()
         // Draw the model
         DrawModelEx(model,
                     FromVec3(item.transform.GetPosition()),
-                    FromVec3(Vec3::Up),
+                    FromVec3(Vec3::Up()),
                     item.transform.GetRotation().y,
                     FromVec3(item.transform.GetScale()),
                     WHITE);
         DrawModelWiresEx(model,
                          FromVec3(item.transform.GetPosition()),
-                         FromVec3(Vec3::Up),
+                         FromVec3(Vec3::Up()),
                          item.transform.GetRotation().y,
                          FromVec3(item.transform.GetScale()),
                          PINK);

engine/core/scene/SceneFile.cpp

@@ -43,7 +43,7 @@ String SceneFile::SerialiseToString(const std::vector<Entity*>& entities)
 
         // Serialise the general entity information
         fileData += (entity->GetName() + SEP);
-        fileData += DefineField("POSITION", entity->GetPosition().ToString());
+        fileData += DefineField("POSITION", ToString(entity->GetPosition()));
         fileData += DefineField("ROTATION", String::FromFloat(entity->GetRotation()));
         fileData += DefineField("Z-INDEX", String::FromInt(entity->GetZIndex()));
 
@@ -78,7 +78,7 @@ void SceneFile::DeserialiseLines(const std::vector<String>& lines, std::vector<E
         EntityData data;
         if (!(args.size() >= 4 && args[ENTITY_ROT].GetFloat(data.rotation) &&
               args[ENTITY_Z_IDX].GetInt(data.zIndex) &&
-              Vec3::FromString(data.position, args[ENTITY_POS])))
+              FromString(data.position, args[ENTITY_POS])))
         {
             CC_LOG_WARNING("Failed to deserialise fields for entity \"{}\"", args[ENTITY_NAME]);
         }

engine/render/assets/shaders/grid.vert

@@ -38,8 +38,8 @@ layout (set = 0, binding = 0) uniform GlobalData {
 CameraData camera = globalData.cameraData;
 
 vec3 unprojectPoint(float x, float y, float z, mat4 view, mat4 projection) {
-    mat4 viewInv = inverse(camera.viewMatrix);
-    mat4 projInv = inverse(camera.projectionMatrix);
+    mat4 viewInv = inverse(view);
+    mat4 projInv = inverse(projection);
     vec4 unprojectedPoint = viewInv * projInv * vec4(x, y, z, 1.0);
     return unprojectedPoint.xyz / unprojectedPoint.w;
 }

engine/render/renderer/Renderer.cpp

@@ -54,8 +54,8 @@ Renderer::~Renderer()
 
 void Renderer::DrawFrame()
 {
-    Renderer3D::Render(currentFrameIndex, commandBuffers, projection);
-    renderer2D.Render(commandBuffers, sizeof(uiCamera), &uiCamera, currentFrameIndex);
+    Renderer3D::Render(currentFrameIndex, commandBuffers, camera3D);
+    renderer2D.Render(commandBuffers, sizeof(camera2D), &camera2D, currentFrameIndex);
 }
 
 void Renderer::RecreateSwapChain()

engine/render/renderer/Renderer.h

@@ -12,12 +12,12 @@
 #include <utils/Logging.h>
 #include <window/Window.h>
 
+#include "camera/Camera.h"
 #include "lights/PointLight.h"
 #include "model/Model.h"
 #include "render/renderer/platform/vulkan/CommandBuffer.h"
 #include "render/renderer/platform/vulkan/Context.h"
 #include "render/renderer/platform/vulkan/DescriptorPool.h"
-#include "renderer/CameraData.h"
 #include "renderer/Renderer2D.h"
 #include "renderer/Renderer3D.h"
 
@@ -37,14 +37,14 @@ class Renderer
         return static_cast<float>(window.GetWidth()) / static_cast<float>(window.GetHeight());
     }
 
-    void SetProjection(const Mat4& projectionMat, const Mat4& viewMat)
+    void SetCamera3D(const Camera& camera)
     {
-        projection = {projectionMat, viewMat};
+        camera3D = camera;
     }
 
-    void SetUiProjection(const Mat4& projectionMat, const Mat4& viewMat)
+    void SetCamera2D(const Camera& camera)
     {
-        uiCamera = {projectionMat, viewMat};
+        camera2D = camera;
     }
 
     bool StartFrame();
@@ -107,8 +107,8 @@ class Renderer
 
     uint32_t currentImageIndex;
     bool isFrameStarted {false};
-    CameraData projection;
-    CameraData uiCamera;
+    Camera camera3D;
+    Camera camera2D;
 };
 } // namespace Siege
 

engine/render/renderer/renderer/CameraData.h renamed to engine/render/renderer/camera/Camera.cpp

@@ -6,18 +6,7 @@
 //     https://opensource.org/licenses/Zlib
 //
 
-#ifndef SIEGE_ENGINE_RENDERER_COMMON_H
-#define SIEGE_ENGINE_RENDERER_COMMON_H
-
-#include <utils/math/mat/Mat4.h>
+#include "Camera.h"
 
 namespace Siege
-{
-struct CameraData
-{
-    Mat4 projectionMatrix;
-    Mat4 viewMatrix;
-};
-} // namespace Siege
-
-#endif // SIEGE_ENGINE_RENDERER_COMMON_H
+{} // namespace Siege