summaryrefslogtreecommitdiffhomepage
path: root/editor
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-25 16:19:21 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-25 16:19:21 +0200
commita00ac8b5fed9d03cb2b3eafb4cd7d04546e341b1 (patch)
tree18bfeda1abd43a2a0b81f2ad4b909c30b9bfb419 /editor
parent45f2533113a0dfe4cf8a7723a1c76099d0a6d091 (diff)
move some headers around
Diffstat (limited to 'editor')
-rw-r--r--editor/app.cpp4
-rw-r--r--editor/app.hpp2
-rw-r--r--editor/camera.cpp2
-rw-r--r--editor/draw.cpp2
-rw-r--r--editor/events.cpp4
-rw-r--r--editor/imgui.cpp2
-rw-r--r--editor/update.cpp4
7 files changed, 10 insertions, 10 deletions
diff --git a/editor/app.cpp b/editor/app.cpp
index f89aa002..e28f1a72 100644
--- a/editor/app.cpp
+++ b/editor/app.cpp
@@ -1,7 +1,7 @@
#include "app.hpp"
#include "compat/assert.hpp"
-#include "main/floormat-main.hpp"
-#include "main/floormat.hpp"
+#include "floormat/main.hpp"
+#include "floormat/settings.hpp"
#include "src/loader.hpp"
#include "world.hpp"
#include <Corrade/Utility/Arguments.h>
diff --git a/editor/app.hpp b/editor/app.hpp
index 663b4923..1cf118f9 100644
--- a/editor/app.hpp
+++ b/editor/app.hpp
@@ -6,7 +6,7 @@
#include "draw/wireframe-mesh.hpp"
#include "draw/wireframe-quad.hpp"
#include "draw/wireframe-box.hpp"
-#include "main/floormat-app.hpp"
+#include "floormat/app.hpp"
#include <memory>
#include <optional>
diff --git a/editor/camera.cpp b/editor/camera.cpp
index 529f55e9..300f0c61 100644
--- a/editor/camera.cpp
+++ b/editor/camera.cpp
@@ -1,7 +1,7 @@
#include "app.hpp"
#include "src/global-coords.hpp"
#include "shaders/tile-shader.hpp"
-#include "main/floormat-main.hpp"
+#include "floormat/main.hpp"
#include <Magnum/GL/DefaultFramebuffer.h>
namespace floormat {
diff --git a/editor/draw.cpp b/editor/draw.cpp
index 4150bc27..2b047c6b 100644
--- a/editor/draw.cpp
+++ b/editor/draw.cpp
@@ -1,5 +1,5 @@
#include "app.hpp"
-#include "main/floormat-main.hpp"
+#include "floormat/main.hpp"
#include "shaders/tile-shader.hpp"
#include <Magnum/GL/DebugOutput.h>
diff --git a/editor/events.cpp b/editor/events.cpp
index cfa0b904..cd846a96 100644
--- a/editor/events.cpp
+++ b/editor/events.cpp
@@ -1,7 +1,7 @@
#include "app.hpp"
-#include "main/floormat-main.hpp"
-#include "main/floormat-events.hpp"
+#include "floormat/main.hpp"
+#include "floormat/events.hpp"
#include "src/world.hpp"
#include <utility>
diff --git a/editor/imgui.cpp b/editor/imgui.cpp
index b627d34f..7a34f5fc 100644
--- a/editor/imgui.cpp
+++ b/editor/imgui.cpp
@@ -1,5 +1,5 @@
#include "app.hpp"
-#include "main/floormat-main.hpp"
+#include "floormat/main.hpp"
#include <Magnum/GL/Renderer.h>
#include "imgui-raii.hpp"
diff --git a/editor/update.cpp b/editor/update.cpp
index 734ed7b5..c0595c45 100644
--- a/editor/update.cpp
+++ b/editor/update.cpp
@@ -1,7 +1,7 @@
#include "app.hpp"
#include "src/chunk.hpp"
-#include "main/floormat-events.hpp"
-#include "main/floormat-main.hpp"
+#include "floormat/events.hpp"
+#include "floormat/main.hpp"
namespace floormat {