cleanup

src/engine/Engine.cpp

@@ -35,7 +35,7 @@
 #include "util/platform.hpp"
 #include "window/Camera.hpp"
 #include "window/input.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "world/Level.hpp"
 #include "Mainloop.hpp"
 #include "ServerMainloop.hpp"

src/engine/Mainloop.cpp

@@ -4,7 +4,7 @@
 #include "debug/Logger.hpp"
 #include "frontend/screens/MenuScreen.hpp"
 #include "frontend/screens/LevelScreen.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "world/Level.hpp"
 
 static debug::Logger logger("mainloop");

src/frontend/hud.cpp

@@ -41,7 +41,7 @@
 #include "voxels/GlobalChunks.hpp"
 #include "window/Camera.hpp"
 #include "window/input.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "world/Level.hpp"
 #include "world/World.hpp"
 #include "debug/Logger.hpp"

src/frontend/screens/LevelScreen.cpp

@@ -30,7 +30,7 @@
 #include "util/stringutil.hpp"
 #include "voxels/Chunks.hpp"
 #include "window/Camera.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "world/Level.hpp"
 #include "world/World.hpp"
 

src/frontend/screens/MenuScreen.cpp

@@ -7,7 +7,7 @@
 #include "graphics/core/Texture.hpp"
 #include "assets/Assets.hpp"
 #include "maths/UVRegion.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "window/Camera.hpp"
 #include "engine/Engine.hpp"
 

src/graphics/core/DrawContext.cpp

@@ -6,7 +6,7 @@
 
 #include "Batch2D.hpp"
 #include "Framebuffer.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 
 static void set_blend_mode(BlendMode mode) {
     switch (mode) {

src/graphics/render/BlocksPreview.cpp

@@ -6,7 +6,7 @@
 #include "frontend/ContentGfxCache.hpp"
 #include "voxels/Block.hpp"
 #include "window/Camera.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "graphics/core/Atlas.hpp"
 #include "graphics/core/Batch3D.hpp"
 #include "graphics/core/Framebuffer.hpp"

src/graphics/render/Skybox.cpp

@@ -7,7 +7,7 @@
 #include "graphics/core/Cubemap.hpp"
 #include "graphics/core/Framebuffer.hpp"
 #include "graphics/core/DrawContext.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "window/Camera.hpp"
 #include "maths/UVRegion.hpp"
 

src/graphics/render/WorldRenderer.cpp

@@ -28,7 +28,7 @@
 #include "voxels/Chunk.hpp"
 #include "voxels/Chunks.hpp"
 #include "window/Camera.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "world/Level.hpp"
 #include "world/LevelEvents.hpp"
 #include "world/World.hpp"

src/graphics/ui/GUI.cpp

@@ -20,7 +20,7 @@
 #include "graphics/core/Shader.hpp"
 #include "gui_util.hpp"
 #include "window/Camera.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "window/input.hpp"
 
 #include <algorithm>

src/graphics/ui/elements/TextBox.cpp

@@ -15,7 +15,7 @@
 #include "graphics/core/Font.hpp"
 #include "graphics/ui/markdown.hpp"
 #include "util/stringutil.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "devtools/actions.hpp"
 #include "../markdown.hpp"
 

src/logic/PlayerController.cpp

@@ -23,7 +23,7 @@
 #include "voxels/Chunks.hpp"
 #include "voxels/voxel.hpp"
 #include "window/Camera.hpp"
-#include "window/Window.hpp"
+#include "window/display.hpp"
 #include "window/input.hpp"
 #include "world/Level.hpp"
 

src/window/detail/GLFWWindow.cpp

@@ -1,10 +1,12 @@
-#include "window/Window.hpp"
+#include "window/display.hpp"
 
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
 #include <unordered_set>
 
 #include <chrono>
+#include <stack>
+#include <vector>
 
 #include "debug/Logger.hpp"
 #include "graphics/core/ImageData.hpp"

src/window/display.hpp

@@ -2,8 +2,6 @@
 
 #include <glm/glm.hpp>
 #include <memory>
-#include <stack>
-#include <vector>
 
 #include "graphics/core/commons.hpp"
 #include "typedefs.hpp"
@@ -40,7 +38,7 @@ public:
 
     virtual void setFramerate(int framerate) = 0;
 
-    // TODO: move somewhere
+    // todo: move somewhere
     virtual std::unique_ptr<ImageData> takeScreenshot() = 0;
 
     const glm::ivec2& getSize() const {