Use texture unit numbers instead of slot names in RenderPass

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

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 97c452658153acb8c7561652ee22dcc0fc928961..f05d15b8271fe0ce9f216b62258f50d10758f231 100644 (file)
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -49,14 +49,14 @@ PipelinePass &Pipeline::add_pass(const Tag &tag)
        if(passes.count(tag))
                throw KeyError("Pass already exists");
 
-       PipelinePass &pass=passes[tag];
+       PipelinePass &pass = passes[tag];
        pass_order.push_back(tag);
        return pass;
 }
 
 PipelinePass &Pipeline::get_pass(const Tag &tag)
 {
-       PassMap::iterator i=passes.find(tag);
+       PassMap::iterator i = passes.find(tag);
        if(i==passes.end())
                throw KeyError("Unknown pass");
        return i->second;
@@ -64,7 +64,7 @@ PipelinePass &Pipeline::get_pass(const Tag &tag)
 
 const PipelinePass &Pipeline::get_pass(const Tag &tag) const
 {
-       PassMap::const_iterator i=passes.find(tag);
+       PassMap::const_iterator i = passes.find(tag);
        if(i==passes.end())
                throw KeyError("Unknown pass");
        return i->second;
@@ -72,9 +72,39 @@ const PipelinePass &Pipeline::get_pass(const Tag &tag) const
 
 void Pipeline::add_renderable(const Renderable &r)
 {
+       for(vector<Slot>::iterator i=renderables.begin(); i!=renderables.end(); ++i)
+               if(i->renderable==&r)
+               {
+                       i->passes.clear();
+                       return;
+               }
+
        renderables.push_back(&r);
 }
 
+void Pipeline::add_renderable_for_pass(const Renderable &r, const Tag &tag)
+{
+       for(vector<Slot>::iterator i=renderables.begin(); i!=renderables.end(); ++i)
+               if(i->renderable==&r)
+               {
+                       i->passes.insert(tag);
+                       return;
+               }
+
+       renderables.push_back(&r);
+       renderables.back().passes.insert(tag);
+}
+
+void Pipeline::remove_renderable(const Renderable &r)
+{
+       for(vector<Slot>::iterator i=renderables.begin(); i!=renderables.end(); ++i)
+               if(i->renderable==&r)
+               {
+                       renderables.erase(i);
+                       return;
+               }
+}
+
 void Pipeline::add_effect(Effect &e)
 {
        effects.push_back(&e);
@@ -85,23 +115,22 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
        postproc.push_back(&pp);
        if(!fbo)
        {
-               fbo=new Framebuffer;
-               color_buf=new Texture2D;
+               fbo = new Framebuffer;
+               color_buf = new Texture2D;
                color_buf->set_min_filter(NEAREST);
                color_buf->set_mag_filter(NEAREST);
                color_buf->storage((hdr ? RGB16F : RGB), width, height, 0);
                color_buf->image(0, RGB, UNSIGNED_BYTE, 0);
                fbo->attach(COLOR_ATTACHMENT0, *color_buf, 0);
-               depth_buf=new Renderbuffer;
+               depth_buf = new Renderbuffer;
                depth_buf->storage(DEPTH_COMPONENT, width, height);
                fbo->attach(DEPTH_ATTACHMENT, *depth_buf);
-               Framebuffer::unbind();
        }
 }
 
 void Pipeline::render(const Tag &tag) const
 {
-       const PipelinePass &pass=get_pass(tag);
+       const PipelinePass &pass = get_pass(tag);
 
        Bind bind_depth_test(pass.depth_test);
        Bind bind_blend(pass.blend);
@@ -110,8 +139,9 @@ void Pipeline::render(const Tag &tag) const
        for(vector<Effect *>::const_iterator i=pass.effects.begin(); i!=pass.effects.end(); ++i)
                (*i)->prepare();
 
-       for(vector<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-               (*i)->render(tag);
+       for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+               if(i->passes.empty() || i->passes.count(tag))
+                       i->renderable->render(tag);
 
        for(vector<Effect *>::const_iterator i=pass.effects.end(); i!=pass.effects.begin();)
                (*--i)->cleanup();
@@ -125,7 +155,7 @@ void Pipeline::render_all() const
        if(fbo)
        {
                fbo->bind();
-               clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
+               fbo->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
        }
 
        for(vector<Effect *>::const_iterator i=effects.begin(); i!=effects.end(); ++i)
@@ -145,5 +175,10 @@ void Pipeline::render_all() const
                (*i)->render(*color_buf);
 }
 
+
+Pipeline::Slot::Slot(const Renderable *r):
+       renderable(r)
+{ }
+
 } // namespace GL
 } // namespace Msp