X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftechnique.cpp;h=09799acee8841ac3eefe9d3fe1cfb5fa08801283;hb=5bc9c7214feaf4ea4797fc0d4a906e5e59b75839;hp=928c4ff6ea8cb4f00d5c6d73af7c1c263e339678;hpb=cfd4d36c2b6b6095ada3aef8082e5d409a233a21;p=libs%2Fgl.git

diff --git a/source/technique.cpp b/source/technique.cpp
index 928c4ff6..09799ace 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -28,6 +28,12 @@ const RenderPass &Technique::get_pass(const Tag &tag) const
 	return get_item(passes, tag);
 }
 
+const RenderPass *Technique::find_pass(const Tag &tag) const
+{
+	PassMap::const_iterator i = passes.find(tag);
+	return (i!=passes.end() ? &i->second : 0);
+}
+
 bool Technique::replace_texture(const string &slot, const Texture &tex)
 {
 	bool replaced = false;
@@ -60,6 +66,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)
@@ -102,6 +135,9 @@ void Technique::Loader::pass(const string &n)
 	else
 		load_sub(p);
 
+	if(!p.get_shader_program())
+		throw logic_error("no shader program in pass");
+
 	insert_unique(obj.passes, n, p);
 }
 
@@ -111,6 +147,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 +174,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