X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Feffects%2Feffect.cpp;h=05ef5a10f1c2acee31f801053ffe94fc50259d5a;hb=083a8227715fa32c841fc2b8126e4ab8d2840ba0;hp=ad789af06019785deb0d1a68f16236b3c37157af;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/effects/effect.cpp b/source/effects/effect.cpp
index ad789af0..05ef5a10 100644
--- a/source/effects/effect.cpp
+++ b/source/effects/effect.cpp
@@ -1,38 +1,32 @@
 #include "effect.h"
-#include "sampler.h"
 
 namespace Msp {
 namespace GL {
 
-WeakPtr<Sampler> Effect::linear_sampler;
-
 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);
 }
 
-RefPtr<Sampler> Effect::get_linear_sampler()
+
+Effect::Template::Loader::Loader(Template &t, Collection &c):
+	CollectionObjectLoader<Template>(t, &c)
+{ }
+
+void Effect::Template::Loader::init_actions()
 {
-	RefPtr<Sampler> sampler = linear_sampler;
-	if(!sampler)
-	{
-		sampler = new Sampler;
-		sampler->set_filter(LINEAR);
-		sampler->set_wrap(CLAMP_TO_EDGE);
-		linear_sampler = sampler;
-	}
-	return sampler;
+	add("content", &Template::content_name);
 }
 
 } // namespace GL