X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Feffect.cpp;h=05ef5a10f1c2acee31f801053ffe94fc50259d5a;hp=46a0f2362c0700bdcc47873db7283bbff9724558;hb=083a8227715fa32c841fc2b8126e4ab8d2840ba0;hpb=9a63244c1342337915c4610401a24c09fa72cc3d

diff --git a/source/effects/effect.cpp b/source/effects/effect.cpp
index 46a0f236..05ef5a10 100644
--- a/source/effects/effect.cpp
+++ b/source/effects/effect.cpp
@@ -1,5 +1,4 @@
 #include "effect.h"
-#include "sampler.h"
 
 namespace Msp {
 namespace GL {
@@ -7,17 +6,27 @@ namespace GL {
 Effect::Effect(Renderable &r):
 	renderable(r)
 {
-	enabled_passes.insert(Tag());
+	enabled_methods.insert(Tag());
 }
 
-void Effect::enable_for_pass(const Tag &tag)
+void Effect::enable_for_method(Tag tag)
 {
-	enabled_passes.insert(tag);
+	enabled_methods.insert(tag);
 }
 
-void Effect::disable_for_pass(const Tag &tag)
+void Effect::disable_for_method(Tag tag)
 {
-	enabled_passes.erase(tag);
+	enabled_methods.erase(tag);
+}
+
+
+Effect::Template::Loader::Loader(Template &t, Collection &c):
+	CollectionObjectLoader<Template>(t, &c)
+{ }
+
+void Effect::Template::Loader::init_actions()
+{
+	add("content", &Template::content_name);
 }
 
 } // namespace GL