diff --git a/src/render/gui/imgui/imconfig.h b/include/render/gui/imgui/imconfig.h similarity index 100% rename from src/render/gui/imgui/imconfig.h rename to include/render/gui/imgui/imconfig.h diff --git a/src/render/gui/imgui/imgui.h b/include/render/gui/imgui/imgui.h similarity index 100% rename from src/render/gui/imgui/imgui.h rename to include/render/gui/imgui/imgui.h diff --git a/src/render/WorldRenderer.cpp b/src/render/WorldRenderer.cpp index 704e13c..63f0c05 100644 --- a/src/render/WorldRenderer.cpp +++ b/src/render/WorldRenderer.cpp @@ -1,7 +1,7 @@ #include "render/WorldRenderer.h" #include "render/loader/WorldLoader.h" #include "render/Renderer.h" -#include "../render/gui/imgui/imgui.h" +#include "render/gui/imgui/imgui.h" #include "window/Display.h" #include "game/client/ClientGame.h" diff --git a/src/render/gui/TowerGui.cpp b/src/render/gui/TowerGui.cpp index 5d79047..64e312c 100644 --- a/src/render/gui/TowerGui.cpp +++ b/src/render/gui/TowerGui.cpp @@ -6,7 +6,7 @@ */ #include "render/gui/TowerGui.h" -#include "imgui/imgui.h" +#include "render/gui/imgui/imgui.h" #include "imgui/imgui_impl_opengl3.h" #include "imgui/imgui_impl_sdl.h" #include diff --git a/src/render/gui/imgui/imgui.cpp b/src/render/gui/imgui/imgui.cpp index e6f206e..f45b654 100644 --- a/src/render/gui/imgui/imgui.cpp +++ b/src/render/gui/imgui/imgui.cpp @@ -776,7 +776,7 @@ CODE #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" +#include "render/gui/imgui/imgui.h" #ifndef IMGUI_DISABLE #ifndef IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/render/gui/imgui/imgui_demo.cpp b/src/render/gui/imgui/imgui_demo.cpp index d4bac48..9c44514 100644 --- a/src/render/gui/imgui/imgui_demo.cpp +++ b/src/render/gui/imgui/imgui_demo.cpp @@ -75,7 +75,7 @@ Index of this file: #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" +#include "render/gui/imgui/imgui.h" #ifndef IMGUI_DISABLE // System includes diff --git a/src/render/gui/imgui/imgui_draw.cpp b/src/render/gui/imgui/imgui_draw.cpp index 5259215..fcd27ea 100644 --- a/src/render/gui/imgui/imgui_draw.cpp +++ b/src/render/gui/imgui/imgui_draw.cpp @@ -26,7 +26,7 @@ Index of this file: #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" +#include "render/gui/imgui/imgui.h" #ifndef IMGUI_DISABLE #ifndef IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/render/gui/imgui/imgui_filebrowser.h b/src/render/gui/imgui/imgui_filebrowser.h index 9cc8d2d..cc348fb 100644 --- a/src/render/gui/imgui/imgui_filebrowser.h +++ b/src/render/gui/imgui/imgui_filebrowser.h @@ -1,7 +1,7 @@ #ifndef IMGUIFILEBROWSER_H #define IMGUIFILEBROWSER_H -#include "imgui.h" +#include "render/gui/imgui/imgui.h" #include #include diff --git a/src/render/gui/imgui/imgui_impl_opengl3.cpp b/src/render/gui/imgui/imgui_impl_opengl3.cpp index 3ad04a4..f663e3a 100755 --- a/src/render/gui/imgui/imgui_impl_opengl3.cpp +++ b/src/render/gui/imgui/imgui_impl_opengl3.cpp @@ -71,7 +71,7 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" +#include "render/gui/imgui/imgui.h" #include "imgui_impl_opengl3.h" #include #if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier diff --git a/src/render/gui/imgui/imgui_impl_opengl3.h b/src/render/gui/imgui/imgui_impl_opengl3.h index 07d3521..eb30421 100755 --- a/src/render/gui/imgui/imgui_impl_opengl3.h +++ b/src/render/gui/imgui/imgui_impl_opengl3.h @@ -22,7 +22,7 @@ // Only override if your GL version doesn't handle this GLSL version. See GLSL version table at the top of imgui_impl_opengl3.cpp. #pragma once -#include "imgui.h" // IMGUI_IMPL_API +#include "render/gui/imgui/imgui.h" // IMGUI_IMPL_API // Backend API IMGUI_IMPL_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version = NULL); diff --git a/src/render/gui/imgui/imgui_impl_sdl.cpp b/src/render/gui/imgui/imgui_impl_sdl.cpp index 0e5c539..e0e6ddb 100644 --- a/src/render/gui/imgui/imgui_impl_sdl.cpp +++ b/src/render/gui/imgui/imgui_impl_sdl.cpp @@ -50,7 +50,7 @@ // 2017-08-25: Inputs: MousePos set to -FLT_MAX,-FLT_MAX when mouse is unavailable/missing (instead of -1,-1). // 2016-10-15: Misc: Added a void* user_data parameter to Clipboard function handlers. -#include "imgui.h" +#include "render/gui/imgui/imgui.h" #include "imgui_impl_sdl.h" // SDL diff --git a/src/render/gui/imgui/imgui_impl_sdl.h b/src/render/gui/imgui/imgui_impl_sdl.h index d2439eb..aacd7f3 100644 --- a/src/render/gui/imgui/imgui_impl_sdl.h +++ b/src/render/gui/imgui/imgui_impl_sdl.h @@ -16,7 +16,7 @@ // Read online: https://github.com/ocornut/imgui/tree/master/docs #pragma once -#include "imgui.h" // IMGUI_IMPL_API +#include "render/gui/imgui/imgui.h" // IMGUI_IMPL_API struct SDL_Window; typedef union SDL_Event SDL_Event; diff --git a/src/render/gui/imgui/imgui_internal.h b/src/render/gui/imgui/imgui_internal.h index fa5dec3..8b75994 100644 --- a/src/render/gui/imgui/imgui_internal.h +++ b/src/render/gui/imgui/imgui_internal.h @@ -44,7 +44,7 @@ Index of this file: //----------------------------------------------------------------------------- #ifndef IMGUI_VERSION -#include "imgui.h" +#include "render/gui/imgui/imgui.h" #endif #include // FILE*, sscanf diff --git a/src/render/gui/imgui/imgui_tables.cpp b/src/render/gui/imgui/imgui_tables.cpp index 56056ae..240ada1 100644 --- a/src/render/gui/imgui/imgui_tables.cpp +++ b/src/render/gui/imgui/imgui_tables.cpp @@ -188,7 +188,7 @@ Index of this file: #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" +#include "render/gui/imgui/imgui.h" #ifndef IMGUI_DISABLE #ifndef IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/render/gui/imgui/imgui_widgets.cpp b/src/render/gui/imgui/imgui_widgets.cpp index 7da069b..8c26ef2 100644 --- a/src/render/gui/imgui/imgui_widgets.cpp +++ b/src/render/gui/imgui/imgui_widgets.cpp @@ -32,7 +32,7 @@ Index of this file: #define _CRT_SECURE_NO_WARNINGS #endif -#include "imgui.h" +#include "render/gui/imgui/imgui.h" #ifndef IMGUI_DISABLE #ifndef IMGUI_DEFINE_MATH_OPERATORS