X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftechnique.cpp;h=aa27d99cc7857118888fced1d59e1647347c2abf;hb=ae9abd6be3e556d0a202cc5ab05668da715382c9;hp=d963bea46c60f0d386439eac8ba6fb9ef8a967d3;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/technique.cpp b/source/technique.cpp
index d963bea4..aa27d99c 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -1,6 +1,6 @@
 #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"
@@ -15,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
@@ -28,10 +25,15 @@ 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);
+}
+
+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;
 }
 
 
@@ -55,23 +57,20 @@ 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);
 }
 
 
@@ -83,13 +82,13 @@ Technique::InheritLoader::InheritLoader(Technique &t, Collection &c):
 
 void Technique::InheritLoader::texture(const std::string &slot, const string &name)
 {
-	Texture *tex = get_collection().get<Texture>(name);
+	Texture &tex = get_collection().get<Texture>(name);
 	for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
 	{
 		int index = i->second.get_texture_index(slot);
 		if(index<0)
 			continue;
-		i->second.set_texture(index, tex);
+		i->second.set_texture(index, &tex);
 	}
 }