diff options
| author | hnOsmium0001 <[email protected]> | 2022-04-08 22:30:12 -0700 |
|---|---|---|
| committer | hnOsmium0001 <[email protected]> | 2022-04-08 22:30:12 -0700 |
| commit | e47a98793e58a5dbbe76bfed27e59408e43538e4 (patch) | |
| tree | 250eb4c4200efb63c493ac6f4adb83c89be10ea1 /3rdparty/imgui/source/backends | |
| parent | 3fdc6eb4f2cbeffce9b250beec4d3a2d52a3f534 (diff) | |
More work
Diffstat (limited to '3rdparty/imgui/source/backends')
| -rw-r--r-- | 3rdparty/imgui/source/backends/imgui_impl_glfw.cpp | 2 | ||||
| -rw-r--r-- | 3rdparty/imgui/source/backends/imgui_impl_glfw.h | 3 | ||||
| -rw-r--r-- | 3rdparty/imgui/source/backends/imgui_impl_opengl3.cpp | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/3rdparty/imgui/source/backends/imgui_impl_glfw.cpp b/3rdparty/imgui/source/backends/imgui_impl_glfw.cpp index 516aa3c..68f1188 100644 --- a/3rdparty/imgui/source/backends/imgui_impl_glfw.cpp +++ b/3rdparty/imgui/source/backends/imgui_impl_glfw.cpp @@ -131,7 +131,7 @@ static void ImGui_ImplGlfw_SetClipboardText(void* user_data, const char* text) glfwSetClipboardString((GLFWwindow*)user_data, text); } -static ImGuiKey ImGui_ImplGlfw_KeyToImGuiKey(int key) +ImGuiKey ImGui_ImplGlfw_KeyToImGuiKey(int key) { switch (key) { diff --git a/3rdparty/imgui/source/backends/imgui_impl_glfw.h b/3rdparty/imgui/source/backends/imgui_impl_glfw.h index 58712de..86811ef 100644 --- a/3rdparty/imgui/source/backends/imgui_impl_glfw.h +++ b/3rdparty/imgui/source/backends/imgui_impl_glfw.h @@ -44,3 +44,6 @@ IMGUI_IMPL_API void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window, double IMGUI_IMPL_API void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods); IMGUI_IMPL_API void ImGui_ImplGlfw_CharCallback(GLFWwindow* window, unsigned int c); IMGUI_IMPL_API void ImGui_ImplGlfw_MonitorCallback(GLFWmonitor* monitor, int event); + +// CUSTOM ADDITIONS +IMGUI_IMPL_API ImGuiKey ImGui_ImplGlfw_KeyToImGuiKey(int key); diff --git a/3rdparty/imgui/source/backends/imgui_impl_opengl3.cpp b/3rdparty/imgui/source/backends/imgui_impl_opengl3.cpp index 0d3489c..93f057d 100644 --- a/3rdparty/imgui/source/backends/imgui_impl_opengl3.cpp +++ b/3rdparty/imgui/source/backends/imgui_impl_opengl3.cpp @@ -1,3 +1,7 @@ +// CUSTOM ADDITIONS +#define IMGUI_IMPL_OPENGL_LOADER_CUSTOM 1 +#include <glad/glad.h> + // dear imgui: Renderer Backend for modern OpenGL with shaders / programmatic pipeline // - Desktop GL: 2.x 3.x 4.x // - Embedded GL: ES 2.0 (WebGL 1.0), ES 3.0 (WebGL 2.0) |