From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 11 Mar 2022 09:24:39 +0000 (+0200)
Subject: Support specifying enabled methods in effect templates
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=7ab8bc0724f40b46d7f5da1bcb05ab6d0cecbb43;p=libs%2Fgl.git

Support specifying enabled methods in effect templates
---

diff --git a/source/effects/effect.cpp b/source/effects/effect.cpp
index 878e23fb..0ead01c3 100644
--- a/source/effects/effect.cpp
+++ b/source/effects/effect.cpp
@@ -1,6 +1,8 @@
 #include <msp/core/algorithm.h>
 #include "effect.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -31,6 +33,13 @@ bool Effect::is_enabled_for_method(Tag tag) const
 }
 
 
+void Effect::Template::create_base(Effect &effect) const
+{
+	for(Tag m: enabled_methods)
+		effect.enable_for_method(m);
+}
+
+
 Effect::Template::Loader::Loader(Template &t, Collection &c):
 	CollectionObjectLoader<Template>(t, &c)
 { }
@@ -38,6 +47,12 @@ Effect::Template::Loader::Loader(Template &t, Collection &c):
 void Effect::Template::Loader::init_actions()
 {
 	add("content", &Template::content_name);
+	add("enable_for_method", &Loader::enable_for_method);
+}
+
+void Effect::Template::Loader::enable_for_method(const string &m)
+{
+	obj.enabled_methods.push_back(m);
 }
 
 } // namespace GL
diff --git a/source/effects/effect.h b/source/effects/effect.h
index e77b4cf5..a77cdb5a 100644
--- a/source/effects/effect.h
+++ b/source/effects/effect.h
@@ -34,13 +34,18 @@ public:
 			Loader(Template &, Collection &);
 		protected:
 			virtual void init_actions();
+
+		private:
+			void enable_for_method(const std::string &);
 		};
 
 		std::string content_name;
+		std::vector<Tag> enabled_methods;
 
 		virtual ~Template() = default;
 
 		virtual Effect *create(const std::map<std::string, Renderable *> &) const = 0;
+		void create_base(Effect &) const;
 	};
 
 protected:
diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 0047e584..75905791 100644
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -218,6 +218,8 @@ EnvironmentMap *EnvironmentMap::Template::create(const map<string, Renderable *>
 		env_map->set_fixed_position(fixed_position);
 	env_map->set_depth_clip(near_clip, far_clip);
 
+	create_base(*env_map);
+
 	return env_map.release();
 }
 
diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index 123cae27..bbf602bc 100644
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -298,6 +298,8 @@ ShadowMap *ShadowMap::Template::create(const map<string, Renderable *> &renderab
 			throw invalid_operation("ShadowMap::Template::create");
 	}
 
+	create_base(*shadow_map);
+
 	return shadow_map.release();
 }
 
diff --git a/source/effects/sky.cpp b/source/effects/sky.cpp
index 2732b7ad..be4896fb 100644
--- a/source/effects/sky.cpp
+++ b/source/effects/sky.cpp
@@ -199,7 +199,11 @@ Sky *Sky::Template::create(const map<string, Renderable *> &renderables) const
 	Renderable *content = get_item(renderables, content_name);
 	if(!content || !sun)
 		throw invalid_operation("Sky::Template::create");
-	return new Sky(*content, *sun);
+
+	RefPtr<Sky> sky = new Sky(*content, *sun);
+	create_base(*sky);
+
+	return sky.release();
 }