Fix the keyword of the uniform scaling statement in Transform loader

[libs/gl.git] / source / technique.cpp

diff --git a/source/technique.cpp b/source/technique.cpp
index 928c4ff6ea8cb4f00d5c6d73af7c1c263e339678..d6ec7115f6e703a5b215803952a27716f934e468 100644 (file)
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -60,6 +60,33 @@ bool Technique::replace_material(const string &slot, const Material &mat)
        return replaced;
 }
 
+bool Technique::replace_uniforms(const ProgramData &shdata)
+{
+       bool replaced = false;
+       const vector<string> &uniform_names = shdata.get_uniform_names();
+       for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
+       {
+               RefPtr<ProgramData> new_shdata;
+               for(vector<string>::const_iterator j=uniform_names.begin(); j!=uniform_names.end(); ++j)
+               {
+                       const string &name = i->second.get_slotted_uniform_name(*j);
+                       if(name.empty())
+                               continue;
+
+                       if(!new_shdata)
+                               new_shdata = new ProgramData(*i->second.get_shader_data());
+
+                       new_shdata->uniform(name, shdata.get_uniform(*j));
+                       replaced = true;
+               }
+
+               if(new_shdata)
+                       i->second.set_shader_program(i->second.get_shader_program(), new_shdata.get());
+       }
+
+       return replaced;
+}
+
 bool Technique::has_shaders() const
 {
        for(PassMap::const_iterator i=passes.begin(); i!=passes.end(); ++i)
@@ -111,6 +138,7 @@ Technique::InheritLoader::InheritLoader(Technique &t, Collection &c):
 {
        add("material", &InheritLoader::material);
        add("texture", &InheritLoader::texture);
+       add("uniforms", &InheritLoader::uniforms);
 }
 
 void Technique::InheritLoader::material(const string &slot, const string &name)
@@ -137,5 +165,12 @@ void Technique::InheritLoader::texture(const string &slot, const string &name)
                throw key_error(slot);
 }
 
+void Technique::InheritLoader::uniforms()
+{
+       ProgramData shdata;
+       load_sub(shdata);
+       obj.replace_uniforms(shdata);
+}
+
 } // namespace GL
 } // namespace Msp