From 4ef122afaedc22b4e79c1d3cae3e97e74b11208a Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 6 Apr 2024 17:34:40 +0200
Subject: c

---
 editor/draw.cpp            | 2 +-
 editor/tests/path-test.cpp | 1 -
 shaders/shader.cpp         | 1 +
 shaders/shader.hpp         | 3 +--
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/editor/draw.cpp b/editor/draw.cpp
index f0d642bc..645708e4 100644
--- a/editor/draw.cpp
+++ b/editor/draw.cpp
@@ -1,8 +1,8 @@
 #include "app.hpp"
 #include "src/tile-constants.hpp"
 #include "floormat/main.hpp"
-#include "floormat/settings.hpp"
 #include "shaders/shader.hpp"
+#include "shaders/texture-unit-cache.hpp"
 #include "main/clickable.hpp"
 #include "editor.hpp"
 #include "ground-editor.hpp"
diff --git a/editor/tests/path-test.cpp b/editor/tests/path-test.cpp
index ac95bcd9..b5161e9f 100644
--- a/editor/tests/path-test.cpp
+++ b/editor/tests/path-test.cpp
@@ -41,7 +41,6 @@ struct path_test final : base_test
     bool has_result : 1 = false, has_pending : 1 = false;
 };
 
-
 bool path_test::handle_key(app& a, const key_event& e, bool is_down)
 {
     (void)a; (void)e; (void)is_down;
diff --git a/shaders/shader.cpp b/shaders/shader.cpp
index 8ceb5c44..47a000a2 100644
--- a/shaders/shader.cpp
+++ b/shaders/shader.cpp
@@ -2,6 +2,7 @@
 #include "loader/loader.hpp"
 #include "compat/assert.hpp"
 #include "src/local-coords.hpp"
+#include "texture-unit-cache.hpp"
 #include <cmath>
 #include <Corrade/Containers/Iterable.h>
 #include <Magnum/Math/Vector4.h>
diff --git a/shaders/shader.hpp b/shaders/shader.hpp
index b431cba0..a7716229 100644
--- a/shaders/shader.hpp
+++ b/shaders/shader.hpp
@@ -1,7 +1,5 @@
 #pragma once
 #include "src/tile-defs.hpp"
-#include "shaders/texture-unit-cache.hpp"
-#include <utility>
 #include <Magnum/GL/AbstractShaderProgram.h>
 #include <Magnum/Math/Vector2.h>
 #include <Magnum/Math/Vector3.h>
@@ -11,6 +9,7 @@ namespace Magnum::GL { class AbstractTexture; }
 
 namespace floormat {
 
+struct texture_unit_cache;
 struct local_coords;
 
 struct tile_shader final : private GL::AbstractShaderProgram
-- 
cgit v1.2.3