load settings on start
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
#include "imgui_impl_glfw.h"
|
||||
#include "imgui_impl_vulkan.h"
|
||||
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
#define GLFW_INCLUDE_NONE
|
||||
#define GLFW_INCLUDE_VULKAN
|
||||
@@ -21,6 +22,13 @@ public:
|
||||
ImVec2 window_size = {};
|
||||
};
|
||||
|
||||
class ImGuiCallbacks {
|
||||
public:
|
||||
std::function<void(DrawData&)> initFunc = nullptr;
|
||||
std::function<void(DrawData&)> drawFunc = nullptr;
|
||||
std::function<void(DrawData&)> cleanupFunc = nullptr;
|
||||
};
|
||||
|
||||
ImVec2 getWindowSize(GLFWwindow* window);
|
||||
|
||||
static VkAllocationCallbacks* g_Allocator = NULL;
|
||||
@@ -344,8 +352,7 @@ static void glfw_error_callback(int error, const char* description)
|
||||
fprintf(stderr, "Glfw Error %d: %s\n", error, description);
|
||||
}
|
||||
|
||||
template<typename D>
|
||||
int startImgui(D& customState, void (*const initFunc)(DrawData&, D&), void (*const drawFunc)(DrawData&, D&), void (*const cleanupFunc)(DrawData&, D&), const char* title, int windowWidth, int windowHeight)
|
||||
int startImgui(ImGuiCallbacks& callbacks, const char* title, int windowWidth, int windowHeight)
|
||||
{
|
||||
// Setup GLFW window
|
||||
glfwSetErrorCallback(glfw_error_callback);
|
||||
@@ -379,6 +386,7 @@ int startImgui(D& customState, void (*const initFunc)(DrawData&, D&), void (*con
|
||||
// Setup Dear ImGui context
|
||||
IMGUI_CHECKVERSION();
|
||||
ImGui::CreateContext();
|
||||
|
||||
ImGuiIO& io = ImGui::GetIO(); (void)io;
|
||||
//io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls
|
||||
//io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; // Enable Gamepad Controls
|
||||
@@ -426,7 +434,10 @@ int startImgui(D& customState, void (*const initFunc)(DrawData&, D&), void (*con
|
||||
drawData.window_handle = glfwGetWin32Window(window);
|
||||
drawData.window_size = getWindowSize(window);
|
||||
|
||||
initFunc(drawData, customState);
|
||||
if (callbacks.initFunc)
|
||||
{
|
||||
callbacks.initFunc(drawData);
|
||||
}
|
||||
|
||||
// Upload Fonts
|
||||
{
|
||||
@@ -490,7 +501,10 @@ int startImgui(D& customState, void (*const initFunc)(DrawData&, D&), void (*con
|
||||
ImVec2 prevWindowSize = getWindowSize(window);
|
||||
drawData.window_size = prevWindowSize;
|
||||
|
||||
drawFunc(drawData, customState);
|
||||
if (callbacks.drawFunc)
|
||||
{
|
||||
callbacks.drawFunc(drawData);
|
||||
}
|
||||
|
||||
if (drawData.window_size.x != prevWindowSize.x || drawData.window_size.y != prevWindowSize.y)
|
||||
{
|
||||
@@ -513,7 +527,10 @@ int startImgui(D& customState, void (*const initFunc)(DrawData&, D&), void (*con
|
||||
}
|
||||
|
||||
// Cleanup
|
||||
cleanupFunc(drawData, customState);
|
||||
if (callbacks.cleanupFunc)
|
||||
{
|
||||
callbacks.cleanupFunc(drawData);
|
||||
}
|
||||
err = vkDeviceWaitIdle(g_Device);
|
||||
check_vk_result(err);
|
||||
ImGui_ImplVulkan_Shutdown();
|
||||
|
||||
Reference in New Issue
Block a user