Commit af31c1cc authored by Philip Trettner's avatar Philip Trettner

Merge branch 'develop' of https://www.graphics.rwth-aachen.de:9000/Glow/glow into develop

parents 50f183e8 b8e35932
......@@ -608,13 +608,13 @@ struct uniform<tg::mat4x3[]> : uniform_base
template <>
struct uniform<tg::color3> : uniform_base
{
uniform(UsedProgram& prog, std::string_view name) : uniform_base(prog, name, 3, GL_FLOAT) {}
uniform(UsedProgram& prog, std::string_view name) : uniform_base(prog, name, 1, GL_FLOAT_VEC3) {}
void operator=(tg::color3 const& v) const { glUniform3f(location, v.r, v.g, v.b); }
};
template <>
struct uniform<tg::color4> : uniform_base
{
uniform(UsedProgram& prog, std::string_view name) : uniform_base(prog, name, 4, GL_FLOAT) {}
uniform(UsedProgram& prog, std::string_view name) : uniform_base(prog, name, 1, GL_FLOAT_VEC4) {}
void operator=(tg::color4 const& v) const { glUniform4f(location, v.r, v.g, v.b, v.a); }
};
template <>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment