Allow creating sequences without size

[libs/gl.git] / source / render / sequence.cpp

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index e953b4d6925944b10d872301ef35667a7904f857..535e81859aa0dea0a8d403088abc8ae2ce819d6a 100644 (file)
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -7,52 +7,35 @@
 #include "renderer.h"
 #include "sequence.h"
 #include "texture2d.h"
 #include "renderer.h"
 #include "sequence.h"
 #include "texture2d.h"

-#include "view.h"

 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 

-Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f)
-{
-       init(w, h, f);
-}
-
-Sequence::Sequence(const View &view, const FrameFormat &f)
-{
-       init(view.get_width(), view.get_height(), f);
-}
+Sequence::Sequence():
+       width(0),
+       height(0),
+       target{0, 0},
+       target_ms(0)
+{ }

 
 

-Sequence::Sequence(const Framebuffer &fbo, const FrameFormat &f)
+Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
+       width(w),
+       height(h),
+       target_format(f),
+       target_ms(0)

 {
 {

-       init(fbo.get_width(), fbo.get_height(), f);
-}
+       if(target_format.empty())
+               throw invalid_argument("Sequence::Sequence");

 
 

-void Sequence::init(unsigned w, unsigned h, const FrameFormat &f)
-{
-       width = w;
-       height = h;
-       target_format = f;
+       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);

 
 

-       if(!target_format.empty())
-       {
-               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);
-
-               if(target_format.get_samples()>1)
-                       target_ms = new RenderTarget(width, height, target_format);
-               else
-                       target_ms = 0;
-       }
-       else
-       {
-               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()
 }
 
 Sequence::~Sequence()