From 8b3cd02761887a80f440d55e46e1d47def48d962 Mon Sep 17 00:00:00 2001 From: Danny Holman Date: Thu, 7 Nov 2024 00:37:21 -0600 Subject: ui: rename window.h to app_window.h Rename the main window definition files to app_window. This should differentiate it from a future window class that is part of the engine UI. Signed-off-by: Danny Holman --- include/rune/ui/app_window.h | 38 ++++++++++++++++++++++++++++++++++++++ include/rune/ui/window.h | 38 -------------------------------------- ui/app_window.c | 34 ++++++++++++++++++++++++++++++++++ ui/window.c | 33 --------------------------------- 4 files changed, 72 insertions(+), 71 deletions(-) create mode 100644 include/rune/ui/app_window.h delete mode 100644 include/rune/ui/window.h create mode 100644 ui/app_window.c delete mode 100644 ui/window.c diff --git a/include/rune/ui/app_window.h b/include/rune/ui/app_window.h new file mode 100644 index 0000000..f2dfc77 --- /dev/null +++ b/include/rune/ui/app_window.h @@ -0,0 +1,38 @@ +/* + * Rune Game Engine + * Copyright 2024 Danny Holman + * + * This software is provided 'as-is', without any express or implied + * warranty. In no event will the authors be held liable for any damages + * arising from the use of this software. + * + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: + * + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software + * in a product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. + */ + +#ifndef RUNE_UI_APP_WINDOW_H +#define RUNE_UI_APP_WINDOW_H + +#include +#include + +struct rune_window { + uint32_t winw; + uint32_t winh; + const char *wintitle; + GLFWwindow *window; +}; + +RAPI struct rune_window* rune_init_window(void); +RAPI void rune_destroy_window(struct rune_window *window); + +#endif diff --git a/include/rune/ui/window.h b/include/rune/ui/window.h deleted file mode 100644 index bd12fb9..0000000 --- a/include/rune/ui/window.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Rune Game Engine - * Copyright 2024 Danny Holman - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - */ - -#ifndef RUNE_UI_WINDOW_H -#define RUNE_UI_WINDOW_H - -#include -#include - -struct rune_window { - uint32_t winw; - uint32_t winh; - const char *wintitle; - GLFWwindow *window; -}; - -RAPI struct rune_window* rune_init_window(uint32_t width, uint32_t height, const char *title); -RAPI void rune_destroy_window(struct rune_window *window); - -#endif diff --git a/ui/app_window.c b/ui/app_window.c new file mode 100644 index 0000000..a60b6f2 --- /dev/null +++ b/ui/app_window.c @@ -0,0 +1,34 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +struct rune_window* rune_init_window(void) { + glfwInit(); + glfwSetErrorCallback(error_callback); + glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); + glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE); + + struct rune_window *ret = rune_alloc(sizeof(struct rune_window)); + ret->winw = 1920; + ret->winh = 1080; + ret->wintitle = rune_get_app_name(); + ret->window = glfwCreateWindow(ret->winw, ret->winh, + ret->wintitle, + NULL, NULL); + if (ret->window == NULL) { + log_output(LOG_FATAL, "Cannot create window"); + rune_abort(); + } + + return ret; +} + +void rune_destroy_window(struct rune_window *window) { + glfwDestroyWindow(window->window); + glfwTerminate(); +} diff --git a/ui/window.c b/ui/window.c deleted file mode 100644 index 37c32c6..0000000 --- a/ui/window.c +++ /dev/null @@ -1,33 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -struct rune_window* rune_init_window(uint32_t width, uint32_t height, const char *title) { - glfwInit(); - glfwSetErrorCallback(error_callback); - glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); - glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE); - - struct rune_window *ret = rune_alloc(sizeof(struct rune_window)); - ret->winw = width; - ret->winh = height; - ret->wintitle = title; - ret->window = glfwCreateWindow(ret->winw, ret->winh, - ret->wintitle, - NULL, NULL); - if (ret->window == NULL) { - log_output(LOG_FATAL, "Cannot create window"); - rune_abort(); - } - - return ret; -} - -void rune_destroy_window(struct rune_window *window) { - glfwDestroyWindow(window->window); - glfwTerminate(); -} -- cgit v1.2.3