From b6caae10b0caa0e0528a4091ff54dafb9a1cded4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 3 Mar 2013 17:40:19 +0100 Subject: [PATCH] Shaders: vertex VectorShader is implementation independent. Renamed it to AbstractVectorShader. --- .../{VectorShader2D.vert => AbstractVectorShader2D.vert} | 0 .../{VectorShader3D.vert => AbstractVectorShader3D.vert} | 0 src/Shaders/CMakeLists.txt | 3 ++- src/Shaders/VectorShader.cpp | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) rename src/Shaders/{VectorShader2D.vert => AbstractVectorShader2D.vert} (100%) rename src/Shaders/{VectorShader3D.vert => AbstractVectorShader3D.vert} (100%) diff --git a/src/Shaders/VectorShader2D.vert b/src/Shaders/AbstractVectorShader2D.vert similarity index 100% rename from src/Shaders/VectorShader2D.vert rename to src/Shaders/AbstractVectorShader2D.vert diff --git a/src/Shaders/VectorShader3D.vert b/src/Shaders/AbstractVectorShader3D.vert similarity index 100% rename from src/Shaders/VectorShader3D.vert rename to src/Shaders/AbstractVectorShader3D.vert diff --git a/src/Shaders/CMakeLists.txt b/src/Shaders/CMakeLists.txt index e2cd2b050..f20f432c6 100644 --- a/src/Shaders/CMakeLists.txt +++ b/src/Shaders/CMakeLists.txt @@ -1,7 +1,8 @@ corrade_add_resource(MagnumShaders_RCS MagnumShaders + AbstractVectorShader2D.vert AbstractVectorShader3D.vert FlatShader2D.vert FlatShader3D.vert FlatShader.frag PhongShader.vert PhongShader.frag - VectorShader2D.vert VectorShader3D.vert VectorShader.frag + VectorShader.frag VertexColorShader2D.vert VertexColorShader3D.vert VertexColorShader.frag compatibility.glsl) set(MagnumShaders_SRCS diff --git a/src/Shaders/VectorShader.cpp b/src/Shaders/VectorShader.cpp index b10975b4d..f3c563b59 100644 --- a/src/Shaders/VectorShader.cpp +++ b/src/Shaders/VectorShader.cpp @@ -25,8 +25,8 @@ namespace Magnum { namespace Shaders { namespace { template constexpr const char* vertexShaderName(); - template<> constexpr const char* vertexShaderName<2>() { return "VectorShader2D.vert"; } - template<> constexpr const char* vertexShaderName<3>() { return "VectorShader3D.vert"; } + template<> constexpr const char* vertexShaderName<2>() { return "AbstractVectorShader2D.vert"; } + template<> constexpr const char* vertexShaderName<3>() { return "AbstractVectorShader3D.vert"; } } template VectorShader::VectorShader(): transformationProjectionMatrixUniform(0), colorUniform(1) {