uniform(name, new UniformMatrix3x3f(v));
}
-void ProgramData::uniform_matrix4(const string &name, const float *v)
-{
- uniform(name, new UniformMatrix4x4f(v));
-}
-
-void ProgramData::uniform_matrix4(const string &name, const Matrix &m)
+void ProgramData::uniform(const string &name, const Matrix &m)
{
float v[16];
copy(m.data(), m.data()+16, v);
uniform_matrix4(name, v);
}
+void ProgramData::uniform_matrix4(const string &name, const float *v)
+{
+ uniform(name, new UniformMatrix4x4f(v));
+}
+
void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
{
uniform(name, new UniformArray<Uniform1f>(n, v));
void uniform4(const std::string &, const float *);
void uniform_matrix2(const std::string &, const float *);
void uniform_matrix3(const std::string &, const float *);
+ void uniform(const std::string &, const Matrix &);
void uniform_matrix4(const std::string &, const float *);
- void uniform_matrix4(const std::string &, const Matrix &);
void uniform1_array(const std::string &, unsigned, const float *);
void uniform2_array(const std::string &, unsigned, const float *);
void uniform3_array(const std::string &, unsigned, const float *);