GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues with UI renderer

Browse Source
This commit is contained in:
GeorgH93
2023-09-06 00:03:06 +02:00
parent f9688792c4
commit 9709861bda
5 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3rdParty/imgui/CMakeLists.txt vendored
View File

@@ -7,7 +7,7 @@ set(IMGUI_SRC_DIR ${CMAKE_BINARY_DIR}/3rdParty/imgui/imgui-src)
FetchContent_Populate(imgui FetchContent_Populate(imgui
GIT_REPOSITORY https://github.com/ocornut/imgui.git GIT_REPOSITORY https://github.com/ocornut/imgui.git
GIT_SHALLOW TRUE GIT_SHALLOW TRUE
GIT_TAG v1.89.8-docking GIT_TAG v1.90-docking
SOURCE_DIR ${IMGUI_SRC_DIR} SOURCE_DIR ${IMGUI_SRC_DIR}
) )

21
openVulkanoCpp/Scene/UI/UI.hpp
View File

@@ -17,25 +17,34 @@ namespace openVulkanoCpp::Scene::UI
public: public:
std::vector<std::shared_ptr<UiElement>> children; std::vector<std::shared_ptr<UiElement>> children;
virtual ~UiElement() override = default; ~UiElement() override = default;
virtual void Tick() override {}; void Tick() override {};
virtual void Draw() const; void Render()
void Render() const
{ {
BeginDraw();
Draw(); Draw();
for(const auto& child : children) for(const auto& child : children)
{ {
child->Render(); child->Render();
} }
EndDraw();
} }
protected:
virtual void BeginDraw() {};
virtual void Draw() = 0;
virtual void EndDraw() {};
}; };
class Ui : public UiElement class Ui : public UiElement
{ {
public: public:
void Draw() const override {} virtual void Init() = 0;
void Draw() override {}
}; };
} }

2
openVulkanoCpp/Vulkan/RenderPass.cpp
View File

@@ -36,7 +36,7 @@ namespace openVulkanoCpp::Vulkan
vk::ClearValue* clearValues = nullptr; vk::ClearValue* clearValues = nullptr;
if (m_useClearColor) { size++; clearValues = m_clearValues.data(); } if (m_useClearColor) { size++; clearValues = m_clearValues.data(); }
else if (m_useClearDepth) clearValues = &m_clearValues[1]; else if (m_useClearDepth) clearValues = &m_clearValues[1];
if (m_useClearDepth) size++; if (m_useClearColor && m_useClearDepth) size++;
m_beginInfo.clearValueCount = size; m_beginInfo.clearValueCount = size;
m_beginInfo.pClearValues = clearValues; m_beginInfo.pClearValues = clearValues;

10
openVulkanoCpp/Vulkan/UiRenderer.cpp
View File

@@ -62,10 +62,14 @@ namespace openVulkanoCpp::Vulkan
#ifdef GLFW_AVAILABLE #ifdef GLFW_AVAILABLE
ImGui_ImplGlfw_InitForVulkan((GLFWwindow*)context->window->GetNativeWindowHandle(), true); ImGui_ImplGlfw_InitForVulkan((GLFWwindow*)context->window->GetNativeWindowHandle(), true);
#endif #endif
uiInitialized = true;
if (ui) ui->Init();
} }
void UiRenderer::Close() void UiRenderer::Close()
{ {
uiInitialized = false;
ImGui_ImplVulkan_Shutdown(); ImGui_ImplVulkan_Shutdown();
device.destroy(descriptorPool); device.destroy(descriptorPool);
} }
@@ -91,4 +95,10 @@ namespace openVulkanoCpp::Vulkan
ImGui_ImplVulkan_RenderDrawData(ImGui::GetDrawData(), cmdBuffer); ImGui_ImplVulkan_RenderDrawData(ImGui::GetDrawData(), cmdBuffer);
uiRenderPass.End(cmdBuffer); uiRenderPass.End(cmdBuffer);
} }
void UiRenderer::SetActiveUi(Scene::UI::Ui* ui)
{
this->ui = ui;
if (ui && uiInitialized) ui->Init();
}
} }

3
openVulkanoCpp/Vulkan/UiRenderer.hpp
View File

@@ -20,6 +20,7 @@ namespace openVulkanoCpp::Vulkan
RenderPass uiRenderPass; RenderPass uiRenderPass;
vk::DescriptorPool descriptorPool; vk::DescriptorPool descriptorPool;
Scene::UI::Ui* ui; Scene::UI::Ui* ui;
bool uiInitialized = false;
public: public:
UiRenderer() = default; UiRenderer() = default;
@@ -36,7 +37,7 @@ namespace openVulkanoCpp::Vulkan
void Close(); void Close();
void SetActiveUi(Scene::UI::Ui* ui) { this->ui = ui; } void SetActiveUi(Scene::UI::Ui* ui);
Scene::UI::Ui* GetActiveUi() { return ui; } Scene::UI::Ui* GetActiveUi() { return ui; }
}; };