X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencetemplate.cpp;h=2886e0a85ef1d2ee7963be95a3aa6d88eb13d27f;hp=6e50c24838aafeebd751008a10e7e36d40022ec9;hb=HEAD;hpb=006bdb4f8660098fc524dcca80b24c943c65b249

diff --git a/source/builders/sequencetemplate.cpp b/source/builders/sequencetemplate.cpp
index 6e50c248..2886e0a8 100644
--- a/source/builders/sequencetemplate.cpp
+++ b/source/builders/sequencetemplate.cpp
@@ -1,54 +1,61 @@
 #include <msp/core/maputils.h>
 #include <msp/datafile/collection.h>
+#include <msp/strings/format.h>
 #include "ambientocclusion.h"
 #include "blend.h"
 #include "bloom.h"
 #include "colorcurve.h"
+#include "environmentmap.h"
 #include "lighting.h"
 #include "object.h"
 #include "resources.h"
 #include "scene.h"
 #include "sequencetemplate.h"
+#include "shadowmap.h"
+#include "sky.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-SequenceTemplate::SequenceTemplate():
-	hdr(false),
-	alpha(false),
-	required_multisample(0),
-	max_multisample(0),
-	clear_enabled(false),
-	clear_depth(1.0f),
-	clear_stencil(0)
-{ }
-
 SequenceTemplate::~SequenceTemplate()
 {
+	for(const Renderable &r: renderables)
+		delete r.effect_template;
 	for(const PostProcessor &p: postprocessors)
 		delete p.postprocessor_template;
 }
 
-
-SequenceTemplate::PostProcessorRegistry &SequenceTemplate::get_postprocessor_registry()
+template<>
+SequenceTemplate::TemplateRegistry<GL::PostProcessor> &SequenceTemplate::get_registry<GL::PostProcessor>()
 {
-	static PostProcessorRegistry registry;
+	static TemplateRegistry<GL::PostProcessor> registry;
 	static bool initialized = false;
 	if(!initialized)
 	{
-		registry.register_type<AmbientOcclusion>("ambient_occlusion");
-		registry.register_type<Bloom>("bloom");
-		registry.register_type<ColorCurve>("colorcurve");
+		registry.register_type<AmbientOcclusion::Template>("ambient_occlusion");
+		registry.register_type<Bloom::Template>("bloom");
+		registry.register_type<ColorCurve::Template>("colorcurve");
 		initialized = true;
 	}
 	return registry;
 }
 
-
-SequenceTemplate::Step::~Step()
-{ }
+template<>
+SequenceTemplate::TemplateRegistry<Effect> &SequenceTemplate::get_registry<Effect>()
+{
+	static TemplateRegistry<Effect> registry;
+	static bool initialized = false;
+	if(!initialized)
+	{
+		registry.register_type<EnvironmentMap::Template>("environment_map");
+		registry.register_type<ShadowMap::Template>("shadow_map");
+		registry.register_type<Sky::Template>("sky");
+		initialized = true;
+	}
+	return registry;
+}
 
 
 SequenceTemplate::PostProcessor::PostProcessor(GL::PostProcessor::Template *ppt):
@@ -56,31 +63,27 @@ SequenceTemplate::PostProcessor::PostProcessor(GL::PostProcessor::Template *ppt)
 { }
 
 
-SequenceTemplate::PostProcLoader::PostProcLoader()
+DataFile::Loader::ActionMap SequenceTemplate::Loader::shared_actions;
+
+SequenceTemplate::Loader::Loader(SequenceTemplate &t, Collection &c):
+	CollectionObjectLoader<SequenceTemplate>(t, &c)
 {
-	get_postprocessor_registry().invoke_all(*this);
+	set_actions(shared_actions);
 }
 
-
-SequenceTemplate::Loader::Loader(SequenceTemplate &t, Collection &c):
-	DataFile::CollectionObjectLoader<SequenceTemplate, Resources>(t, &c)
+void SequenceTemplate::Loader::init_actions()
 {
 	add("hdr", &SequenceTemplate::hdr);
-	add("alpha", &SequenceTemplate::alpha);
 	add("clear", &Loader::clear);
+	add("effect", &Loader::effect);
 	add("multisample", &Loader::multisample);
 	add("multisample", &Loader::multisample_range);
 	add("postprocessor", &Loader::postprocessor);
+	add("postprocessor", &Loader::postprocessor_with_slot);
+	add("renderable", &Loader::renderable);
+	add("renderable", &Loader::renderable_with_default);
+	add("sequence", &Loader::sequence);
 	add("step", &Loader::step);
-	add("step", &Loader::step_with_slot);
-
-	// Deprecated
-	add("pass", &Loader::step_with_slot);
-}
-
-void SequenceTemplate::Loader::postprocessor_loaded()
-{
-	obj.postprocessors.push_back(get_postprocessor_template());
 }
 
 void SequenceTemplate::Loader::clear()
@@ -90,6 +93,16 @@ void SequenceTemplate::Loader::clear()
 	obj.clear_enabled = true;
 }
 
+void SequenceTemplate::Loader::effect(const string &slot)
+{
+	TemplateLoader<Effect> ldr(get_collection());
+	load_sub_with(ldr);
+	Renderable rend;
+	rend.slot_name = slot;
+	rend.effect_template = ldr.get_object();
+	obj.renderables.push_back(rend);
+}
+
 void SequenceTemplate::Loader::multisample(unsigned samples)
 {
 	obj.required_multisample = samples;
@@ -102,41 +115,68 @@ void SequenceTemplate::Loader::multisample_range(unsigned req, unsigned max)
 	obj.max_multisample = max;
 }
 
-void SequenceTemplate::Loader::postprocessor(const string &slot)
+void SequenceTemplate::Loader::postprocessor()
+{
+	postprocessor_with_slot(string());
+}
+
+void SequenceTemplate::Loader::postprocessor_with_slot(const string &slot)
 {
-	PostProcLoader ldr;
+	TemplateLoader<GL::PostProcessor> ldr(get_collection());
 	load_sub_with(ldr);
 	PostProcessor pp;
-	pp.postprocessor_template = ldr.get_postprocessor_template();
+	pp.postprocessor_template = ldr.get_object();
 	pp.slot_name = slot;
 	obj.postprocessors.push_back(pp);
 }
 
-void SequenceTemplate::Loader::step(const string &tag)
+void SequenceTemplate::Loader::renderable(const string &slot)
 {
-	step_with_slot(tag, string());
+	Renderable rend;
+	rend.slot_name = slot;
+	obj.renderables.push_back(rend);
 }
 
-void SequenceTemplate::Loader::step_with_slot(const string &tag, const string &rend)
+void SequenceTemplate::Loader::renderable_with_default(const string &slot, const string &name)
+{
+	Renderable rend;
+	rend.renderable = &get_collection().get<GL::Renderable>(name);
+	rend.slot_name = slot;
+	obj.renderables.push_back(rend);
+}
+
+void SequenceTemplate::Loader::sequence(const string &slot, const string &name)
+{
+	Renderable rend;
+	rend.sequence_template = &get_collection().get<SequenceTemplate>(name);
+	rend.slot_name = slot;
+	SequenceLoader ldr(rend);
+	load_sub_with(ldr);
+	obj.renderables.push_back(rend);
+}
+
+void SequenceTemplate::Loader::step(const string &tag, const string &rend)
 {
 	Step stp;
 	stp.tag = tag;
-	stp.slot_name = rend;
-	if(coll)
-	{
-		Step::Loader ldr(stp, *coll);
-		ldr.set_inline_base_name(format("%s/%d.step", get_source(), obj.steps.size()));
-		load_sub_with(ldr);
-	}
-	else
-		load_sub(stp);
+	stp.renderable_name = rend;
+	Step::Loader ldr(stp, get_collection());
+	ldr.set_inline_base_name(format("%s/%d.step", get_source(), obj.steps.size()));
+	load_sub_with(ldr);
 
 	obj.steps.push_back(stp);
 }
 
 
+DataFile::Loader::ActionMap SequenceTemplate::ClearLoader::shared_actions;
+
 SequenceTemplate::ClearLoader::ClearLoader(SequenceTemplate &t):
 	ObjectLoader<SequenceTemplate>(t)
+{
+	set_actions(shared_actions);
+}
+
+void SequenceTemplate::ClearLoader::init_actions()
 {
 	add("color", &ClearLoader::color);
 	add("depth", &ClearLoader::depth);
@@ -145,7 +185,7 @@ SequenceTemplate::ClearLoader::ClearLoader(SequenceTemplate &t):
 
 void SequenceTemplate::ClearLoader::color(float r, float g, float b, float a)
 {
-	obj.clear_colors.push_back(Color(r, g, b, a));
+	obj.clear_colors.emplace_back(r, g, b, a);
 }
 
 void SequenceTemplate::ClearLoader::depth(float d)
@@ -159,28 +199,39 @@ void SequenceTemplate::ClearLoader::stencil(int s)
 }
 
 
-SequenceTemplate::Step::Loader::Loader(Step &p):
-	DataFile::CollectionObjectLoader<Step>(p, 0)
+DataFile::Loader::ActionMap SequenceTemplate::SequenceLoader::shared_actions;
+
+SequenceTemplate::SequenceLoader::SequenceLoader(Renderable &r):
+	ObjectLoader<Renderable>(r)
+{
+	set_actions(shared_actions);
+}
+
+void SequenceTemplate::SequenceLoader::init_actions()
 {
-	init();
+	add("renderable", &SequenceLoader::renderable);
 }
 
+void SequenceTemplate::SequenceLoader::renderable(const string &slot, const string &name)
+{
+	obj.sequence_renderables[slot] = name;
+}
+
+
+DataFile::Loader::ActionMap SequenceTemplate::Step::Loader::shared_actions;
+
 SequenceTemplate::Step::Loader::Loader(Step &p, Collection &c):
 	DataFile::CollectionObjectLoader<Step>(p, &c)
 {
-	init();
+	set_actions(shared_actions);
 }
 
-void SequenceTemplate::Step::Loader::init()
+void SequenceTemplate::Step::Loader::init_actions()
 {
-	add("blend", &Loader::blend);
-	add("blend", &Loader::blend_factors);
 	add("depth_test", &Loader::depth_test);
 	add("depth_test", &Loader::depth_compare);
 	add("lighting", &Loader::lighting);
 	add("lighting", &Loader::lighting_inline);
-	add("object", &Loader::object);
-	add("scene", &Loader::scene);
 	add("stencil_test", &Loader::stencil_test);
 }
 
@@ -189,16 +240,6 @@ void SequenceTemplate::Step::Loader::set_inline_base_name(const string &n)
 	inline_base_name = n;
 }
 
-void SequenceTemplate::Step::Loader::blend()
-{
-	load_sub(obj.blend);
-}
-
-void SequenceTemplate::Step::Loader::blend_factors(BlendFactor src, BlendFactor dest)
-{
-	obj.blend = Blend(src, dest);
-}
-
 void SequenceTemplate::Step::Loader::depth_test()
 {
 	load_sub(obj.depth_test);
@@ -212,7 +253,7 @@ void SequenceTemplate::Step::Loader::depth_compare(Predicate c)
 void SequenceTemplate::Step::Loader::lighting_inline()
 {
 	RefPtr<Lighting> lightn = new Lighting;
-	load_sub(*lightn);
+	load_sub(*lightn, get_collection());
 	get_collection().add(inline_base_name+".lightn", lightn.get());
 	obj.lighting = lightn.release();
 }
@@ -222,16 +263,6 @@ void SequenceTemplate::Step::Loader::lighting(const string &name)
 	obj.lighting = &get_collection().get<Lighting>(name);
 }
 
-void SequenceTemplate::Step::Loader::object(const string &name)
-{
-	obj.default_renderable = &get_collection().get<GL::Object>(name);
-}
-
-void SequenceTemplate::Step::Loader::scene(const string &name)
-{
-	obj.default_renderable = &get_collection().get<Scene>(name);
-}
-
 void SequenceTemplate::Step::Loader::stencil_test()
 {
 	load_sub(obj.stencil_test);