Browse Source

Shaders: vertex VectorShader is implementation independent.

Renamed it to AbstractVectorShader.
pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
b6caae10b0
  1. 0
      src/Shaders/AbstractVectorShader2D.vert
  2. 0
      src/Shaders/AbstractVectorShader3D.vert
  3. 3
      src/Shaders/CMakeLists.txt
  4. 4
      src/Shaders/VectorShader.cpp

0
src/Shaders/VectorShader2D.vert → src/Shaders/AbstractVectorShader2D.vert

0
src/Shaders/VectorShader3D.vert → src/Shaders/AbstractVectorShader3D.vert

3
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

4
src/Shaders/VectorShader.cpp

@ -25,8 +25,8 @@ namespace Magnum { namespace Shaders {
namespace {
template<UnsignedInt> 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<UnsignedInt dimensions> VectorShader<dimensions>::VectorShader(): transformationProjectionMatrixUniform(0), colorUniform(1) {

Loading…
Cancel
Save