X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=b8fb6076e1fe5937ee8107aece475b5d3a763c44;hp=51b2a4f7368181df469694b5fd3e08ca9c39e0eb;hb=e72f81ac7f8708daab71965cfc9949ea64fd8a94;hpb=73facb40b97bb006a408ef93b866fbc6fd14d1c3 diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp index 51b2a4f7..b8fb6076 100644 --- a/source/render/sequence.cpp +++ b/source/render/sequence.cpp @@ -143,8 +143,6 @@ void Sequence::setup_frame(Renderer &renderer) for(vector::const_iterator i=steps.begin(); i!=steps.end(); ++i) if(Renderable *renderable = i->get_renderable()) renderable->setup_frame(renderer); - for(vector::const_iterator i=renderables.begin(); i!=renderables.end(); ++i) - i->renderable->setup_frame(renderer); } void Sequence::finish_frame() @@ -152,8 +150,6 @@ void Sequence::finish_frame() for(vector::const_iterator i=steps.begin(); i!=steps.end(); ++i) if(Renderable *renderable = i->get_renderable()) renderable->finish_frame(); - for(vector::const_iterator i=renderables.begin(); i!=renderables.end(); ++i) - i->renderable->finish_frame(); } void Sequence::render(Renderer &renderer, Tag tag) const @@ -191,10 +187,6 @@ void Sequence::render(Renderer &renderer, Tag tag) const if(const Renderable *renderable = i->get_renderable()) renderer.render(*renderable, i->get_tag()); - - for(vector::const_iterator j=renderables.begin(); j!=renderables.end(); ++j) - if(j->passes.empty() || j->passes.count(i->get_tag())) - renderer.render(*j->renderable, i->get_tag()); } if(target[0]) @@ -278,10 +270,5 @@ void Sequence::Step::set_clipping(const Clipping *c) clipping =c; } - -Sequence::Slot::Slot(Renderable *r): - renderable(r) -{ } - } // namespace GL } // namespace Msp