X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencebuilder.cpp;h=65aeaa13d01a02d1dfa12198dfb4ec8fc4f39be6;hp=8fd4b956a3287efbc9dfc2cf19be92f1151e94b2;hb=d16d28d2ccf7c6255204f02975834f713ff1df08;hpb=e9a898f315b5d1396f196d785913a283c30940f2

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index 8fd4b956..65aeaa13 100644
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -1,11 +1,12 @@
 #include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
 #include <msp/strings/format.h>
-#include "deviceinfo.h"
+#include "device.h"
 #include "error.h"
 #include "sequence.h"
 #include "sequencebuilder.h"
 #include "sequencetemplate.h"
+#include "view.h"
 
 using namespace std;
 
@@ -15,8 +16,8 @@ namespace GL {
 SequenceBuilder::SequenceBuilder(const SequenceTemplate &t):
 	tmpl(t)
 {
-	for(const SequenceTemplate::Step &s: tmpl.get_steps())
-		renderables[s.slot_name] = s.default_renderable;
+	for(const SequenceTemplate::Renderable &r: tmpl.get_renderables())
+		renderables[r.slot_name] = r.renderable;
 	for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors())
 		if(!p.slot_name.empty())
 			postprocessors[p.slot_name] = 0;
@@ -48,14 +49,61 @@ void SequenceBuilder::build(Sequence &sequence) const
 		sequence.set_debug_name(debug_name);
 #endif
 
-	for(const SequenceTemplate::Step &s: tmpl.get_steps())
+	map<string, Renderable *> final_renderables = renderables;
+	vector<const SequenceTemplate::Renderable *> sequences;
+	for(const SequenceTemplate::Renderable &r: tmpl.get_renderables())
 	{
-		Renderable *renderable = get_item(renderables, s.slot_name);
-		if(!renderable)
-			continue;
+		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);
+		}
+	}
 
-		Sequence::Step &step = sequence.add_step(s.tag, *renderable);
-		step.set_blend(s.blend);
+	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())
+	{
+		sequence.set_clear_colors(tmpl.get_clear_colors());
+		sequence.set_clear_depth(tmpl.get_clear_depth());
+		sequence.set_clear_stencil(tmpl.get_clear_stencil());
+	}
+
+	for(const SequenceTemplate::Step &s: tmpl.get_steps())
+	{
+		// 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);
@@ -69,23 +117,33 @@ void SequenceBuilder::build(Sequence &sequence) const
 		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_owned(proc);
 			}
+			else
+				throw invalid_operation("SequenceBuilder::build");
+
+			sequence.add_owned(proc);
 		}
+
+		sequence.add_postprocessor(*proc);
 	}
 }
 
+Sequence *SequenceBuilder::build() const
+{
+	RefPtr<Sequence> sequence = new Sequence();
+	build(*sequence);
+	return sequence.release();
+}
+
 Sequence *SequenceBuilder::build(unsigned w, unsigned h) const
 {
 	RefPtr<Sequence> sequence = new Sequence(w, h, create_frame_format());
@@ -95,21 +153,21 @@ Sequence *SequenceBuilder::build(unsigned w, unsigned h) const
 
 Sequence *SequenceBuilder::build(const View &view) const
 {
-	RefPtr<Sequence> sequence = new Sequence(view, create_frame_format());
+	RefPtr<Sequence> sequence = new Sequence(view.get_width(), view.get_height(), create_frame_format());
 	build(*sequence);
 	return sequence.release();
 }
 
 Sequence *SequenceBuilder::build(const Framebuffer &fbo) const
 {
-	RefPtr<Sequence> sequence = new Sequence(fbo, create_frame_format());
+	RefPtr<Sequence> sequence = new Sequence(fbo.get_width(), fbo.get_height(), create_frame_format());
 	build(*sequence);
 	return sequence.release();
 }
 
 FrameFormat SequenceBuilder::create_frame_format() const
 {
-	unsigned samples = min(tmpl.get_maximum_multisample(), Limits::get_global().max_samples);
+	unsigned samples = min(tmpl.get_maximum_multisample(), Device::get_current().get_info().limits.max_samples);
 	if(samples<tmpl.get_required_multisample())
 		throw invalid_operation("SequenceBuilder::create_frame_format");