X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Feffect.h;h=eadb4dc845984a3d8e04d83e93d6a819df81bdf0;hb=77a534371433054384d213922a2e8c55f8a69ad6;hp=c43cda3a39303822361f23405b74bedf2dfbc635;hpb=233dff2a6c552e08da832496aecd88ef4f8948f1;p=libs%2Fgl.git

diff --git a/source/effects/effect.h b/source/effects/effect.h
index c43cda3a..eadb4dc8 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,23 +15,43 @@ 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::set<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);
 
 	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(); }
 
 	virtual void setup_frame(Renderer &r) { renderable.setup_frame(r); }
 	virtual void finish_frame() { renderable.finish_frame(); }
+
+	virtual void set_debug_name(const std::string &) = 0;
 };
 
 } // namespace GL