summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-25 16:37:58 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-25 16:37:58 +0200
commitf1df7c20129a1f1cc47c47e5731efd10f8e49aeb (patch)
tree0241e953981404e50a5c1fcd6d49f583ecf5995e
parenta00ac8b5fed9d03cb2b3eafb4cd7d04546e341b1 (diff)
rename in draw/
-rw-r--r--draw/box.cpp (renamed from draw/wireframe-box.cpp)2
-rw-r--r--draw/box.hpp (renamed from draw/wireframe-box.hpp)0
-rw-r--r--draw/floor.cpp (renamed from draw/floor-mesh.cpp)2
-rw-r--r--draw/floor.hpp (renamed from draw/floor-mesh.hpp)0
-rw-r--r--draw/quad.cpp (renamed from draw/wireframe-quad.cpp)2
-rw-r--r--draw/quad.hpp (renamed from draw/wireframe-quad.hpp)0
-rw-r--r--draw/wall.cpp (renamed from draw/wall-mesh.cpp)2
-rw-r--r--draw/wall.hpp (renamed from draw/wall-mesh.hpp)0
-rw-r--r--draw/wireframe.cpp (renamed from draw/wireframe-mesh.cpp)2
-rw-r--r--draw/wireframe.hpp (renamed from draw/wireframe-mesh.hpp)0
-rw-r--r--editor/app.hpp6
-rw-r--r--main/main-impl.hpp4
12 files changed, 10 insertions, 10 deletions
diff --git a/draw/wireframe-box.cpp b/draw/box.cpp
index 49606bd8..18d6f861 100644
--- a/draw/wireframe-box.cpp
+++ b/draw/box.cpp
@@ -1,4 +1,4 @@
-#include "wireframe-box.hpp"
+#include "box.hpp"
#include <array>
#include <Magnum/Math/Vector3.h>
#include <Magnum/GL/Renderer.h>
diff --git a/draw/wireframe-box.hpp b/draw/box.hpp
index b187dc83..b187dc83 100644
--- a/draw/wireframe-box.hpp
+++ b/draw/box.hpp
diff --git a/draw/floor-mesh.cpp b/draw/floor.cpp
index d7e45e71..3813cf56 100644
--- a/draw/floor-mesh.cpp
+++ b/draw/floor.cpp
@@ -1,4 +1,4 @@
-#include "floor-mesh.hpp"
+#include "floor.hpp"
#include "shaders/tile-shader.hpp"
#include "tile.hpp"
#include "chunk.hpp"
diff --git a/draw/floor-mesh.hpp b/draw/floor.hpp
index f81a7593..f81a7593 100644
--- a/draw/floor-mesh.hpp
+++ b/draw/floor.hpp
diff --git a/draw/wireframe-quad.cpp b/draw/quad.cpp
index 454189f9..dee53a75 100644
--- a/draw/wireframe-quad.cpp
+++ b/draw/quad.cpp
@@ -1,4 +1,4 @@
-#include "wireframe-quad.hpp"
+#include "quad.hpp"
#include <array>
#include <Magnum/GL/Renderer.h>
diff --git a/draw/wireframe-quad.hpp b/draw/quad.hpp
index 050eeb78..050eeb78 100644
--- a/draw/wireframe-quad.hpp
+++ b/draw/quad.hpp
diff --git a/draw/wall-mesh.cpp b/draw/wall.cpp
index dfbb739e..51e09add 100644
--- a/draw/wall-mesh.cpp
+++ b/draw/wall.cpp
@@ -1,4 +1,4 @@
-#include "wall-mesh.hpp"
+#include "wall.hpp"
#include "tile-atlas.hpp"
#include "shaders/tile-shader.hpp"
#include "chunk.hpp"
diff --git a/draw/wall-mesh.hpp b/draw/wall.hpp
index b021ef95..b021ef95 100644
--- a/draw/wall-mesh.hpp
+++ b/draw/wall.hpp
diff --git a/draw/wireframe-mesh.cpp b/draw/wireframe.cpp
index 55af19a1..4ff99adb 100644
--- a/draw/wireframe-mesh.cpp
+++ b/draw/wireframe.cpp
@@ -1,4 +1,4 @@
-#include "wireframe-mesh.hpp"
+#include "wireframe.hpp"
#include "shaders/tile-shader.hpp"
//#include <Corrade/Containers/ArrayViewStl.h>
#include <Corrade/Containers/Array.h>
diff --git a/draw/wireframe-mesh.hpp b/draw/wireframe.hpp
index 9d736419..9d736419 100644
--- a/draw/wireframe-mesh.hpp
+++ b/draw/wireframe.hpp
diff --git a/editor/app.hpp b/editor/app.hpp
index 1cf118f9..5b9727fe 100644
--- a/editor/app.hpp
+++ b/editor/app.hpp
@@ -3,9 +3,9 @@
#include "compat/enum-bitset.hpp"
#include "editor.hpp"
#include "src/global-coords.hpp"
-#include "draw/wireframe-mesh.hpp"
-#include "draw/wireframe-quad.hpp"
-#include "draw/wireframe-box.hpp"
+#include "draw/wireframe.hpp"
+#include "draw/quad.hpp"
+#include "draw/box.hpp"
#include "floormat/app.hpp"
#include <memory>
diff --git a/main/main-impl.hpp b/main/main-impl.hpp
index 39a877fe..b5828d6c 100644
--- a/main/main-impl.hpp
+++ b/main/main-impl.hpp
@@ -2,8 +2,8 @@
#include "floormat/main.hpp"
#include "floormat/settings.hpp"
#include "src/world.hpp"
-#include "draw/floor-mesh.hpp"
-#include "draw/wall-mesh.hpp"
+#include "draw/floor.hpp"
+#include "draw/wall.hpp"
#include "shaders/tile-shader.hpp"
#include <Corrade/Containers/String.h>