From e72f81ac7f8708daab71965cfc9949ea64fd8a94 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Wed, 14 Apr 2021 15:04:24 +0300 Subject: [PATCH] Remove some vestigial code from Sequence Apparently a few internal parts were left behind when I removed the related interfaces. --- source/render/sequence.cpp | 13 ------------- source/render/sequence.h | 9 --------- 2 files changed, 22 deletions(-) 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 diff --git a/source/render/sequence.h b/source/render/sequence.h index 11f22a76..fb60e371 100644 --- a/source/render/sequence.h +++ b/source/render/sequence.h @@ -66,17 +66,8 @@ public: DEPRECATED typedef Step Pass; private: - struct Slot - { - Renderable *renderable; - std::set passes; - - Slot(Renderable *); - }; - std::vector steps; const Camera *camera; - std::vector renderables; std::vector > postproc; unsigned width; unsigned height; -- 2.45.2