Remove some vestigial code from Sequence

Apparently a few internal parts were left behind when I removed the
related interfaces.

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 51b2a4f7368181df469694b5fd3e08ca9c39e0eb..b8fb6076e1fe5937ee8107aece475b5d3a763c44 100644 (file)
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -143,8 +143,6 @@ void Sequence::setup_frame(Renderer &renderer)
        for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
                if(Renderable *renderable = i->get_renderable())
                        renderable->setup_frame(renderer);
        for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
                if(Renderable *renderable = i->get_renderable())
                        renderable->setup_frame(renderer);

-       for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               i->renderable->setup_frame(renderer);

 }
 
 void Sequence::finish_frame()
 }
 
 void Sequence::finish_frame()


@@ -152,8 +150,6 @@ void Sequence::finish_frame()
        for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
                if(Renderable *renderable = i->get_renderable())
                        renderable->finish_frame();
        for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
                if(Renderable *renderable = i->get_renderable())
                        renderable->finish_frame();

-       for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               i->renderable->finish_frame();

 }
 
 void Sequence::render(Renderer &renderer, Tag tag) const
 }
 
 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());
 
                if(const Renderable *renderable = i->get_renderable())
                        renderer.render(*renderable, i->get_tag());

-
-               for(vector<Slot>::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])
        }
 
        if(target[0])


@@ -278,10 +270,5 @@ void Sequence::Step::set_clipping(const Clipping *c)
        clipping =c;
 }
 
        clipping =c;
 }
 

-
-Sequence::Slot::Slot(Renderable *r):
-       renderable(r)
-{ }
-

 } // namespace GL
 } // namespace Msp
 } // namespace GL
 } // namespace Msp

diff --git a/source/render/sequence.h b/source/render/sequence.h
index 11f22a76f9326cbf76c9868eb83157954261e2cd..fb60e37159f7a4220753b093548afc2d9e6b1023 100644 (file)
--- a/source/render/sequence.h
+++ b/source/render/sequence.h
@@ -66,17 +66,8 @@ public:
        DEPRECATED typedef Step Pass;
 
 private:
        DEPRECATED typedef Step Pass;
 
 private:

-       struct Slot
-       {
-               Renderable *renderable;
-               std::set<Tag> passes;
-
-               Slot(Renderable *);
-       };
-

        std::vector<Step> steps;
        const Camera *camera;
        std::vector<Step> steps;
        const Camera *camera;

-       std::vector<Slot> renderables;

        std::vector<RefPtr<PostProcessor> > postproc;
        unsigned width;
        unsigned height;
        std::vector<RefPtr<PostProcessor> > postproc;
        unsigned width;
        unsigned height;