Simplify Pipeline pass management

[libs/gl.git] / source / pipeline.cpp

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index ce15597080618114fc719e1e332732f20809cb76..67ddf6566cf3592422490f3f61343f094beb8286 100644 (file)
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -60,19 +60,8 @@ void Pipeline::set_camera(const Camera *c)
 
 Pipeline::Pass &Pipeline::add_pass(const Tag &tag)
 {
-       Pass &pass = insert_unique(passes, tag, Pass())->second;
-       pass_order.push_back(tag);
-       return pass;
-}
-
-Pipeline::Pass &Pipeline::get_pass(const Tag &tag)
-{
-       return get_item(passes, tag);
-}
-
-const Pipeline::Pass &Pipeline::get_pass(const Tag &tag) const
-{
-       return get_item(passes, tag);
+       passes.push_back(Pass(tag));
+       return passes.back();
 }
 
 void Pipeline::add_renderable(const Renderable &r)
@@ -119,34 +108,38 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
        }
 }
 
-void Pipeline::render(Renderer &renderer, const Tag &tag) const
+void Pipeline::render(const Tag &tag) const
 {
-       const Pass &pass = get_pass(tag);
+       if(tag.id)
+               return;
 
-       Bind bind_depth_test(pass.get_depth_test());
-       Bind bind_blend(pass.get_blend());
-       Bind bind_lighting(pass.get_lighting());
-
-       for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               if(i->passes.empty() || i->passes.count(tag))
-                       i->renderable->render(renderer, tag);
+       Renderer renderer(camera);
+       render(renderer, tag);
 }
 
-void Pipeline::render_all() const
+void Pipeline::render(Renderer &renderer, const Tag &tag) const
 {
-       if(camera)
-               camera->apply();
+       if(tag.id)
+               return;
 
        if(fbo)
        {
                Framebuffer *f = (fbo_ms ? fbo_ms : fbo);
+               // XXX exception safety
                f->bind();
                f->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
        }
 
-       Renderer renderer(camera);
-       for(vector<Tag>::const_iterator i=pass_order.begin(); i!=pass_order.end(); ++i)
-               render(renderer, *i);
+       for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i)
+       {
+               Bind bind_depth_test(i->get_depth_test());
+               Bind bind_blend(i->get_blend());
+               Bind bind_lighting(i->get_lighting());
+
+               for(vector<Slot>::const_iterator j=renderables.begin(); j!=renderables.end(); ++j)
+                       if(j->passes.empty() || j->passes.count(i->get_tag()))
+                               j->renderable->render(renderer, i->get_tag());
+       }
 
        if(fbo)
        {
@@ -204,7 +197,8 @@ void Pipeline::create_fbos()
 }
 
 
-Pipeline::Pass::Pass():
+Pipeline::Pass::Pass(const Tag &t):
+       tag(t),
        lighting(0),
        depth_test(0),
        blend(0)