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;
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;
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);
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);
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();
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)
(*i)->render(*color_buf);
}
+
+Pipeline::Slot::Slot(const Renderable *r):
+ renderable(r)
+{ }
+
} // namespace GL
} // namespace Msp