Fixed camera position issues

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/render/renderer/ObjectLoader.cpp

@@ -13,6 +13,7 @@
 #include <utils/Logging.h>
 #include <utils/math/vec/Hashing.h>
 
+#include <unordered_map>
 #include <vector>
 
 namespace std

engine/render/renderer/platform/vulkan/IndexBuffer.cpp

@@ -27,7 +27,7 @@ IndexBuffer::IndexBuffer(unsigned long bufferSize) : size {bufferSize}
     Allocate(device);
 }
 
-IndexBuffer::IndexBuffer(void* data, unsigned long long dataSize) : IndexBuffer(dataSize)
+IndexBuffer::IndexBuffer(void* data, uint64_t dataSize) : IndexBuffer(dataSize)
 {
     Copy(data, dataSize, 0);
 }
@@ -89,7 +89,7 @@ void IndexBuffer::Copy(const void* data, unsigned long dSize, unsigned long offs
     Utils::CopyData(device, memory, dSize, dst, offset);
 }
 
-void IndexBuffer::Bind(const CommandBuffer& commandBuffer, unsigned long long offset)
+void IndexBuffer::Bind(const CommandBuffer& commandBuffer, uint64_t offset)
 {
     vkCmdBindIndexBuffer(commandBuffer.Get(), buffer, offset, VK_INDEX_TYPE_UINT32);
 }

engine/render/renderer/platform/vulkan/IndexBuffer.h

@@ -9,6 +9,8 @@
 #ifndef SIEGE_ENGINE_RENDER_INDEX_BUFFER_H
 #define SIEGE_ENGINE_RENDER_INDEX_BUFFER_H
 
+#include <cstdint>
+
 #include "CommandBuffer.h"
 #include "utils/Types.h"
 
@@ -22,7 +24,7 @@ class IndexBuffer
     // 'Structors
 
     IndexBuffer() = default;
-    IndexBuffer(void* data, unsigned long long dataSize);
+    IndexBuffer(void* data, uint64_t dataSize);
     IndexBuffer(unsigned long bufferSize);
     IndexBuffer(const IndexBuffer& other);
     IndexBuffer(IndexBuffer&& other);
@@ -37,7 +39,7 @@ class IndexBuffer
 
     void Free();
     void Copy(const void* data, unsigned long size, unsigned long offset = 0);
-    void Bind(const CommandBuffer& commandBuffer, unsigned long long offset = 0);
+    void Bind(const CommandBuffer& commandBuffer, uint64_t offset = 0);
 
 private:
 

engine/render/renderer/platform/vulkan/StaticMesh.cpp

@@ -12,7 +12,6 @@
 
 #include "Swapchain.h"
 #include "render/renderer/ObjectLoader.h"
-#include "utils/Draw.h"
 
 namespace Siege::Vulkan
 {
@@ -108,14 +107,14 @@ void StaticMesh::Free()
     indexBuffer.Free();
 }
 
-void StaticMesh::Bind(CommandBuffer& commandBuffer, unsigned long long offset)
+void StaticMesh::Bind(CommandBuffer& commandBuffer, uint64_t offset)
 {
     vertexBuffer.Bind(commandBuffer, &offset);
 }
 
 void StaticMesh::BindIndexed(CommandBuffer& commandBuffer,
-                             unsigned long long vertexOffset,
-                             unsigned long long indexOffset)
+                             uint64_t vertexOffset,
+                             uint64_t indexOffset)
 {
     Bind(commandBuffer, vertexOffset);
     indexBuffer.Bind(commandBuffer, indexOffset);

engine/render/renderer/platform/vulkan/StaticMesh.h

@@ -11,6 +11,8 @@
 
 #include <utils/collections/HeapArray.h>
 
+#include <cstdint>
+
 #include "CommandBuffer.h"
 #include "IndexBuffer.h"
 #include "Material.h"
@@ -107,11 +109,11 @@ class StaticMesh
      */
     void Free();
 
-    void Bind(CommandBuffer& commandBuffer, unsigned long long offset);
+    void Bind(CommandBuffer& commandBuffer, uint64_t offset);
 
     void BindIndexed(CommandBuffer& commandBuffer,
-                     unsigned long long vertOffset = 0,
-                     unsigned long long indexOffset = 0);
+                     uint64_t vertOffset = 0,
+                     uint64_t indexOffset = 0);
 
     // Getters and Setters
 

engine/render/renderer/platform/vulkan/VertexBuffer.cpp

@@ -57,7 +57,7 @@ VertexBuffer::~VertexBuffer()
 }
 
 void VertexBuffer::Bind(const CommandBuffer& commandBuffer,
-                        unsigned long long* offset,
+                        const uint64_t* offset,
                         unsigned int binding)
 {
     vkCmdBindVertexBuffers(commandBuffer.Get(), binding, 1, &buffer, offset);

engine/render/renderer/platform/vulkan/VertexBuffer.h

@@ -9,6 +9,8 @@
 #ifndef SIEGE_ENGINE_RENDER_VERTEXBUFFER_H
 #define SIEGE_ENGINE_RENDER_VERTEXBUFFER_H
 
+#include <cstdint>
+
 #include "CommandBuffer.h"
 #include "utils/Types.h"
 
@@ -36,9 +38,7 @@ class VertexBuffer
     // Functions
 
     void Copy(const void* data, unsigned long size, unsigned long offset = 0);
-    void Bind(const CommandBuffer& commandBuffer,
-              unsigned long long* offset,
-              unsigned int binding = 0);
+    void Bind(const CommandBuffer& commandBuffer, const uint64_t* offset, unsigned int binding = 0);
     void Free();
 
     template<typename T>

engine/render/renderer/renderer/BillboardRenderer.cpp

@@ -10,6 +10,8 @@
 
 #include <utils/math/vec/Vec2.h>
 
+#include <cstdint>
+
 #include "render/renderer/platform/vulkan/Swapchain.h"
 #include "render/renderer/platform/vulkan/utils/Draw.h"
 
@@ -106,13 +108,13 @@ void BillboardRenderer::Render(Vulkan::CommandBuffer& buffer,
 
         billboardMaterial.Bind(buffer);
 
-        unsigned long long quadOffset = (i * MAX_QUADS_PER_TEXTURE);
+        uint64_t quadOffset = (i * MAX_QUADS_PER_TEXTURE);
 
         vBuffer.Copy(vertices[i].Data(),
                      sizeof(BillboardVertex) * vertices[i].Count(),
                      sizeof(BillboardVertex) * quadOffset);
 
-        unsigned long long bindOffset = sizeof(BillboardVertex) * quadOffset;
+        uint64_t bindOffset = sizeof(BillboardVertex) * quadOffset;
 
         vBuffer.Bind(buffer, &bindOffset);
         indexBuffer.Bind(buffer);

engine/render/renderer/renderer/DebugRenderer3D.cpp

@@ -8,6 +8,8 @@
 
 #include "DebugRenderer3D.h"
 
+#include <cstdint>
+
 #include "render/renderer/platform/vulkan/Swapchain.h"
 #include "render/renderer/platform/vulkan/utils/Draw.h"
 
@@ -77,7 +79,7 @@ void DebugRenderer3D::RenderLines(Vulkan::CommandBuffer& buffer,
 
     vBuffer.Copy(lines.Data(), sizeof(LineVertex) * lines.Count(), 0);
 
-    unsigned long long bindOffset = 0;
+    uint64_t bindOffset = 0;
 
     vBuffer.Bind(buffer, &bindOffset);