Use C++11 features with containers

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

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index 5a68d4142a90bd777f058a9a3c3e4160c9367cf0..8fd4b956a3287efbc9dfc2cf19be92f1151e94b2 100644 (file)
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -15,13 +15,11 @@ namespace GL {
 SequenceBuilder::SequenceBuilder(const SequenceTemplate &t):
        tmpl(t)
 {
-       const vector<SequenceTemplate::Step> &steps = tmpl.get_steps();
-       for(vector<SequenceTemplate::Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
-               renderables[i->slot_name] = i->default_renderable;
-       const vector<SequenceTemplate::PostProcessor> &postprocs = tmpl.get_postprocessors();
-       for(SequenceTemplate::PostProcessorArray::const_iterator i=postprocs.begin(); i!=postprocs.end(); ++i)
-               if(!i->slot_name.empty())
-                       postprocessors[i->slot_name] = 0;
+       for(const SequenceTemplate::Step &s: tmpl.get_steps())
+               renderables[s.slot_name] = s.default_renderable;
+       for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors())
+               if(!p.slot_name.empty())
+                       postprocessors[p.slot_name] = 0;
 }
 
 void SequenceBuilder::set_renderable(const string &name, Renderable &rend)
@@ -50,36 +48,37 @@ void SequenceBuilder::build(Sequence &sequence) const
                sequence.set_debug_name(debug_name);
 #endif
 
-       const vector<SequenceTemplate::Step> &steps = tmpl.get_steps();
-       for(vector<SequenceTemplate::Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+       for(const SequenceTemplate::Step &s: tmpl.get_steps())
        {
-               Renderable *renderable = get_item(renderables, i->slot_name);
+               Renderable *renderable = get_item(renderables, s.slot_name);
                if(!renderable)
                        continue;
 
-               Sequence::Step &step = sequence.add_step(i->tag, *renderable);
-               step.set_blend(i->blend);
-               step.set_depth_test(i->depth_test);
-               step.set_stencil_test(i->stencil_test);
-               step.set_lighting(i->lighting);
+               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);
        }
 
-       const SequenceTemplate::PostProcessorArray &postprocs = tmpl.get_postprocessors();
-       for(SequenceTemplate::PostProcessorArray::const_iterator i=postprocs.begin(); i!=postprocs.end(); ++i)
+#ifdef DEBUG
+       unsigned index = 0;
+#endif
+       for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors())
        {
                PostProcessor *proc = 0;
-               if(!i->slot_name.empty())
-                       proc = get_item(postprocessors, i->slot_name);
+               if(!p.slot_name.empty())
+                       proc = get_item(postprocessors, p.slot_name);
                if(proc)
                        sequence.add_postprocessor(*proc);
-               else if(i->postprocessor_template)
+               else if(p.postprocessor_template)
                {
-                       proc = i->postprocessor_template->create(sequence.get_width(), sequence.get_height());
+                       proc = p.postprocessor_template->create(sequence.get_width(), sequence.get_height());
                        if(proc)
                        {
 #ifdef DEBUG
                                if(!debug_name.empty())
-                                       proc->set_debug_name(format("%s/%d.pproc", debug_name, i-postprocs.begin()));
+                                       proc->set_debug_name(format("%s/%d.pproc", debug_name, index++));
 #endif
                                sequence.add_postprocessor_owned(proc);
                        }