include refactor

Aeon/Aeon.cpp

@@ -1,9 +1,8 @@
-#include "Aeon/Aeon.hpp"
+#include "Aeon.hpp"
 
-#include <iostream>
+#include <Aeon/Includes.hpp>
-#include <thread>
 
-#include "Aeon/Rendering/ImGui.hpp"
+#include <Aeon/Rendering/ImGui.hpp>
 
 using Core::App;
 using Core::Display;

Aeon/Aeon.hpp

@@ -1,13 +1,12 @@
 #ifndef AEON_AEON_H_
 #define AEON_AEON_H_
 
-#include <string>
+#include <Aeon/Includes.hpp>
-#include <vector>
 
-#include "Aeon/Core/Display.hpp"
+#include <Aeon/Core/Display.hpp>
-#include "Aeon/Core/Events.hpp"
+#include <Aeon/Core/Events.hpp>
-#include "Aeon/Core/GameLayer.hpp"
+#include <Aeon/Core/GameLayer.hpp>
-#include "Aeon/Input/Input.hpp"
+#include <Aeon/Input/Input.hpp>
 
 namespace Core 
 {

Aeon/Assert.hpp

@@ -1,8 +1,7 @@
 #ifndef AEON_ASSERT_H_
 #define AEON_ASSERT_H_
 
-#include <assert.h>
+#include <Aeon/Includes.hpp>
-#include <iostream>
 
 #define AEON_ASSERT(x, m) \
     if (! (x)) { \

Aeon/Core/Display.cpp

@@ -1,10 +1,10 @@
-#include "Aeon/Core/Display.hpp"
+#include "Display.hpp"
 
-#include <iostream>
+#include <Aeon/Includes.hpp>
 
-#include "Aeon/Assert.hpp"
+#include <Aeon/Assert.hpp>
-#include "Aeon/Rendering/RenderMaster.hpp"
+#include <Aeon/Rendering/RenderMaster.hpp>
-#include "Aeon/Rendering/ImGui.hpp"
+#include <Aeon/Rendering/ImGui.hpp>
 
 using Core::Display;
 

Aeon/Core/Display.hpp

@@ -1,17 +1,11 @@
 #ifndef AEON_CORE_DISPLAY_H_
 #define AEON_CORE_DISPLAY_H_
 
-#include <string>
+#include <Aeon/Includes.hpp>
 
-#include <SDL.h>
+#include <Aeon/Rendering/RenderMaster.hpp>
-extern "C" {
+#include <Aeon/Core/EngineConfig.hpp>
-#include <ThirdParty/glad.h>
+#include <Aeon/Core/Events.hpp>
-}
-
-#include "Aeon/Rendering/RenderMaster.hpp"
-
-#include "Aeon/Core/EngineConfig.hpp"
-#include "Aeon/Core/Events.hpp"
 
 using namespace Rendering;
 

Aeon/Core/Events.cpp

@@ -1,6 +1,6 @@
-#include "Aeon/Core/Events.hpp"
+#include "Events.hpp"
 
-#include "Aeon/Assert.hpp"
+#include <Aeon/Assert.hpp>
 
 using Core::GenericEvent;
 using Core::EventListener;

Aeon/Core/Events.hpp

@@ -14,13 +14,10 @@
 	- Events are blocking for now
 */
 
-#include <string>
+#include <Aeon/Includes.hpp>
-#include <tuple>
-#include <vector>
-#include <map>
 
-#include "Aeon/Singleton.hpp"
+#include <Aeon/Singleton.hpp>
-#include "Aeon/Input/InputMap.hpp"
+#include <Aeon/Input/InputMap.hpp>
 
 namespace Core 
 {

Aeon/Core/GameLayer.hpp

@@ -1,7 +1,7 @@
 #ifndef AEON_CORE_GAMELAYER_H_
 #define AEON_CORE_GAMELAYER_H_
 
-#include "Aeon/Core/Events.hpp"
+#include <Aeon/Core/Events.hpp>
 
 namespace Core
 {

Aeon/Entity/Entity.hpp

@@ -1,4 +1,6 @@
 
+#include <Aeon/Includes.hpp>
+
 namespace EC
 {
 

Aeon/Includes.hpp

@@ -0,0 +1,23 @@
+#ifndef AEON_INCLUDES_H_
+#define AEON_INCLUDES_H_
+
+// shut up
+
+#include <SDL.h>
+extern "C" {
+#include <Aeon/ThirdParty/glad.h>
+}
+
+#include <assert.h>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <thread>
+#include <algorithm>
+#include <iterator>
+#include <bitset>
+#include <iomanip>
+#include <tuple>
+#include <map>
+
+#endif

Aeon/Input/Input.cpp

@@ -1,14 +1,10 @@
-#include "Aeon/Input/Input.hpp"
+#include "Input.hpp"
 
-#include <iostream>
+#include <Aeon/Includes.hpp>
-#include <algorithm>
-#include <iterator>
-#include <bitset>
-#include <iomanip>
 
-#include "Aeon/Core/Events.hpp"
+#include <Aeon/Core/Events.hpp>
-#include "Aeon/Input/InputMap.hpp"
+#include <Aeon/Input/InputMap.hpp>
-#include "Aeon/Rendering/ImGui.hpp"
+#include <Aeon/Rendering/ImGui.hpp>
 
 using Input::InputController;
 

Aeon/Input/Input.hpp

@@ -1,12 +1,10 @@
 #ifndef AEON_INPUT_INPUT_H_
 #define AEON_INPUT_INPUT_H_
 
-#include <vector>
+#include <Aeon/Includes.hpp>
 
-#include <SDL.h>
+#include <Aeon/Singleton.hpp>
-
+#include <Aeon/Core/Events.hpp>
-#include "Aeon/Singleton.hpp"
-#include "Aeon/Core/Events.hpp"
 
 namespace Input 
 {

Aeon/Input/InputMap.hpp

@@ -1,7 +1,7 @@
 #ifndef AEON_INPUT_INPUTMAP_H_
 #define AEON_INPUT_INPUTMAP_H_
 
-#include <SDL.h>
+#include <Aeon/Includes.hpp>
 
 namespace Input
 {

Aeon/Maths/Maths.hpp

@@ -3,4 +3,6 @@
 
 #include <Aeon/ThirdParty/glm/glm.hpp>
 
+// Need hashing function for vectors and shit
+
 #endif

Aeon/Rendering/ImGui.hpp

@@ -1,12 +1,7 @@
 #ifndef AEON_RENDERING_IMGUI_H_
 #define AEON_RENDERING_IMGUI_H_
 
-#include <type_traits>
+#include <Aeon/Includes.hpp>
-
-#include <SDL.h>
-extern "C" {
-#include <ThirdParty/glad.h>
-}
 
 #include <Aeon/ThirdParty/ImGui/imgui.h>
 #include <Aeon/ThirdParty/ImGui/imgui_impl_sdl.h>

Aeon/Rendering/RenderMaster.cpp

@@ -1,4 +1,4 @@
-#include "Aeon/Rendering/RenderMaster.hpp"
+#include "RenderMaster.hpp"
 
 using namespace Rendering;
 

Aeon/Rendering/RenderMaster.hpp

@@ -1,7 +1,7 @@
 #ifndef AEON_RENDERING_RENDERMASTER_H_
 #define AEON_RENDERING_RENDERMASTER_H_
 
-#include "Aeon/Singleton.hpp"
+#include <Aeon/Singleton.hpp>
 
 class Renderable;