X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftechnique.cpp;h=1e8f8fccea433d4e63625e453bab7992beaa1439;hp=49b487982993d259f3807c8b3820f9991cf85998;hb=6a045019fbd68738b77849629e6dfd3dfd9a4d93;hpb=09b835f0ff0ee594fbb555224a85b28398e14116

diff --git a/source/technique.cpp b/source/technique.cpp
index 49b48798..1e8f8fcc 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -1,13 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2008-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/core/refptr.h>
 #include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "material.h"
 #include "program.h"
 #include "programdata.h"
@@ -22,10 +15,7 @@ namespace GL {
 
 RenderPass &Technique::add_pass(const GL::Tag &tag)
 {
-	if(passes.count(tag))
-		throw KeyError("Duplicate pass");
-
-	return passes[tag];
+	return insert_unique(passes, tag, RenderPass())->second;
 }
 
 bool Technique::has_pass(const GL::Tag &tag) const
@@ -35,10 +25,26 @@ bool Technique::has_pass(const GL::Tag &tag) const
 
 const RenderPass &Technique::get_pass(const GL::Tag &tag) const
 {
-	PassMap::const_iterator i = passes.find(tag);
-	if(i==passes.end())
-		throw KeyError("Unknown pass");
-	return i->second;
+	return get_item(passes, tag);
+}
+
+void Technique::replace_texture(const string &slot, const Texture &tex)
+{
+	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);
+	}
+}
+
+bool Technique::has_shaders() const
+{
+	for(PassMap::const_iterator i=passes.begin(); i!=passes.end(); ++i)
+		if(i->second.get_shader_program())
+			return true;
+	return false;
 }
 
 
@@ -62,42 +68,47 @@ void Technique::Loader::init()
 
 void Technique::Loader::inherit(const string &n)
 {
-	obj.passes = get_collection().get<Technique>(n)->get_passes();
+	obj.passes = get_collection().get<Technique>(n).get_passes();
 	InheritLoader ldr(obj, get_collection());
 	load_sub_with(ldr);
 }
 
 void Technique::Loader::pass(const string &n)
 {
-	Tag tag(n);
-	if(obj.passes.count(tag))
-		throw KeyError("Duplicate pass name", n);
-
 	RenderPass p;
 	if(coll)
 		load_sub(p, get_collection());
 	else
 		load_sub(p);
-	obj.passes.insert(PassMap::value_type(tag, p));
+
+	insert_unique(obj.passes, n, p);
 }
 
 
 Technique::InheritLoader::InheritLoader(Technique &t, Collection &c):
 	DataFile::CollectionObjectLoader<Technique>(t, &c)
 {
+	add("material", &InheritLoader::material);
 	add("texture", &InheritLoader::texture);
 }
 
-void Technique::InheritLoader::texture(const std::string &slot, const string &name)
+void Technique::InheritLoader::material(const string &pass_tag, const string &name)
 {
-	Texture *tex = get_collection().get<Texture>(name);
-	for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
+	RenderPass &pass = get_item(obj.passes, pass_tag);
+	const Material &mat = get_collection().get<Material>(name);
+	if(const Material *base_mat = pass.get_material())
 	{
-		int index = i->second.get_texture_index(slot);
-		if(index<0)
-			continue;
-		i->second.set_texture(index, tex);
+		for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
+			if(i->second.get_material()==base_mat)
+				i->second.set_material(&mat);
 	}
+	else
+		pass.set_material(&mat);
+}
+
+void Technique::InheritLoader::texture(const string &slot, const string &name)
+{
+	obj.replace_texture(slot, get_collection().get<Texture>(name));
 }
 
 } // namespace GL