summaryrefslogtreecommitdiffhomepage
path: root/editor
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-11-07 07:01:32 +0100
committerStanislaw Halik <sthalik@misaki.pl>2022-11-07 07:01:32 +0100
commitdbb6d49a5632a26885e6e388128d68fe1932a4ea (patch)
tree28ccf74c6fe06c1e79a98fc1d534c9086387b849 /editor
parent2a0f6513132982c17644fc0917ad1f632b2d5b81 (diff)
add missing includes
Diffstat (limited to 'editor')
-rw-r--r--editor/app.cpp1
-rw-r--r--editor/camera.cpp1
-rw-r--r--editor/editor-enums.hpp1
-rw-r--r--editor/editor.cpp2
-rw-r--r--editor/tile-editor.hpp11
5 files changed, 13 insertions, 3 deletions
diff --git a/editor/app.cpp b/editor/app.cpp
index 3e2c2be3..77f77f83 100644
--- a/editor/app.cpp
+++ b/editor/app.cpp
@@ -4,6 +4,7 @@
#include "floormat/settings.hpp"
#include "src/loader.hpp"
#include "world.hpp"
+#include <algorithm>
#include <Corrade/Utility/Arguments.h>
namespace floormat {
diff --git a/editor/camera.cpp b/editor/camera.cpp
index e10a995c..bb69c626 100644
--- a/editor/camera.cpp
+++ b/editor/camera.cpp
@@ -2,6 +2,7 @@
#include "src/global-coords.hpp"
#include "shaders/tile.hpp"
#include "floormat/main.hpp"
+#include <algorithm>
namespace floormat {
diff --git a/editor/editor-enums.hpp b/editor/editor-enums.hpp
index 604956cb..e7e83faf 100644
--- a/editor/editor-enums.hpp
+++ b/editor/editor-enums.hpp
@@ -1,4 +1,5 @@
#pragma once
+#include "compat/integer-types.hpp"
namespace floormat {
diff --git a/editor/editor.cpp b/editor/editor.cpp
index 99948aca..9676a22d 100644
--- a/editor/editor.cpp
+++ b/editor/editor.cpp
@@ -6,8 +6,8 @@
#include <Corrade/Containers/StringView.h>
-#include <string_view>
#include <vector>
+#include <algorithm>
#include <filesystem>
namespace floormat {
diff --git a/editor/tile-editor.hpp b/editor/tile-editor.hpp
index 0458ee79..9593139c 100644
--- a/editor/tile-editor.hpp
+++ b/editor/tile-editor.hpp
@@ -3,8 +3,10 @@
#include "editor-enums.hpp"
#include "src/tile-image.hpp"
#include "global-coords.hpp"
-#include <tuple>
#include <memory>
+#include <vector>
+#include <map>
+#include <Corrade/Containers/String.h>
namespace floormat {
@@ -17,10 +19,15 @@ private:
sel_none, sel_tile, sel_perm,
};
+ struct tuple final {
+ std::shared_ptr<tile_atlas> atlas;
+ std::vector<decltype(tile_image_proto::variant)> variant;
+ };
+
String _name;
std::map<std::string, std::shared_ptr<tile_atlas>> _atlases;
tile_image_proto _selected_tile;
- std::tuple<std::shared_ptr<tile_atlas>, std::vector<decltype(tile_image_proto::variant)>> _permutation;
+ tuple _permutation;
selection_mode _selection_mode = sel_none;
editor_mode _mode;
editor_wall_rotation _rotation = editor_wall_rotation::N;