diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-23 20:49:14 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-23 20:49:14 +0200 |
| commit | b6a067678ab9e225647b256595d54dde2ce6f2f5 (patch) | |
| tree | 5511af38d35cea0cfaf59fffe9b513d46820f0b2 /draw | |
| parent | 4341fb36784a9da7b519d81d78e8df983816d791 (diff) | |
a
Diffstat (limited to 'draw')
| -rw-r--r-- | draw/wireframe-box.hpp | 2 | ||||
| -rw-r--r-- | draw/wireframe-mesh.cpp | 7 | ||||
| -rw-r--r-- | draw/wireframe-mesh.hpp | 4 | ||||
| -rw-r--r-- | draw/wireframe-quad.hpp | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/draw/wireframe-box.hpp b/draw/wireframe-box.hpp index 998ad92c..b187dc83 100644 --- a/draw/wireframe-box.hpp +++ b/draw/wireframe-box.hpp @@ -1,4 +1,6 @@ #pragma once +#include <array> +#include <Corrade/Containers/ArrayViewStl.h> #include <Magnum/Math/Vector3.h> #include <Magnum/GL/Mesh.h> diff --git a/draw/wireframe-mesh.cpp b/draw/wireframe-mesh.cpp index 3fc53c6c..1304f141 100644 --- a/draw/wireframe-mesh.cpp +++ b/draw/wireframe-mesh.cpp @@ -1,12 +1,13 @@ #include "wireframe-mesh.hpp" #include "shaders/tile-shader.hpp" -#include <Corrade/Containers/ArrayViewStl.h> +//#include <Corrade/Containers/ArrayViewStl.h> #include <Corrade/Containers/Array.h> +#include <Corrade/Containers/ArrayView.h> #include <Magnum/GL/TextureFormat.h> -#include <Magnum/ImageFlags.h> +//#include <Magnum/ImageFlags.h> #include <Magnum/ImageView.h> #include <Magnum/PixelFormat.h> -#include <Magnum/PixelStorage.h> +//#include <Magnum/PixelStorage.h> #include <Magnum/Trade/ImageData.h> namespace floormat::wireframe diff --git a/draw/wireframe-mesh.hpp b/draw/wireframe-mesh.hpp index 9a8e90c7..f03659d3 100644 --- a/draw/wireframe-mesh.hpp +++ b/draw/wireframe-mesh.hpp @@ -1,10 +1,6 @@ #pragma once #include "tile-defs.hpp" -#include <array> -#include <utility> -#include <Corrade/Containers/ArrayView.h> -#include <Magnum/Math/Vector2.h> #include <Magnum/GL/Buffer.h> #include <Magnum/GL/Mesh.h> #include "Magnum/GL/Texture.h" diff --git a/draw/wireframe-quad.hpp b/draw/wireframe-quad.hpp index c2679781..ccefa000 100644 --- a/draw/wireframe-quad.hpp +++ b/draw/wireframe-quad.hpp @@ -1,8 +1,10 @@ #pragma once +#include <array> #include <Magnum/Math/Vector2.h> #include <Magnum/Math/Vector3.h> #include <Magnum/GL/Mesh.h> +#include <Corrade/Containers/ArrayViewStl.h> namespace floormat::wireframe { |