]> git.tdb.fi Git - libs/gl.git/blobdiff - source/render/sequence.cpp
Allow creating sequences without size
[libs/gl.git] / source / render / sequence.cpp
index aaa1ef12a2238e209973c708446672b3ba865ed6..535e81859aa0dea0a8d403088abc8ae2ce819d6a 100644 (file)
 #include <msp/core/maputils.h>
 #include "blend.h"
-#include "camera.h"
+#include "error.h"
 #include "framebuffer.h"
 #include "lighting.h"
 #include "postprocessor.h"
 #include "renderer.h"
 #include "sequence.h"
 #include "texture2d.h"
-#include "view.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Sequence::Sequence(unsigned w, unsigned h, bool d)
-{
-       init(w, h);
-       hdr = d;
-}
+Sequence::Sequence():
+       width(0),
+       height(0),
+       target{0, 0},
+       target_ms(0)
+{ }
 
-Sequence::Sequence(const View &view)
+Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
+       width(w),
+       height(h),
+       target_format(f),
+       target_ms(0)
 {
-       init(view.get_width(), view.get_height());
-}
+       if(target_format.empty())
+               throw invalid_argument("Sequence::Sequence");
 
-Sequence::Sequence(const Framebuffer &fbo)
-{
-       init(fbo.get_width(), fbo.get_height());
-}
+       FrameFormat postproc_fmt = target_format;
+       postproc_fmt.set_samples(1);
+       target[0] = new RenderTarget(width, height, postproc_fmt);
+       target[1] = new RenderTarget(width, height, postproc_fmt);
 
-void Sequence::init(unsigned w, unsigned h)
-{
-       camera = 0;
-       width = w;
-       height = h;
-       hdr = false;
-       alpha = false;
-       samples = 0;
-       target_ms = 0;
-       target[0] = 0;
-       target[1] = 0;
+       if(target_format.get_samples()>1)
+               target_ms = new RenderTarget(width, height, target_format);
 }
 
 Sequence::~Sequence()
 {
-       for(vector<PostProcStep>::iterator i=postproc.begin(); i!=postproc.end(); ++i)
-               if(i->owned)
-                       delete i->postproc;
+       for(PostProcStep &p: postproc)
+               if(p.owned)
+                       delete p.postproc;
        delete target[0];
        delete target[1];
        delete target_ms;
 }
 
-void Sequence::set_hdr(bool h)
-{
-       if(h==hdr)
-               return;
-
-       bool old_hdr = hdr;
-       hdr = h;
-       try
-       {
-               create_targets(2);
-       }
-       catch(...)
-       {
-               hdr = old_hdr;
-               throw;
-       }
-}
-
-void Sequence::set_alpha(bool a)
-{
-       if(a==alpha)
-               return;
-
-       bool old_alpha = alpha;
-       alpha = a;
-       try
-       {
-               create_targets(2);
-       }
-       catch(...)
-       {
-               alpha = old_alpha;
-               throw;
-       }
-}
-
-void Sequence::set_multisample(unsigned s)
-{
-       if(s==samples)
-               return;
-
-       unsigned old_samples = samples;
-       samples = s;
-       try
-       {
-               create_targets(1);
-       }
-       catch(...)
-       {
-               samples = old_samples;
-               throw;
-       }
-}
-
 Sequence::Step &Sequence::add_step(Tag tag, Renderable &r)
 {
        steps.push_back(Step(tag, &r));
@@ -125,31 +66,26 @@ void Sequence::add_postprocessor_owned(PostProcessor *pp)
 
 void Sequence::add_postprocessor(PostProcessor *pp, bool owned)
 {
-       postproc.push_back(PostProcStep(pp, owned));
-       try
+       if(target_format.empty())
        {
-               create_targets(0);
-       }
-       catch(...)
-       {
-               if(!owned)
+               if(owned)
                        delete pp;
-               postproc.pop_back();
-               throw;
+               throw invalid_operation("Sequence::add_postprocessor");
        }
+       postproc.push_back(PostProcStep(pp, owned));
 }
 
 void Sequence::setup_frame(Renderer &renderer)
 {
-       for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
-               if(Renderable *renderable = i->get_renderable())
+       for(const Step &s: steps)
+               if(Renderable *renderable = s.get_renderable())
                        renderable->setup_frame(renderer);
 }
 
 void Sequence::finish_frame()
 {
-       for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
-               if(Renderable *renderable = i->get_renderable())
+       for(const Step &s: steps)
+               if(Renderable *renderable = s.get_renderable())
                        renderable->finish_frame();
 }
 
@@ -164,29 +100,29 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 
        if(target[0])
        {
-               renderer.set_framebuffer(&(samples ? target_ms : target[0])->get_framebuffer());
+               renderer.set_framebuffer(&(target_ms ? target_ms : target[0])->get_framebuffer());
                renderer.clear();
        }
 
-       for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+       for(const Step &s: steps)
        {
                Renderer::Push _push2(renderer);
 
-               renderer.set_depth_test(&i->get_depth_test());
-               renderer.set_stencil_test(&i->get_stencil_test());
-               renderer.set_blend(&i->get_blend());
+               renderer.set_depth_test(&s.get_depth_test());
+               renderer.set_stencil_test(&s.get_stencil_test());
+               renderer.set_blend(&s.get_blend());
 
-               if (const Lighting *lighting = i->get_lighting())
+               if (const Lighting *lighting = s.get_lighting())
                        renderer.add_shader_data(lighting->get_shader_data());
-               renderer.set_clipping(i->get_clipping());
+               renderer.set_clipping(s.get_clipping());
 
-               if(const Renderable *renderable = i->get_renderable())
-                       renderer.render(*renderable, i->get_tag());
+               if(const Renderable *renderable = s.get_renderable())
+                       renderer.render(*renderable, s.get_tag());
        }
 
        if(target[0])
        {
-               if(samples)
+               if(target_ms)
                        renderer.resolve_multisample(target[0]->get_framebuffer(), COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 
                renderer.set_depth_test(0);
@@ -197,66 +133,23 @@ void Sequence::render(Renderer &renderer, Tag tag) const
                {
                        unsigned j = i%2;
                        renderer.set_framebuffer(i+1<postproc.size() ? &target[1-j]->get_framebuffer() : out_fbo);
-                       const Texture2D &color = target[j]->get_target_texture(RENDER_COLOR);
-                       const Texture2D &depth = target[j]->get_target_texture(RENDER_DEPTH);
+                       const Texture2D &color = target[j]->get_target_texture(COLOR_ATTACHMENT);
+                       const Texture2D &depth = target[j]->get_target_texture(DEPTH_ATTACHMENT);
                        postproc[i].postproc->render(renderer, color, depth);
                }
        }
 }
 
-void Sequence::create_targets(unsigned recreate)
-{
-       if(recreate>=2)
-       {
-               delete target[0];
-               delete target[1];
-               target[0] = 0;
-               target[1] = 0;
-       }
-       if(recreate>=1)
-       {
-               delete target_ms;
-               target_ms = 0;
-       }
-
-       PixelFormat color_pf = (hdr ? (alpha ? RGBA16F : RGB16F) : (alpha ? RGBA8 : RGB8));
-       RenderTargetFormat fmt = (RENDER_COLOR,color_pf, RENDER_DEPTH);
-       if(!postproc.empty() || samples)
-       {
-               if(!target[0])
-                       target[0] = new RenderTarget(width, height, fmt);
-               if(!target[1] && postproc.size()>1)
-                       target[1] = new RenderTarget(width, height, fmt);
-       }
-
-       if(!target_ms && samples)
-               target_ms = new RenderTarget(width, height, samples, fmt);
-
-#ifdef DEBUG
-       if(!debug_name.empty())
-               set_target_debug_names();
-#endif
-}
-
 void Sequence::set_debug_name(const string &name)
 {
-#ifdef DEBUG
-       debug_name = name;
-       if(!name.empty())
-               set_target_debug_names();
-#else
-       (void)name;
-#endif
-}
-
-void Sequence::set_target_debug_names()
-{
 #ifdef DEBUG
        for(unsigned i=0; i<2; ++i)
                if(target[i])
-                       target[i]->set_debug_name(format("%s [RT:%d]", debug_name, i));
+                       target[i]->set_debug_name(format("%s [RT:%d]", name, i));
        if(target_ms)
-               target_ms->set_debug_name(debug_name+" [RT:ms]");
+               target_ms->set_debug_name(name+" [RT:ms]");
+#else
+       (void)name;
 #endif
 }