rename shader

12 files changed, 12 insertions, 12 deletions

diff --git a/draw/floor.cpp b/draw/floor.cpp
index 3813cf56..43bd8ec0 100644
--- a/draw/floor.cpp
+++ b/draw/floor.cpp
@@ -1,5 +1,5 @@
 #include "floor.hpp"
-#include "shaders/tile-shader.hpp"
+#include "shaders/tile.hpp"
 #include "tile.hpp"
 #include "chunk.hpp"
 #include "tile-atlas.hpp"
diff --git a/draw/wall.cpp b/draw/wall.cpp
index 51e09add..ff3969fd 100644
--- a/draw/wall.cpp
+++ b/draw/wall.cpp
@@ -1,6 +1,6 @@
 #include "wall.hpp"
 #include "tile-atlas.hpp"
-#include "shaders/tile-shader.hpp"
+#include "shaders/tile.hpp"
 #include "chunk.hpp"
 #include <Magnum/GL/Texture.h>
 #include <Magnum/GL/MeshView.h>
diff --git a/draw/wireframe.cpp b/draw/wireframe.cpp
index 4ff99adb..053fce7b 100644
--- a/draw/wireframe.cpp
+++ b/draw/wireframe.cpp
@@ -1,5 +1,5 @@
 #include "wireframe.hpp"
-#include "shaders/tile-shader.hpp"
+#include "shaders/tile.hpp"
 //#include <Corrade/Containers/ArrayViewStl.h>
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/ArrayView.h>
diff --git a/editor/camera.cpp b/editor/camera.cpp
index 300f0c61..6762f538 100644
--- a/editor/camera.cpp
+++ b/editor/camera.cpp
@@ -1,6 +1,6 @@
 #include "app.hpp"
 #include "src/global-coords.hpp"
-#include "shaders/tile-shader.hpp"
+#include "shaders/tile.hpp"
 #include "floormat/main.hpp"
 #include <Magnum/GL/DefaultFramebuffer.h>
 
diff --git a/editor/draw.cpp b/editor/draw.cpp
index 2b047c6b..52b3af2e 100644
--- a/editor/draw.cpp
+++ b/editor/draw.cpp
@@ -1,6 +1,6 @@
 #include "app.hpp"
 #include "floormat/main.hpp"
-#include "shaders/tile-shader.hpp"
+#include "shaders/tile.hpp"
 #include <Magnum/GL/DebugOutput.h>
 
 namespace floormat {
diff --git a/main/main-impl.hpp b/main/main-impl.hpp
index b5828d6c..964bf1f3 100644
--- a/main/main-impl.hpp
+++ b/main/main-impl.hpp
@@ -4,7 +4,7 @@
 #include "src/world.hpp"
 #include "draw/floor.hpp"
 #include "draw/wall.hpp"
-#include "shaders/tile-shader.hpp"
+#include "shaders/tile.hpp"
 
 #include <Corrade/Containers/String.h>
 
diff --git a/resources.conf b/resources.conf
index adf620c0..eb67449c 100644
--- a/resources.conf
+++ b/resources.conf
@@ -1,7 +1,7 @@
 group=floormat/shaders
 
 [file]
-filename=shaders/tile-shader.frag
+filename=shaders/tile.frag
 
 [file]
-filename=shaders/tile-shader.vert
+filename=shaders/tile.vert
diff --git a/shaders/tile-shader.cpp b/shaders/tile.cpp
index 50444cc8..2a7f50f1 100644
--- a/shaders/tile-shader.cpp
+++ b/shaders/tile.cpp
@@ -1,4 +1,4 @@
-#include "shaders/tile-shader.hpp"
+#include "shaders/tile.hpp"
 #include "loader.hpp"
 #include "compat/assert.hpp"
 #include <Magnum/Math/Vector4.h>
@@ -15,8 +15,8 @@ tile_shader::tile_shader()
     GL::Shader vert{GL::Version::GL460, GL::Shader::Type::Vertex};
     GL::Shader frag{GL::Version::GL460, GL::Shader::Type::Fragment};
 
-    vert.addSource(loader.shader("shaders/tile-shader.vert"));
-    frag.addSource(loader.shader("shaders/tile-shader.frag"));
+    vert.addSource(loader.shader("shaders/tile.vert"));
+    frag.addSource(loader.shader("shaders/tile.frag"));
     CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile());
     CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile());
     attachShaders({vert, frag});
diff --git a/shaders/tile-shader.frag b/shaders/tile.frag
index 5c070ebe..5c070ebe 100644
--- a/shaders/tile-shader.frag
+++ b/shaders/tile.frag
diff --git a/shaders/tile-shader.hpp b/shaders/tile.hpp
index bbe57e52..bbe57e52 100644
--- a/shaders/tile-shader.hpp
+++ b/shaders/tile.hpp
diff --git a/shaders/tile-shader.vert b/shaders/tile.vert
index 8b3f2dba..8b3f2dba 100644
--- a/shaders/tile-shader.vert
+++ b/shaders/tile.vert
diff --git a/src/camera-offset.cpp b/src/camera-offset.cpp
index f58c269c..40bf66dd 100644
--- a/src/camera-offset.cpp
+++ b/src/camera-offset.cpp
@@ -1,6 +1,6 @@
 #include "camera-offset.hpp"
 #include "tile-defs.hpp"
-#include "shaders/tile-shader.hpp"
+#include "shaders/tile.hpp"
 
 namespace floormat {