X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftechnique.cpp;h=d6ec7115f6e703a5b215803952a27716f934e468;hp=1e8f8fccea433d4e63625e453bab7992beaa1439;hb=1efd559eb32adf48200941402ccefc6b5422aa4c;hpb=88a5d6707be2f62e81d46fb6d4781c75742749b8

diff --git a/source/technique.cpp b/source/technique.cpp
index 1e8f8fcc..d6ec7115 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -13,30 +13,78 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-RenderPass &Technique::add_pass(const GL::Tag &tag)
+RenderPass &Technique::add_pass(const Tag &tag)
 {
 	return insert_unique(passes, tag, RenderPass())->second;
 }
 
-bool Technique::has_pass(const GL::Tag &tag) const
+bool Technique::has_pass(const Tag &tag) const
 {
 	return passes.count(tag);
 }
 
-const RenderPass &Technique::get_pass(const GL::Tag &tag) const
+const RenderPass &Technique::get_pass(const Tag &tag) const
 {
 	return get_item(passes, tag);
 }
 
-void Technique::replace_texture(const string &slot, const Texture &tex)
+bool Technique::replace_texture(const string &slot, const Texture &tex)
 {
+	bool replaced = false;
 	for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
 	{
 		int index = i->second.get_texture_index(slot);
-		if(index<0)
-			continue;
-		i->second.set_texture(index, &tex);
+		if(index>=0)
+		{
+			i->second.set_texture(index, &tex);
+			replaced = true;
+		}
 	}
+
+	return replaced;
+}
+
+bool Technique::replace_material(const string &slot, const Material &mat)
+{
+	bool replaced = false;
+	for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
+	{
+		const string &pass_slot = i->second.get_material_slot_name();
+		if(!pass_slot.empty() && pass_slot==slot)
+		{
+			i->second.set_material(&mat);
+			replaced = true;
+		}
+	}
+
+	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
@@ -90,12 +138,17 @@ 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 &pass_tag, const string &name)
+void Technique::InheritLoader::material(const string &slot, const string &name)
 {
-	RenderPass &pass = get_item(obj.passes, pass_tag);
 	const Material &mat = get_collection().get<Material>(name);
+	if(obj.replace_material(slot, mat))
+		return;
+
+	// For backwards compatibility
+	RenderPass &pass = get_item(obj.passes, slot);
 	if(const Material *base_mat = pass.get_material())
 	{
 		for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
@@ -108,7 +161,15 @@ void Technique::InheritLoader::material(const string &pass_tag, const string &na
 
 void Technique::InheritLoader::texture(const string &slot, const string &name)
 {
-	obj.replace_texture(slot, get_collection().get<Texture>(name));
+	if(!obj.replace_texture(slot, get_collection().get<Texture>(name)))
+		throw key_error(slot);
+}
+
+void Technique::InheritLoader::uniforms()
+{
+	ProgramData shdata;
+	load_sub(shdata);
+	obj.replace_uniforms(shdata);
 }
 
 } // namespace GL