Merge pull request #47 from CapsCollective/feature/math-overhaul

Re-implemented math classes to enable raycasting and improve precision

Author: Raelr

.github/workflows/windows.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: windows-latest
     defaults:
       run:
-        shell: PowerShell
+        shell: pwsh
 
     steps:
     - uses: actions/checkout@v2

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/BillboardInstanced.frag

@@ -0,0 +1,22 @@
+//
+//  Copyright (c) 2022 Jonathan Moallem (@J-Mo63) & Aryeh Zinn (@Raelr)
+//
+//  This code is released under an unmodified zlib license.
+//  For conditions of distribution and use, please see:
+//      https://opensource.org/licenses/Zlib
+//
+
+#version 450
+
+layout (location = 0) in vec4 fragColour;
+layout (location = 1) in vec2 uv;
+layout (location = 2) in flat uint texId;
+
+layout (location = 0) out vec4 outColour;
+
+layout(binding = 1) uniform sampler2D tex[16];
+
+void main() {
+    vec4 sampled = texture(tex[texId], vec2(uv.x, -uv.y));
+    outColour = sampled * fragColour;
+}

engine/render/assets/shaders/BillboardInstanced.vert

@@ -0,0 +1,59 @@
+#version 450
+
+//
+//  Copyright (c) 2022 Jonathan Moallem (@J-Mo63) & Aryeh Zinn (@Raelr)
+//
+//  This code is released under an unmodified zlib license.
+//  For conditions of distribution and use, please see:
+//      https://opensource.org/licenses/Zlib
+//
+
+// Per instance data
+layout (location = 0) in vec3 inPosition;
+layout (location = 1) in vec3 inScale;
+layout (location = 2) in vec4 inColour;
+layout (location = 3) in vec4 inUv;
+
+layout (location = 0) out vec4 outColour;
+layout (location = 1) out vec2 outUv;
+layout (location = 2) out flat uint outTexId;
+
+layout (push_constant) uniform PushConstant {
+    uint textureIndex;
+} pushConstant;
+
+vec3 quadVertices[4] = {
+    vec3(1.0, 1.0, 0),
+    vec3(1.0, -1.0, 0),
+    vec3(-1.0, -1.0, 0),
+    vec3(-1.0, 1.0, 0)
+};
+
+struct CameraData
+{
+    mat4 projectionMatrix;
+    mat4 viewMatrix;
+};
+
+layout (binding = 0) uniform GlobalData {
+    CameraData cameraData;
+} globalData;
+
+CameraData camera = globalData.cameraData;
+
+void main() {
+    vec4 quadInCameraSpace = camera.viewMatrix * vec4(inPosition,  1.0);
+
+    vec4 positionInCameraSpace = quadInCameraSpace + vec4(quadVertices[gl_VertexIndex].xy * (inScale.xy * 0.5), 0.0, 0.0);
+
+    gl_Position = camera.projectionMatrix * positionInCameraSpace;
+
+    float uvx = (float(gl_VertexIndex == 0 || gl_VertexIndex == 1) * (inUv.x + inUv.z))
+    + (float(gl_VertexIndex == 2 || gl_VertexIndex == 3) * (inUv.x));
+    float uvy = (float(gl_VertexIndex == 0 || gl_VertexIndex == 3) * (inUv.y + inUv.w))
+    + (float(gl_VertexIndex == 1 || gl_VertexIndex == 2) * (inUv.y));
+
+    outColour = inColour;
+    outUv = vec2(uvx, uvy);
+    outTexId = pushConstant.textureIndex;
+}