Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

refactor: moved imgui.h in include folder

Browse Source
This commit is contained in:
Simon Pribylski
2021-11-04 09:47:59 +01:00
parent 54ec3b776a
commit 276f1b2ca3
15 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/render/gui/imgui/imconfig.h → include/render/gui/imgui/imconfig.h
View File

0
src/render/gui/imgui/imgui.h → include/render/gui/imgui/imgui.h
View File

2
src/render/WorldRenderer.cpp
View File

@@ -1,7 +1,7 @@
#include "render/WorldRenderer.h" #include "render/WorldRenderer.h"
#include "render/loader/WorldLoader.h" #include "render/loader/WorldLoader.h"
#include "render/Renderer.h" #include "render/Renderer.h"
#include "../render/gui/imgui/imgui.h" #include "render/gui/imgui/imgui.h"
#include "window/Display.h" #include "window/Display.h"
#include "game/client/ClientGame.h" #include "game/client/ClientGame.h"

2
src/render/gui/TowerGui.cpp
View File

@@ -6,7 +6,7 @@
*/ */
#include "render/gui/TowerGui.h" #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_opengl3.h"
#include "imgui/imgui_impl_sdl.h" #include "imgui/imgui_impl_sdl.h"
#include <SDL2/SDL.h> #include <SDL2/SDL.h>

2
src/render/gui/imgui/imgui.cpp
View File

@@ -776,7 +776,7 @@ CODE
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
#include "imgui.h" #include "render/gui/imgui/imgui.h"
#ifndef IMGUI_DISABLE #ifndef IMGUI_DISABLE
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS

2
src/render/gui/imgui/imgui_demo.cpp
View File

@@ -75,7 +75,7 @@ Index of this file:
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
#include "imgui.h" #include "render/gui/imgui/imgui.h"
#ifndef IMGUI_DISABLE #ifndef IMGUI_DISABLE
// System includes // System includes

2
src/render/gui/imgui/imgui_draw.cpp
View File

@@ -26,7 +26,7 @@ Index of this file:
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
#include "imgui.h" #include "render/gui/imgui/imgui.h"
#ifndef IMGUI_DISABLE #ifndef IMGUI_DISABLE
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS

2
src/render/gui/imgui/imgui_filebrowser.h
View File

@@ -1,7 +1,7 @@
#ifndef IMGUIFILEBROWSER_H #ifndef IMGUIFILEBROWSER_H
#define IMGUIFILEBROWSER_H #define IMGUIFILEBROWSER_H
#include "imgui.h" #include "render/gui/imgui/imgui.h"
#include <string> #include <string>
#include <vector> #include <vector>

2
src/render/gui/imgui/imgui_impl_opengl3.cpp
View File

@@ -71,7 +71,7 @@
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
#include "imgui.h" #include "render/gui/imgui/imgui.h"
#include "imgui_impl_opengl3.h" #include "imgui_impl_opengl3.h"
#include <stdio.h> #include <stdio.h>
#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier #if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier

2
src/render/gui/imgui/imgui_impl_opengl3.h
View File

@@ -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. // 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 #pragma once
#include "imgui.h" // IMGUI_IMPL_API #include "render/gui/imgui/imgui.h" // IMGUI_IMPL_API
// Backend API // Backend API
IMGUI_IMPL_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version = NULL); IMGUI_IMPL_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version = NULL);

2
src/render/gui/imgui/imgui_impl_sdl.cpp
View File

@@ -50,7 +50,7 @@
// 2017-08-25: Inputs: MousePos set to -FLT_MAX,-FLT_MAX when mouse is unavailable/missing (instead of -1,-1). // 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. // 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" #include "imgui_impl_sdl.h"
// SDL // SDL

2
src/render/gui/imgui/imgui_impl_sdl.h
View File

@@ -16,7 +16,7 @@
// Read online: https://github.com/ocornut/imgui/tree/master/docs // Read online: https://github.com/ocornut/imgui/tree/master/docs
#pragma once #pragma once
#include "imgui.h" // IMGUI_IMPL_API #include "render/gui/imgui/imgui.h" // IMGUI_IMPL_API
struct SDL_Window; struct SDL_Window;
typedef union SDL_Event SDL_Event; typedef union SDL_Event SDL_Event;

2
src/render/gui/imgui/imgui_internal.h
View File

@@ -44,7 +44,7 @@ Index of this file:
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef IMGUI_VERSION #ifndef IMGUI_VERSION
#include "imgui.h" #include "render/gui/imgui/imgui.h"
#endif #endif
#include <stdio.h> // FILE*, sscanf #include <stdio.h> // FILE*, sscanf

2
src/render/gui/imgui/imgui_tables.cpp
View File

@@ -188,7 +188,7 @@ Index of this file:
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
#include "imgui.h" #include "render/gui/imgui/imgui.h"
#ifndef IMGUI_DISABLE #ifndef IMGUI_DISABLE
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS

2
src/render/gui/imgui/imgui_widgets.cpp
View File

@@ -32,7 +32,7 @@ Index of this file:
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
#include "imgui.h" #include "render/gui/imgui/imgui.h"
#ifndef IMGUI_DISABLE #ifndef IMGUI_DISABLE
#ifndef IMGUI_DEFINE_MATH_OPERATORS #ifndef IMGUI_DEFINE_MATH_OPERATORS