X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Feffect.h;h=0d794a3a2d9b6b264b17e880cf0a02c95d8218d7;hb=84e0e55710123e54617d342df852007f8b60af24;hp=a4f108fbcf9f739bcca08fc55b520fe0d5fab202;hpb=1863f17c5c5563be8492d7f01e5c613a740ea1e9;p=libs%2Fgl.git

diff --git a/source/effects/effect.h b/source/effects/effect.h
index a4f108fb..0d794a3a 100644
--- a/source/effects/effect.h
+++ b/source/effects/effect.h
@@ -2,14 +2,12 @@
 #define MSP_GL_EFFECT_H_
 
 #include <set>
-#include <msp/core/refptr.h>
+#include <msp/datafile/objectloader.h>
 #include "renderable.h"
 
 namespace Msp {
 namespace GL {
 
-class Sampler;
-
 /**
 Effects are used to wrap other renderables and give them additional visual
 properties.  An Effect's render method should set up the necessary state, call
@@ -17,17 +15,36 @@ the wrapped Renderable's render method, and clean up after itself.
 */
 class Effect: public Renderable
 {
+public:
+	struct Template
+	{
+		class Loader: public DataFile::CollectionObjectLoader<Template>
+		{
+		public:
+			Loader(Template &, Collection &);
+		protected:
+			virtual void init_actions();
+		};
+
+		std::string content_name;
+
+		virtual ~Template() = default;
+
+		virtual Effect *create(const std::map<std::string, Renderable *> &) const = 0;
+	};
+
 protected:
 	Renderable &renderable;
-	std::set<Tag> enabled_passes;
+	std::vector<Tag> enabled_methods;
 
 protected:
 	Effect(Renderable &);
 public:
 	virtual ~Effect() { }
 
-	void enable_for_pass(Tag);
-	void disable_for_pass(Tag);
+	void enable_for_method(Tag);
+	void disable_for_method(Tag);
+	bool is_enabled_for_method(Tag) const;
 
 	virtual const Matrix *get_matrix() const { return renderable.get_matrix(); }
 	virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return renderable.get_bounding_sphere(); }