Starting implementation of UI framework

src/Engine/Graphics/Vulkan/VulkanCommandBuffer.cpp

@@ -89,6 +89,10 @@ void CmdBuffer::executeCommands(Array<Gfx::PRenderCommand> commands)
         auto command = commands[i].cast<SecondaryCmdBuffer>();
         command->end();
         executingCommands.add(command);
+        for(PDescriptorSet set : command->boundDescriptors)
+        {
+            set->setCurrentlyBound(this);
+        }
         cmdBuffers[i] = command->getHandle();
     }
     vkCmdExecuteCommands(handle, cmdBuffers.size(), cmdBuffers.data());
@@ -112,7 +116,7 @@ void CmdBuffer::refreshFence()
             {
                 command->reset();
             }
-
+            executingCommands.clear();
             fence->reset();
         }
     }

src/Engine/Graphics/Vulkan/VulkanCommandBuffer.h

@@ -92,6 +92,7 @@ public:
 private:
 	PGraphicsPipeline pipeline;
 	Array<PDescriptorSet> boundDescriptors;
+	friend class CmdBuffer;
 };
 DEFINE_REF(SecondaryCmdBuffer);
 

src/Engine/Graphics/Vulkan/VulkanDescriptorSets.cpp

@@ -208,6 +208,7 @@ void DescriptorSet::writeChanges()
 		if(currentlyBound != nullptr)
 		{
 			currentlyBound->getManager()->waitForCommands(currentlyBound);
+			currentlyBound = nullptr;
 		}
 		vkUpdateDescriptorSets(graphics->getDevice(), writeDescriptors.size(), writeDescriptors.data(), 0, nullptr);
 		writeDescriptors.clear();

src/Engine/Graphics/Vulkan/VulkanGraphicsResources.h

@@ -324,10 +324,14 @@ public:
 	virtual void setKeyCallback(std::function<void(KeyCode, InputAction, KeyModifier)> callback) override;
 	virtual void setMouseMoveCallback(std::function<void(double, double)> callback) override;
 	virtual void setMouseButtonCallback(std::function<void(MouseButton, InputAction, KeyModifier)> callback) override;
+	virtual void setScrollCallback(std::function<void(double, double)> callback) override;
+	virtual void setFileCallback(std::function<void(int, const char**)> callback) override;
 
 	std::function<void(KeyCode, InputAction, KeyModifier)> keyCallback;
 	std::function<void(double, double)> mouseMoveCallback;
 	std::function<void(MouseButton, InputAction, KeyModifier)> mouseButtonCallback;
+	std::function<void(double, double)> scrollCallback;
+	std::function<void(int, const char**)> fileCallback;
 protected:
 	void advanceBackBuffer();
 	void recreateSwapchain(const WindowCreateInfo &createInfo);

src/Engine/Graphics/Vulkan/VulkanInitializer.cpp

@@ -768,15 +768,7 @@ VkPipelineShaderStageCreateInfo init::PipelineShaderStageCreateInfo(VkShaderStag
 #pragma warning(disable : 4100)
 VkBool32 Seele::Vulkan::debugCallback(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objType, uint64_t obj, size_t location, int32_t code, const char *layerPrefix, const char *msg, void *userDataManager)
 {
-	if(flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT)
-	{
-		//std::cerr << layerPrefix << ": " << msg << std::endl;
-	}
-	else
-	{
-		std::cerr << layerPrefix << ": " << msg << std::endl;
-		return VK_FALSE;
-	}
+	std::cerr << layerPrefix << ": " << msg << std::endl;
 	return VK_FALSE;
 }
 #pragma warning(default : 4100)

src/Engine/Graphics/Vulkan/VulkanViewport.cpp

@@ -14,6 +14,30 @@ void glfwKeyCallback(GLFWwindow* handle, int key, int scancode, int action, int
     window->keyCallback((KeyCode)key, (InputAction)action, (KeyModifier)modifier);
 }
 
+void glfwMouseMoveCallback(GLFWwindow* handle, double xpos, double ypos)
+{
+    Window* window = (Window*)glfwGetWindowUserPointer(handle);
+    window->mouseMoveCallback(xpos, ypos);
+}
+
+void glfwMouseButtonCallback(GLFWwindow* handle, int button, int action, int modifier)
+{
+    Window* window = (Window*)glfwGetWindowUserPointer(handle);
+    window->mouseButtonCallback((MouseButton)button, (InputAction)action, (KeyModifier)modifier);
+}
+
+void glfwScrollCallback(GLFWwindow* handle, double xoffset, double yoffset)
+{
+    Window* window = (Window*)glfwGetWindowUserPointer(handle);
+    window->scrollCallback(xoffset, yoffset);
+}
+
+void glfwFileCallback(GLFWwindow* handle, int count, const char** paths)
+{
+    Window* window = (Window*)glfwGetWindowUserPointer(handle);
+    window->fileCallback(count, paths);
+}
+
 Window::Window(PGraphics graphics, const WindowCreateInfo &createInfo)
     : Gfx::Window(createInfo), graphics(graphics), instance(graphics->getInstance()), swapchain(VK_NULL_HANDLE), numSamples(createInfo.numSamples), pixelFormat(cast(createInfo.pixelFormat))
 {
@@ -23,6 +47,10 @@ Window::Window(PGraphics graphics, const WindowCreateInfo &createInfo)
     glfwSetWindowUserPointer(handle, this);
 
     glfwSetKeyCallback(handle, &glfwKeyCallback);
+    glfwSetCursorPosCallback(handle, &glfwMouseMoveCallback);
+    glfwSetMouseButtonCallback(handle, &glfwMouseButtonCallback);
+    glfwSetScrollCallback(handle, &glfwScrollCallback);
+    glfwSetDropCallback(handle, &glfwFileCallback);
 
     glfwCreateWindowSurface(instance, handle, nullptr, &surface);
 
@@ -91,6 +119,16 @@ void Window::setMouseButtonCallback(std::function<void(MouseButton, InputAction,
     mouseButtonCallback = callback;
 }
 
+void Window::setScrollCallback(std::function<void(double, double)> callback) 
+{
+    scrollCallback = callback;
+}
+
+void Window::setFileCallback(std::function<void(int, const char**)> callback)
+{
+    fileCallback = callback;
+}
+
 void Window::advanceBackBuffer()
 {
     VkResult res = VK_ERROR_OUT_OF_DATE_KHR;