From 23086a5d33acc66414f1169bf22abe78b3383f94 Mon Sep 17 00:00:00 2001 From: hachem Date: Wed, 13 Aug 2025 18:39:13 +0200 Subject: fix: more consistent formatting --- src/core/window.cpp | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) (limited to 'src/core/window.cpp') diff --git a/src/core/window.cpp b/src/core/window.cpp index 26c134c..9605f8c 100644 --- a/src/core/window.cpp +++ b/src/core/window.cpp @@ -1,11 +1,10 @@ #include "window.h" #include #include -#include namespace Donut { - static bool s_glfw_initialized = false; + static bool s_glfw_initialized = false; static uint32_t s_glfw_window_count = 0; Window::Window(const std::string& title, int width, int height) @@ -43,26 +42,18 @@ namespace Donut } glfwMakeContextCurrent(m_window); - - if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) - { - std::cout << "Failed to initialize GLAD!" << std::endl; - glfwTerminate(); - return; - } - glfwSetWindowUserPointer(m_window, this); glfwSetErrorCallback(glfw_error_callback); glfwSetWindowCloseCallback(m_window, glfw_window_close_callback); - glfwSetWindowSizeCallback(m_window, glfw_window_size_callback); + glfwSetWindowSizeCallback(m_window, glfw_window_size_callback); glfwSetWindowFocusCallback(m_window, glfw_window_focus_callback); - glfwSetWindowPosCallback(m_window, glfw_window_pos_callback); - glfwSetKeyCallback(m_window, glfw_key_callback); - glfwSetCharCallback(m_window, glfw_char_callback); + glfwSetWindowPosCallback(m_window, glfw_window_pos_callback); + glfwSetKeyCallback(m_window, glfw_key_callback); + glfwSetCharCallback(m_window, glfw_char_callback); glfwSetMouseButtonCallback(m_window, glfw_mouse_button_callback); - glfwSetScrollCallback(m_window, glfw_mouse_scroll_callback); - glfwSetCursorPosCallback(m_window, glfw_cursor_pos_callback); + glfwSetScrollCallback(m_window, glfw_mouse_scroll_callback); + glfwSetCursorPosCallback(m_window, glfw_cursor_pos_callback); s_glfw_window_count++; } @@ -93,19 +84,15 @@ namespace Donut void Window::set_cursor_locked(bool locked) { m_cursor_locked = locked; - if (locked) - glfwSetInputMode(m_window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); - else - glfwSetInputMode(m_window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); + glfwSetInputMode(m_window, GLFW_CURSOR, locked ? + GLFW_CURSOR_DISABLED : GLFW_CURSOR_NORMAL); } void Window::set_cursor_visible(bool visible) { m_cursor_visible = visible; - if (visible) - glfwSetInputMode(m_window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); - else - glfwSetInputMode(m_window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN); + glfwSetInputMode(m_window, GLFW_CURSOR, visible ? + GLFW_CURSOR_NORMAL : GLFW_CURSOR_HIDDEN); } void Window::glfw_error_callback(int error, const char* description) @@ -153,7 +140,8 @@ namespace Donut win->m_event_handler.on_event(event); } - void Window::glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) + void Window::glfw_key_callback(GLFWwindow* window, int key, int scancode, + int action, int mods) { Window* win = static_cast(glfwGetWindowUserPointer(window)); @@ -184,7 +172,8 @@ namespace Donut win->m_event_handler.on_event(event); } - void Window::glfw_mouse_button_callback(GLFWwindow* window, int button, int action, int mods) + void Window::glfw_mouse_button_callback(GLFWwindow* window, int button, + int action, int mods) { Window* win = static_cast(glfwGetWindowUserPointer(window)); @@ -199,8 +188,7 @@ namespace Donut { MouseButtonReleasedEvent event(button); win->m_event_handler.on_event(event); - break; - } + } break; } } -- cgit v1.3