X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencebuilder.cpp;h=dbb675acf2a7925a3ddf1e4b6b3969f04faaf8be;hp=5af62127ca4ff02712390793e70ec2735a401e7c;hb=083a8227715fa32c841fc2b8126e4ab8d2840ba0;hpb=f44366c8785eb7a88755cd71250a8b85289eeed2

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index 5af62127..dbb675ac 100644
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -49,6 +49,48 @@ void SequenceBuilder::build(Sequence &sequence) const
 		sequence.set_debug_name(debug_name);
 #endif
 
+	map<string, Renderable *> final_renderables = renderables;
+	vector<const SequenceTemplate::Renderable *> sequences;
+	for(const SequenceTemplate::Renderable &r: tmpl.get_renderables())
+	{
+		Renderable *&ptr = final_renderables[r.slot_name];
+		if(!ptr)
+		{
+			if(r.effect_template)
+			{
+				Effect *effect = r.effect_template->create(final_renderables);
+#ifdef DEBUG
+				if(!debug_name.empty())
+					effect->set_debug_name(format("%s/%s", debug_name, r.slot_name));
+#endif
+				ptr = effect;
+			}
+			else if(r.sequence_template)
+			{
+				Sequence *seq = new Sequence;
+#ifdef DEBUG
+				if(!debug_name.empty())
+					seq->set_debug_name(format("%s/%s", debug_name, r.slot_name));
+#endif
+				ptr = seq;
+				sequences.push_back(&r);
+			}
+			else
+				throw invalid_operation("SequenceBuilder::build");
+
+			sequence.add_owned(ptr);
+		}
+	}
+
+	for(const SequenceTemplate::Renderable *s: sequences)
+	{
+		SequenceBuilder bld(*s->sequence_template);
+		for(const auto &kvp: s->sequence_renderables)
+			if(Renderable *r = get_item(final_renderables, kvp.second))
+				bld.set_renderable(kvp.first, *r);
+		bld.build(*static_cast<Sequence *>(get_item(final_renderables, s->slot_name)));
+	}
+
 	sequence.set_clear_enabled(tmpl.is_clear_enabled());
 	if(tmpl.is_clear_enabled())
 	{
@@ -59,11 +101,9 @@ void SequenceBuilder::build(Sequence &sequence) const
 
 	for(const SequenceTemplate::Step &s: tmpl.get_steps())
 	{
-		Renderable *renderable = get_item(renderables, s.renderable_name);
-		if(!renderable)
-			continue;
-
-		Sequence::Step &step = sequence.add_step(s.tag, *renderable);
+		// Existence is already ensured above
+		Renderable &renderable = *get_item(final_renderables, s.renderable_name);
+		Sequence::Step &step = sequence.add_step(s.tag, renderable);
 		step.set_depth_test(s.depth_test);
 		step.set_stencil_test(s.stencil_test);
 		step.set_lighting(s.lighting);
@@ -74,24 +114,26 @@ void SequenceBuilder::build(Sequence &sequence) const
 #endif
 	for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors())
 	{
-		RefPtr<PostProcessor> proc = 0;
+		PostProcessor *proc = 0;
 		if(!p.slot_name.empty())
 			proc = get_item(postprocessors, p.slot_name);
-		if(proc)
-			sequence.add_postprocessor(*proc);
-		else if(p.postprocessor_template)
+		if(!proc)
 		{
-			proc = p.postprocessor_template->create(sequence.get_width(), sequence.get_height());
-			if(proc)
+			if(p.postprocessor_template)
 			{
+				proc = p.postprocessor_template->create(sequence.get_width(), sequence.get_height());
 #ifdef DEBUG
 				if(!debug_name.empty())
 					proc->set_debug_name(format("%s/%d.pproc", debug_name, index++));
 #endif
-				sequence.add_postprocessor(*proc.get());
-				sequence.add_owned(proc.release());
 			}
+			else
+				throw invalid_operation("SequenceBuilder::build");
+
+			sequence.add_owned(proc);
 		}
+
+		sequence.add_postprocessor(*proc);
 	}
 }