From 7df1e7a0f33ec7717a0da253f4d70734b03cf4fa Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 13 Jan 2024 19:05:11 +0100 Subject: [PATCH] Renamed window.h to app_window.h. --- sfw/game_scene.cpp | 2 +- sfw/render_core/{window.cpp => app_window.cpp} | 2 +- sfw/render_core/{window.h => app_window.h} | 4 ++-- sfw/render_core/application.cpp | 2 +- sfw/render_core/font.cpp | 2 +- sfw/render_core/input.cpp | 2 +- sfw/render_core/texture.cpp | 2 +- sfw/render_immediate/renderer.cpp | 2 +- tools/merger/sfw_full.cpp.inl | 12 ++++++------ tools/merger/sfw_full.h.inl | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) rename sfw/render_core/{window.cpp => app_window.cpp} (99%) rename sfw/render_core/{window.h => app_window.h} (98%) diff --git a/sfw/game_scene.cpp b/sfw/game_scene.cpp index bcc1029..e0a7b61 100644 --- a/sfw/game_scene.cpp +++ b/sfw/game_scene.cpp @@ -7,7 +7,7 @@ #include "render_core/keyboard.h" #include "render_core/mesh_utils.h" #include "render_immediate/renderer.h" -#include "render_core/window.h" +#include "render_core/app_window.h" //#include "render_core/font.h" void GameScene::input_event(const Ref &event) { diff --git a/sfw/render_core/window.cpp b/sfw/render_core/app_window.cpp similarity index 99% rename from sfw/render_core/window.cpp rename to sfw/render_core/app_window.cpp index 6cb3256..30e29fd 100644 --- a/sfw/render_core/window.cpp +++ b/sfw/render_core/app_window.cpp @@ -2,7 +2,7 @@ // fps locking //--STRIP -#include "render_core/window.h" +#include "render_core/app_window.h" #define GLAD_GL_IMPLEMENTATION // glad #include "render_core/3rd_glad.h" diff --git a/sfw/render_core/window.h b/sfw/render_core/app_window.h similarity index 98% rename from sfw/render_core/window.h rename to sfw/render_core/app_window.h index 86f9875..a417f61 100644 --- a/sfw/render_core/window.h +++ b/sfw/render_core/app_window.h @@ -1,6 +1,6 @@ //--STRIP -#ifndef WINDOW_H -#define WINDOW_H +#ifndef APP_WINDOW_H +#define APP_WINDOW_H //--STRIP // ----------------------------------------------------------------------------- diff --git a/sfw/render_core/application.cpp b/sfw/render_core/application.cpp index e4f4bc6..5452763 100644 --- a/sfw/render_core/application.cpp +++ b/sfw/render_core/application.cpp @@ -11,7 +11,7 @@ #include "core/stime.h" #include "render_core/input.h" #include "render_core/input_map.h" -#include "render_core/window.h" +#include "render_core/app_window.h" #include "core/sfw_core.h" #include "object/core_string_names.h" diff --git a/sfw/render_core/font.cpp b/sfw/render_core/font.cpp index a7bc34b..1cae31a 100644 --- a/sfw/render_core/font.cpp +++ b/sfw/render_core/font.cpp @@ -31,7 +31,7 @@ //--STRIP #include "font.h" -#include "window.h" +#include "app_window.h" #include "3rd_glad.h" #define STB_TRUETYPE_IMPLEMENTATION diff --git a/sfw/render_core/input.cpp b/sfw/render_core/input.cpp index c453919..a24b826 100644 --- a/sfw/render_core/input.cpp +++ b/sfw/render_core/input.cpp @@ -12,7 +12,7 @@ #include "render_core/input_map.h" #include "render_core/keyboard.h" #include "render_core/texture.h" -#include "render_core/window.h" +#include "render_core/app_window.h" #include "render_core/3rd_glfw3.h" //--STRIP diff --git a/sfw/render_core/texture.cpp b/sfw/render_core/texture.cpp index 9aa1423..2a786a4 100644 --- a/sfw/render_core/texture.cpp +++ b/sfw/render_core/texture.cpp @@ -4,7 +4,7 @@ #include "core/memory.h" #include -#include "render_core/window.h" +#include "render_core/app_window.h" //--STRIP void Texture::create_from_image(const Ref &img) { diff --git a/sfw/render_immediate/renderer.cpp b/sfw/render_immediate/renderer.cpp index dcc642e..0b81f1f 100644 --- a/sfw/render_immediate/renderer.cpp +++ b/sfw/render_immediate/renderer.cpp @@ -8,7 +8,7 @@ #include "render_core/mesh.h" #include "render_core/texture.h" #include "render_core/texture_material_2d.h" -#include "render_core/window.h" +#include "render_core/app_window.h" #include "render_core/render_state.h" //--STRIP diff --git a/tools/merger/sfw_full.cpp.inl b/tools/merger/sfw_full.cpp.inl index dccb732..7af7800 100644 --- a/tools/merger/sfw_full.cpp.inl +++ b/tools/merger/sfw_full.cpp.inl @@ -469,7 +469,7 @@ //--STRIP //#include "render_core/texture.h" //#include "core/memory.h" -//#include "render_core/window.h" +//#include "render_core/app_window.h" //--STRIP {{FILE:sfw/render_core/texture.cpp}} //--STRIP @@ -478,7 +478,7 @@ //#include "core/stime.h" //#include "render_core/input.h" //#include "render_core/input_map.h" -//#include "render_core/window.h" +//#include "render_core/app_window.h" //#include "core/pool_vector.h" //#include "core/string_name.h" //#include "object/core_string_names.h" @@ -502,7 +502,7 @@ {{FILE:sfw/render_core/mesh.cpp}} //--STRIP //#include "font.h" -//#include "window.h" +//#include "app_window.h" //#include "3rd_glad.h" //#include "3rd_stb_truetype.h" //#include "font_data_bm_mini.inc.h" @@ -574,7 +574,7 @@ //--STRIP {{FILE:sfw/render_core/image.cpp}} //--STRIP -//#include "render_core/window.h" +//#include "render_core/app_window.h" //#include "render_core/3rd_glad.h" //#include "3rd_glfw3.h" //#include "core/error_macros.h" @@ -608,7 +608,7 @@ //#include "render_core/input_map.h" //#include "render_core/keyboard.h" //#include "render_core/texture.h" -//#include "render_core/window.h" +//#include "render_core/app_window.h" //#include "render_core/3rd_glfw3.h" //--STRIP {{FILE:sfw/render_core/input.cpp}} @@ -624,7 +624,7 @@ //#include "render_core/mesh.h" //#include "render_core/texture.h" //#include "render_core/texture_material_2d.h" -//#include "render_core/window.h" +//#include "render_core/app_window.h" //#include "render_core/render_state.h" //--STRIP {{FILE:sfw/render_immediate/renderer.cpp}} diff --git a/tools/merger/sfw_full.h.inl b/tools/merger/sfw_full.h.inl index 40f1fb5..17bcf4d 100644 --- a/tools/merger/sfw_full.h.inl +++ b/tools/merger/sfw_full.h.inl @@ -708,7 +708,7 @@ //#include "core/int_types.h" //#include "core/vector2.h" //--STRIP -{{FILE:sfw/render_core/window.h}} +{{FILE:sfw/render_core/app_window.h}} //--STRIP //#include "core/int_types.h" //#include "object/object.h"