diff options
| -rw-r--r-- | main.cpp (renamed from TexturedQuadExample.cpp) | 2 | ||||
| -rw-r--r-- | resources.conf | 4 | ||||
| -rw-r--r-- | shaders/tile-shader.frag (renamed from shaders/TexturedQuadShader.frag) | 0 | ||||
| -rw-r--r-- | shaders/tile-shader.vert (renamed from shaders/TexturedQuadShader.vert) | 0 | ||||
| -rw-r--r-- | tile-shader.cpp (renamed from TexturedQuadShader.cpp) | 6 | ||||
| -rw-r--r-- | tile-shader.hpp (renamed from TexturedQuadShader.h) | 0 |
6 files changed, 6 insertions, 6 deletions
diff --git a/TexturedQuadExample.cpp b/main.cpp index ec166d6e..6ee11db9 100644 --- a/TexturedQuadExample.cpp +++ b/main.cpp @@ -14,7 +14,7 @@ #include <Magnum/Trade/AbstractImporter.h> #include <Magnum/Trade/ImageData.h> -#include "TexturedQuadShader.h" +#include "tile-shader.hpp" namespace Magnum::Examples { diff --git a/resources.conf b/resources.conf index 43cf92f1..cc2e5e9e 100644 --- a/resources.conf +++ b/resources.conf @@ -1,7 +1,7 @@ group=texturedquad-data [file] -filename=shaders/TexturedQuadShader.frag +filename=shaders/tile-shader.frag [file] -filename=shaders/TexturedQuadShader.vert +filename=shaders/tile-shader.vert diff --git a/shaders/TexturedQuadShader.frag b/shaders/tile-shader.frag index 06d647f8..06d647f8 100644 --- a/shaders/TexturedQuadShader.frag +++ b/shaders/tile-shader.frag diff --git a/shaders/TexturedQuadShader.vert b/shaders/tile-shader.vert index 2fd94f8f..2fd94f8f 100644 --- a/shaders/TexturedQuadShader.vert +++ b/shaders/tile-shader.vert diff --git a/TexturedQuadShader.cpp b/tile-shader.cpp index c6d91c4b..dd61f67c 100644 --- a/TexturedQuadShader.cpp +++ b/tile-shader.cpp @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "TexturedQuadShader.h" +#include "tile-shader.hpp" #include <Corrade/Containers/Reference.h> #include <Corrade/Utility/Resource.h> @@ -45,8 +45,8 @@ TexturedQuadShader::TexturedQuadShader() { GL::Shader vert{GL::Version::GL330, GL::Shader::Type::Vertex}; GL::Shader frag{GL::Version::GL330, GL::Shader::Type::Fragment}; - vert.addSource(rs.get("shaders/TexturedQuadShader.vert")); - frag.addSource(rs.get("shaders/TexturedQuadShader.frag")); + vert.addSource(rs.get("shaders/tile-shader.vert")); + frag.addSource(rs.get("shaders/tile-shader.frag")); CORRADE_INTERNAL_ASSERT_OUTPUT(GL::Shader::compile({vert, frag})); diff --git a/TexturedQuadShader.h b/tile-shader.hpp index de7b5c04..de7b5c04 100644 --- a/TexturedQuadShader.h +++ b/tile-shader.hpp |