void ProgramData::uniform(int index, Uniform *uni)
{
if(index<0)
+ {
+ delete uni;
return;
+ }
map<int, Uniform *>::iterator i=data.find(index);
if(i!=data.end())
pdata(pd),
prog(pr)
{
- add("uniform1", &Loader::uniform1);
- add("uniform2", &Loader::uniform2);
- add("uniform3", &Loader::uniform3);
- add("uniform4", &Loader::uniform4);
+ add("uniform1i", &Loader::uniform1i);
+ add("uniform1f", &Loader::uniform1f);
+ add("uniform2f", &Loader::uniform2f);
+ add("uniform3f", &Loader::uniform3f);
+ add("uniform4f", &Loader::uniform4f);
+}
+
+void ProgramData::Loader::uniform1i(const string &n, int v)
+{
+ pdata.uniform(prog.get_uniform_location(n), v);
}
-void ProgramData::Loader::uniform1(const string &n, float v)
+void ProgramData::Loader::uniform1f(const string &n, float v)
{
pdata.uniform(prog.get_uniform_location(n), v);
}
-void ProgramData::Loader::uniform2(const string &n, float v0, float v1)
+void ProgramData::Loader::uniform2f(const string &n, float v0, float v1)
{
pdata.uniform(prog.get_uniform_location(n), v0, v1);
}
-void ProgramData::Loader::uniform3(const string &n, float v0, float v1, float v2)
+void ProgramData::Loader::uniform3f(const string &n, float v0, float v1, float v2)
{
pdata.uniform(prog.get_uniform_location(n), v0, v1, v2);
}
-void ProgramData::Loader::uniform4(const string &n, float v0, float v1, float v2, float v3)
+void ProgramData::Loader::uniform4f(const string &n, float v0, float v1, float v2, float v3)
{
pdata.uniform(prog.get_uniform_location(n), v0, v1, v2, v3);
}