Add overloads of keyframe uniform statements without size suffixes

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

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index ce9c8f689a0feecd55214590f2dff25c3851850a..53b51d7924bc91cfeb6b8c4e84ef6cf24134061a 100644 (file)
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -9,20 +9,37 @@
 #include "renderer.h"
 #include "tests.h"
 #include "texture2d.h"
+#include "view.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Pipeline::Pipeline(unsigned w, unsigned h, bool d):
-       camera(0),
-       width(w),
-       height(h),
-       hdr(d),
-       samples(0),
-       target_ms(0)
+Pipeline::Pipeline(unsigned w, unsigned h, bool d)
 {
+       init(w, h);
+       hdr = d;
+}
+
+Pipeline::Pipeline(const View &view)
+{
+       init(view.get_width(), view.get_height());
+}
+
+Pipeline::Pipeline(const Framebuffer &fbo)
+{
+       init(fbo.get_width(), fbo.get_height());
+}
+
+void Pipeline::init(unsigned w, unsigned h)
+{
+       camera = 0;
+       width = w;
+       height = h;
+       hdr = false;
+       samples = 0;
+       target_ms = 0;
        target[0] = 0;
        target[1] = 0;
 }
@@ -124,7 +141,19 @@ Pipeline::Pass &Pipeline::add_pass(const Tag &tag, Renderable &r)
 
 void Pipeline::add_postprocessor(PostProcessor &pp)
 {
-       postproc.push_back(&pp);
+       add_postprocessor(&pp, true);
+}
+
+void Pipeline::add_postprocessor_owned(PostProcessor *pp)
+{
+       add_postprocessor(pp, false);
+}
+
+void Pipeline::add_postprocessor(PostProcessor *pp, bool keep)
+{
+       postproc.push_back(pp);
+       if(keep)
+               postproc.back().keep();
        try
        {
                create_targets(0);
@@ -136,28 +165,28 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
        }
 }
 
-void Pipeline::setup_frame() const
+void Pipeline::setup_frame(Renderer &renderer)
 {
        for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i)
-               if(const Renderable *renderable = i->get_renderable())
-                       renderable->setup_frame();
+               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();
+               i->renderable->setup_frame(renderer);
 }
 
-void Pipeline::finish_frame() const
+void Pipeline::finish_frame()
 {
        for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i)
-               if(const Renderable *renderable = i->get_renderable())
+               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 Pipeline::render() const
+void Pipeline::render()
 {
        Renderer renderer(camera);
-       setup_frame();
+       setup_frame(renderer);
        render(renderer);
        finish_frame();
 }
@@ -168,7 +197,7 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
                return;
 
        const Framebuffer *out_fbo = Framebuffer::current();
-       // These is a no-ops but will ensure the related state gets restored
+       // These are no-ops but will ensure the related state gets restored
        BindRestore restore_fbo(out_fbo);
        BindRestore restore_depth_test(DepthTest::current());
        BindRestore restore_blend(Blend::current());
@@ -180,7 +209,6 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
                fbo.clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
        }
 
-
        for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i)
        {
                if(const DepthTest *dt = i->get_depth_test())