Require all renderables to be present when building a sequence

[libs/gl.git] / source / builders / sequencebuilder.cpp

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index 45d4f873b1e03a486bca93e4264028fb09cf66ec..eff9348b8395a78226436110633a400c9e373d26 100644 (file)
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -16,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;
@@ -59,12 +59,11 @@ void SequenceBuilder::build(Sequence &sequence) const
 
        for(const SequenceTemplate::Step &s: tmpl.get_steps())
        {
-               Renderable *renderable = get_item(renderables, s.slot_name);
+               Renderable *renderable = get_item(renderables, s.renderable_name);
                if(!renderable)
-                       continue;
+                       throw missing_renderable(s.renderable_name);
 
                Sequence::Step &step = sequence.add_step(s.tag, *renderable);
-               step.set_blend(s.blend);
                step.set_depth_test(s.depth_test);
                step.set_stencil_test(s.stencil_test);
                step.set_lighting(s.lighting);
@@ -75,7 +74,7 @@ void SequenceBuilder::build(Sequence &sequence) const
 #endif
        for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors())
        {
-               PostProcessor *proc = 0;
+               RefPtr<PostProcessor> proc = 0;
                if(!p.slot_name.empty())
                        proc = get_item(postprocessors, p.slot_name);
                if(proc)
@@ -89,9 +88,13 @@ void SequenceBuilder::build(Sequence &sequence) const
                                if(!debug_name.empty())
                                        proc->set_debug_name(format("%s/%d.pproc", debug_name, index++));
 #endif
-                               sequence.add_postprocessor_owned(proc);
+                               sequence.add_postprocessor(*proc.get());
+                               sequence.add_owned(proc.release());
                        }
                }
+
+               if(!proc)
+                       throw invalid_operation("SequenceBuilder::build");
        }
 }