Merge pull request #31 from CapsCollective/feature/quad-textures

Added Texture2D class and changed Renderer2D to batch quads with textures

Author: Raelr

engine/render/Makefile

@@ -34,7 +34,8 @@ else ifeq ($(platform), macos)
 	volkDefines = VK_USE_PLATFORM_MACOS_MVK
 	glslangValidator := $(vendorDir)/glslang/build/install/bin/glslangValidator
 endif
-compileFlags += -I $(vendorDir)/vulkan/include -I $(vendorDir)/glfw/include -I $(vendorDir)/glm -I $(vendorDir)/tinyobjloader
+compileFlags += -I $(vendorDir)/vulkan/include -I $(vendorDir)/glfw/include -I $(vendorDir)/glm \
+				-I $(vendorDir)/tinyobjloader -I $(vendorDir)/stb_image
 
 .PHONY: all vulkan-libs
 

engine/render/assets/shaders/grid.frag

@@ -56,4 +56,6 @@ void main() {
 
     outColor = (grid(fragPos3D, 1) + grid(fragPos3D, 1))* float(t > 0);
     outColor.a *= fading;
+
+    if (outColor.a == 0) discard;
 }

engine/render/assets/shaders/simpleShader.frag

@@ -40,7 +40,7 @@ layout (binding = 1) uniform GlobalData {
 
 void main() {
 
-    ObjectData object = objectBuffer.objects[gl_BaseInstance];
+    ObjectData object = objectBuffer.objects[gl_InstanceIndex];
 
     vec4 positionWorld = object.transform * vec4(position, 1.0);
 

engine/render/assets/shaders/simpleShader.vert

@@ -0,0 +1,14 @@
+#version 460
+
+layout (location = 0) in vec3 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 = vec4(texture(tex[texId], uv));
+    outColour = vec4(fragColour, 1.0) * sampled;
+}

engine/render/assets/shaders/simpleShader2D.vert

@@ -0,0 +1,37 @@
+#version 450
+
+layout(location = 0) in vec2 inPosition;
+layout (location = 1) in vec2 inUv;
+
+layout(location = 0) out vec3 fragColor;
+layout(location = 1) out vec2 outUv;
+layout(location = 2) out uint outTexId;
+
+layout (push_constant) uniform Transform
+{
+    mat4 transform;
+    vec4 texColour;
+    uint texIndex;
+} QuadTransform;
+
+struct CameraData
+{
+    mat4 projectionMatrix;
+    mat4 viewMatrix;
+};
+
+layout (binding = 0) uniform GlobalData {
+    CameraData cameraData;
+} globalData;
+
+CameraData camera = globalData.cameraData;
+
+void main() {
+    vec4 positionWorld = QuadTransform.transform * vec4(inPosition, 0.0, 1.0);
+
+    gl_Position = camera.projectionMatrix * camera.viewMatrix * positionWorld;
+
+    fragColor = vec3(QuadTransform.texColour);
+    outUv = inUv;
+    outTexId = QuadTransform.texIndex;
+}

engine/render/assets/shaders/texturedQuad.frag

@@ -32,6 +32,7 @@ Renderer::Renderer(Window& window) : window {window}
     DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1024);
     DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1024);
     DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, 1024);
+    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1024);
 
     DescriptorPool::BuildPool();
 
@@ -46,14 +47,15 @@ Renderer::~Renderer()
     CC_LOG_INFO("Destroying renderer")
     DescriptorPool::DestroyPool();
     Renderer3D::DestroyRenderer3D();
+    Renderer2D::DestroyRenderer2D();
 }
 
 void Renderer::DrawFrame()
 {
     Renderer2D::GlobalData global2DData = {projection};
 
-    Renderer3D::Render(commandBuffers, projection);
-    Renderer2D::Render(commandBuffers, global2DData);
+    Renderer3D::Render(currentFrameIndex, commandBuffers, projection);
+    Renderer2D::Render(commandBuffers, global2DData, currentFrameIndex);
 }
 
 void Renderer::RecreateSwapChain()
@@ -110,6 +112,8 @@ bool Renderer::StartFrame()
 
 void Renderer::EndFrame()
 {
+    Renderer2D::Update();
+
     CC_ASSERT(isFrameStarted, "Can't end frame while frame is not in progress!")
 
     auto& swapchain = context.GetSwapchain();

engine/render/assets/shaders/texturedQuad.vert

@@ -15,8 +15,7 @@
 namespace Siege
 {
 VkDescriptorPool DescriptorPool::descriptorPool {VK_NULL_HANDLE};
-Utils::MSArray<VkDescriptorPoolSize, DescriptorPool::MAX_DESCRIPTOR_POOL_SIZES>
-    DescriptorPool::sizes;
+MSArray<VkDescriptorPoolSize, DescriptorPool::MAX_DESCRIPTOR_POOL_SIZES> DescriptorPool::sizes;
 
 void DescriptorPool::AddPoolSize(const VkDescriptorType type, const uint32_t size)
 {

engine/render/renderer/Renderer.cpp

@@ -31,7 +31,7 @@ class DescriptorPool
     static constexpr size_t MAX_DESCRIPTOR_POOL_SIZES = 1024;
 
     static VkDescriptorPool descriptorPool;
-    static Utils::MSArray<VkDescriptorPoolSize, MAX_DESCRIPTOR_POOL_SIZES> sizes;
+    static MSArray<VkDescriptorPoolSize, MAX_DESCRIPTOR_POOL_SIZES> sizes;
 };
 } // namespace Siege