X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftechnique.cpp;h=74505c8e0b15ce6d457cf08369592c2e8084bfa8;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=78060e01f9b89e80e28f7171fc40cea23188d327;hpb=97015ec7bddd26aa746f5227e4109b7d32438cca;p=libs%2Fgl.git

diff --git a/source/technique.cpp b/source/technique.cpp
index 78060e01..74505c8e 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -27,15 +27,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);
+	PassMap::const_iterator i = passes.find(tag);
 	if(i==passes.end())
 		throw KeyError("Unknown pass");
 	return i->second;
 }
 
 
+Technique::Loader::Loader(Technique &t):
+	DataFile::CollectionObjectLoader<Technique>(t, 0)
+{
+	init();
+}
+
 Technique::Loader::Loader(Technique &t, Collection &c):
 	DataFile::CollectionObjectLoader<Technique>(t, &c)
+{
+	init();
+}
+
+void Technique::Loader::init()
 {
 	add("inherit", &Loader::inherit);
 	add("pass", &Loader::pass);
@@ -43,7 +54,7 @@ Technique::Loader::Loader(Technique &t, Collection &c):
 
 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);
 }
@@ -55,7 +66,10 @@ void Technique::Loader::pass(const string &n)
 		throw KeyError("Duplicate pass name", n);
 
 	RenderPass p;
-	load_sub(p, *coll);
+	if(coll)
+		load_sub(p, get_collection());
+	else
+		load_sub(p);
 	obj.passes.insert(PassMap::value_type(tag, p));
 }
 
@@ -68,7 +82,7 @@ Technique::InheritLoader::InheritLoader(Technique &t, Collection &c):
 
 void Technique::InheritLoader::texture(const 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)
 	{
 		try