mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 03:59:19 +02:00
feat(ui): imgui 1.91.9b-docking in place of 1.73: local changes of the backends carried over (glad as the gl loader, srgb and gamma of the ui, gles glsl string), BufferingBar/Spinner kept, imgui_tables in cmake; cursor position, cursor enter and focus of the main window passed to the glfw backend, which works with events now; code adapted to the api: ImGuiListClipper::Begin, BeginListBox, ImTextureID as an integer, ImageButton with an id, ImGuiKey without GetKeyIndex, logarithmic sliders in place of the removed power argument; ImGuizmo with the math operators defined before imgui.h and SetNextFrameWantCaptureMouse
This commit is contained in:
@@ -74,9 +74,15 @@ extern WNDPROC BaseWindowProc;
|
||||
|
||||
void focus_callback(GLFWwindow *window, int focus)
|
||||
{
|
||||
ui_layer::focus_callback(focus);
|
||||
Application.on_focus_change(focus != 0);
|
||||
}
|
||||
|
||||
void cursor_enter_callback(GLFWwindow *window, int entered)
|
||||
{
|
||||
ui_layer::cursor_enter_callback(entered);
|
||||
}
|
||||
|
||||
void framebuffer_resize_callback(GLFWwindow *, int w, int h)
|
||||
{
|
||||
Global.fb_size = glm::ivec2(w, h);
|
||||
@@ -90,6 +96,7 @@ void window_resize_callback(GLFWwindow *, int w, int h)
|
||||
|
||||
void cursor_pos_callback(GLFWwindow *window, double x, double y)
|
||||
{
|
||||
ui_layer::cursor_pos_callback(x, y);
|
||||
Global.cursor_pos = glm::ivec2(x, y);
|
||||
Application.on_cursor_pos(x, y);
|
||||
}
|
||||
@@ -1351,6 +1358,7 @@ void eu07_application::init_callbacks()
|
||||
glfwSetScrollCallback(window, scroll_callback);
|
||||
glfwSetCharCallback(window, char_callback);
|
||||
glfwSetWindowFocusCallback(window, focus_callback);
|
||||
glfwSetCursorEnterCallback(window, cursor_enter_callback);
|
||||
}
|
||||
|
||||
int eu07_application::init_ogl()
|
||||
|
||||
Reference in New Issue
Block a user