Browse Source

More unique name for PhongShader resources.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
90fbc956cc
  1. 2
      src/Shaders/CMakeLists.txt
  2. 2
      src/Shaders/PhongShader.cpp

2
src/Shaders/CMakeLists.txt

@ -1,4 +1,4 @@
corrade_add_resource(Shaders shaders PhongShader.frag PhongShader.vert) corrade_add_resource(Shaders MagnumShaders PhongShader.frag PhongShader.vert)
set(Shaders_SRCS set(Shaders_SRCS
PhongShader.cpp PhongShader.cpp
${Shaders} ${Shaders}

2
src/Shaders/PhongShader.cpp

@ -20,7 +20,7 @@
namespace Magnum { namespace Shaders { namespace Magnum { namespace Shaders {
PhongShader::PhongShader() { PhongShader::PhongShader() {
Corrade::Utility::Resource rs("shaders"); Corrade::Utility::Resource rs("MagnumShaders");
attachShader(Shader::fromData(Shader::Type::Vertex, rs.get("PhongShader.vert"))); attachShader(Shader::fromData(Shader::Type::Vertex, rs.get("PhongShader.vert")));
attachShader(Shader::fromData(Shader::Type::Fragment, rs.get("PhongShader.frag"))); attachShader(Shader::fromData(Shader::Type::Fragment, rs.get("PhongShader.frag")));

Loading…
Cancel
Save