diff options
Diffstat (limited to 'shaders')
-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 |
4 files changed, 3 insertions, 3 deletions
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 |