summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--draw/anim.cpp2
-rw-r--r--draw/floor.cpp2
-rw-r--r--draw/wall.cpp2
-rw-r--r--draw/wireframe.cpp2
-rw-r--r--editor/camera.cpp2
-rw-r--r--editor/draw.cpp2
-rw-r--r--editor/imgui.cpp2
-rw-r--r--main/main-impl.hpp2
-rw-r--r--resources.conf4
-rw-r--r--shaders/shader.cpp (renamed from shaders/tile.cpp)6
-rw-r--r--shaders/shader.frag (renamed from shaders/tile.frag)0
-rw-r--r--shaders/shader.hpp (renamed from shaders/tile.hpp)0
-rw-r--r--shaders/shader.vert (renamed from shaders/tile.vert)0
-rw-r--r--src/anim-atlas.cpp2
-rw-r--r--src/camera-offset.cpp2
-rw-r--r--src/character.cpp2
-rw-r--r--src/chunk-render.cpp2
-rw-r--r--src/chunk-scenery.cpp2
-rw-r--r--src/entity.cpp2
-rw-r--r--src/scenery.cpp2
20 files changed, 20 insertions, 20 deletions
diff --git a/draw/anim.cpp b/draw/anim.cpp
index 8ca03b87..87003f82 100644
--- a/draw/anim.cpp
+++ b/draw/anim.cpp
@@ -1,7 +1,7 @@
#include "anim.hpp"
#include "anim-atlas.hpp"
#include "chunk.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "main/clickable.hpp"
#include "chunk-scenery.hpp"
#include <cstdio>
diff --git a/draw/floor.cpp b/draw/floor.cpp
index 74d4a54d..d030c5a6 100644
--- a/draw/floor.cpp
+++ b/draw/floor.cpp
@@ -1,5 +1,5 @@
#include "floor.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "tile.hpp"
#include "chunk.hpp"
#include "tile-atlas.hpp"
diff --git a/draw/wall.cpp b/draw/wall.cpp
index d1370d45..4562a250 100644
--- a/draw/wall.cpp
+++ b/draw/wall.cpp
@@ -1,6 +1,6 @@
#include "wall.hpp"
#include "tile-atlas.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "chunk.hpp"
#include "tile-image.hpp"
#include "anim-atlas.hpp"
diff --git a/draw/wireframe.cpp b/draw/wireframe.cpp
index 84e086d4..28621b8f 100644
--- a/draw/wireframe.cpp
+++ b/draw/wireframe.cpp
@@ -1,6 +1,6 @@
#include "compat/defs.hpp"
#include "wireframe.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include <Corrade/Containers/Array.h>
#include <Corrade/Containers/ArrayView.h>
#include <Magnum/Math/Range.h>
diff --git a/editor/camera.cpp b/editor/camera.cpp
index 94f36892..fa933fcf 100644
--- a/editor/camera.cpp
+++ b/editor/camera.cpp
@@ -1,6 +1,6 @@
#include "app.hpp"
#include "src/global-coords.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "floormat/main.hpp"
#include <algorithm>
diff --git a/editor/draw.cpp b/editor/draw.cpp
index 6ee32738..4f58e8ec 100644
--- a/editor/draw.cpp
+++ b/editor/draw.cpp
@@ -1,7 +1,7 @@
#include "app.hpp"
#include "floormat/main.hpp"
#include "floormat/settings.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "main/clickable.hpp"
#include "src/anim-atlas.hpp"
#include "draw/anim.hpp"
diff --git a/editor/imgui.cpp b/editor/imgui.cpp
index d144cb34..926ca82b 100644
--- a/editor/imgui.cpp
+++ b/editor/imgui.cpp
@@ -3,7 +3,7 @@
#include "compat/format.hpp"
#include "src/world.hpp"
#include "src/anim-atlas.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "main/clickable.hpp"
#include "imgui-raii.hpp"
diff --git a/main/main-impl.hpp b/main/main-impl.hpp
index 63d18b72..3a3e4c7b 100644
--- a/main/main-impl.hpp
+++ b/main/main-impl.hpp
@@ -5,7 +5,7 @@
#include "draw/floor.hpp"
#include "draw/wall.hpp"
#include "draw/anim.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "main/clickable.hpp"
#include <vector>
#include <Corrade/Containers/String.h>
diff --git a/resources.conf b/resources.conf
index eb67449c..2cde441c 100644
--- a/resources.conf
+++ b/resources.conf
@@ -1,7 +1,7 @@
group=floormat/shaders
[file]
-filename=shaders/tile.frag
+filename=shaders/shader.frag
[file]
-filename=shaders/tile.vert
+filename=shaders/shader.vert
diff --git a/shaders/tile.cpp b/shaders/shader.cpp
index 82b5357a..893563d0 100644
--- a/shaders/tile.cpp
+++ b/shaders/shader.cpp
@@ -1,4 +1,4 @@
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "loader/loader.hpp"
#include "compat/assert.hpp"
#include "local-coords.hpp"
@@ -23,8 +23,8 @@ tile_shader::tile_shader()
GL::Shader vert{version, GL::Shader::Type::Vertex};
GL::Shader frag{version, GL::Shader::Type::Fragment};
- vert.addSource(loader.shader("shaders/tile.vert"));
- frag.addSource(loader.shader("shaders/tile.frag"));
+ vert.addSource(loader.shader("shaders/shader.vert"));
+ frag.addSource(loader.shader("shaders/shader.frag"));
CORRADE_INTERNAL_ASSERT_OUTPUT(vert.compile());
CORRADE_INTERNAL_ASSERT_OUTPUT(frag.compile());
attachShaders({vert, frag});
diff --git a/shaders/tile.frag b/shaders/shader.frag
index 9e05d677..9e05d677 100644
--- a/shaders/tile.frag
+++ b/shaders/shader.frag
diff --git a/shaders/tile.hpp b/shaders/shader.hpp
index 280850b9..280850b9 100644
--- a/shaders/tile.hpp
+++ b/shaders/shader.hpp
diff --git a/shaders/tile.vert b/shaders/shader.vert
index a539ed6b..a539ed6b 100644
--- a/shaders/tile.vert
+++ b/shaders/shader.vert
diff --git a/src/anim-atlas.cpp b/src/anim-atlas.cpp
index 3679bc2a..cdffea28 100644
--- a/src/anim-atlas.cpp
+++ b/src/anim-atlas.cpp
@@ -1,6 +1,6 @@
#include "anim-atlas.hpp"
#include "compat/assert.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "tile-defs.hpp"
#include "compat/exception.hpp"
#include <Corrade/Containers/BitArrayView.h>
diff --git a/src/camera-offset.cpp b/src/camera-offset.cpp
index d662803a..a5213397 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.hpp"
+#include "shaders/shader.hpp"
namespace floormat {
diff --git a/src/character.cpp b/src/character.cpp
index a2d85cb3..ff6d5a83 100644
--- a/src/character.cpp
+++ b/src/character.cpp
@@ -3,7 +3,7 @@
#include "loader/loader.hpp"
#include "src/world.hpp"
#include "src/entity.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "src/RTree-search.hpp"
#include "compat/exception.hpp"
#include <cmath>
diff --git a/src/chunk-render.cpp b/src/chunk-render.cpp
index 8ec10610..87f44e79 100644
--- a/src/chunk-render.cpp
+++ b/src/chunk-render.cpp
@@ -1,6 +1,6 @@
#include "chunk.hpp"
#include "tile-atlas.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include <algorithm>
#include <Corrade/Containers/ArrayViewStl.h>
#include <Magnum/GL/Buffer.h>
diff --git a/src/chunk-scenery.cpp b/src/chunk-scenery.cpp
index c8dad93e..989670e4 100644
--- a/src/chunk-scenery.cpp
+++ b/src/chunk-scenery.cpp
@@ -1,5 +1,5 @@
#include "chunk-scenery.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "entity.hpp"
#include "anim-atlas.hpp"
#include "tile-atlas.hpp"
diff --git a/src/entity.cpp b/src/entity.cpp
index 8774e3b0..93233aae 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -4,7 +4,7 @@
#include "anim-atlas.hpp"
#include "src/RTree-search.hpp"
#include "compat/exception.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include <cmath>
#include <algorithm>
diff --git a/src/scenery.cpp b/src/scenery.cpp
index 778c274b..99d277e5 100644
--- a/src/scenery.cpp
+++ b/src/scenery.cpp
@@ -3,7 +3,7 @@
#include "chunk.hpp"
#include "compat/assert.hpp"
#include "world.hpp"
-#include "shaders/tile.hpp"
+#include "shaders/shader.hpp"
#include "src/rotation.inl"
#include <algorithm>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 13:54:37 +0000